diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 30d84547b11..255ddc08c80 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -38,10 +38,12 @@ libs/importer @bitwarden/team-tools-dev
 libs/tools @bitwarden/team-tools-dev
 
 ## Dirt (Data Insights & Reporting) team files ##
+apps/browser/src/dirt @bitwarden/team-data-insights-and-reporting-dev
 apps/web/src/app/dirt @bitwarden/team-data-insights-and-reporting-dev
 bitwarden_license/bit-common/src/dirt @bitwarden/team-data-insights-and-reporting-dev
 bitwarden_license/bit-web/src/app/dirt @bitwarden/team-data-insights-and-reporting-dev
 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
@@ -96,7 +98,6 @@ libs/storage-core @bitwarden/team-platform-dev
 libs/logging @bitwarden/team-platform-dev
 libs/storage-test-utils @bitwarden/team-platform-dev
 libs/messaging @bitwarden/team-platform-dev
-libs/messaging-internal @bitwarden/team-platform-dev
 libs/serialization @bitwarden/team-platform-dev
 libs/guid @bitwarden/team-platform-dev
 libs/client-type @bitwarden/team-platform-dev
@@ -139,7 +140,7 @@ nx.json @bitwarden/team-platform-dev
 
 ## Autofill team files ##
 apps/browser/src/autofill @bitwarden/team-autofill-dev
-apps/desktop/src/autofill @bitwarden/team-autofill-dev
+apps/desktop/src/autofill @bitwarden/team-autofill-desktop-dev
 libs/common/src/autofill @bitwarden/team-autofill-dev
 apps/desktop/macos/autofill-extension @bitwarden/team-autofill-desktop-dev
 .github/workflows/test-browser-interactions.yml @bitwarden/team-autofill-dev
@@ -161,6 +162,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
@@ -203,11 +205,12 @@ apps/web/src/locales/en/messages.json
 .github/workflows/release-desktop.yml @bitwarden/dept-bre
 .github/workflows/release-web.yml @bitwarden/dept-bre
 
-## Docker files have shared ownership ##
-**/Dockerfile
-**/*.Dockerfile
-**/.dockerignore
-**/entrypoint.sh
+## Docker-related files
+**/Dockerfile @bitwarden/team-appsec @bitwarden/dept-bre
+**/*.Dockerfile @bitwarden/team-appsec @bitwarden/dept-bre
+**/*.dockerignore @bitwarden/team-appsec @bitwarden/dept-bre
+**/docker-compose.yml @bitwarden/team-appsec @bitwarden/dept-bre
+**/entrypoint.sh @bitwarden/team-appsec @bitwarden/dept-bre
 
 ## Overrides
 # For the time being platform owns tsconfig and jest config
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index e646049c3d6..8e31ab7a384 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -106,7 +106,6 @@
         "@emotion/css",
         "@webcomponents/custom-elements",
         "bitwarden-russh",
-        "bytes",
         "concurrently",
         "cross-env",
         "del",
diff --git a/.github/workflows/alert-ddg-files-modified.yml b/.github/workflows/alert-ddg-files-modified.yml
index 61bb7f1e8af..d799cc2e248 100644
--- a/.github/workflows/alert-ddg-files-modified.yml
+++ b/.github/workflows/alert-ddg-files-modified.yml
@@ -29,19 +29,56 @@ jobs:
             - 'apps/desktop/src/services/duckduckgo-message-handler.service.ts'
             - 'apps/desktop/src/services/encrypted-message-handler.service.ts'
 
+    - name: Remove past BIT status comments
+      uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      with:
+        script: |
+          // Note: should match the first line of `message` in the communication steps
+          const workflowCommentTag = '<!-- comment_tag: ddg-test-warning -->';
+
+          const issueComments = await github.rest.issues.listComments({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+          });
+
+          for (const comment of issueComments.data || []) {
+            const shouldDeleteComment =
+              // Do not delete comments that were not automated
+              !!comment.performed_via_github_app &&
+
+              // Do not delete user comments
+              comment.user.type === 'Bot' &&
+
+              // Do not delete edited comments
+              comment.created_at === comment.updated_at &&
+
+              // Only delete comments from this workflow
+              comment.body.trim().startsWith(workflowCommentTag);
+
+            if (shouldDeleteComment) {
+              await github.rest.issues.deleteComment({
+                comment_id: comment.id,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+              });
+            }
+          }
+
     - 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
       with:
         script: |
           const changedFiles = `${{ steps.changed-files.outputs.monitored_files }}`.split(' ').filter(file => file.trim() !== '');
 
-          const message = `⚠️🦆 **DuckDuckGo Integration files have been modified in this PR:**
-          
+          const message = `<!-- comment_tag: ddg-test-warning -->
+          ⚠️🦆 **DuckDuckGo Integration files have been modified in this PR:**
+
           ${changedFiles.map(file => `- \`${file}\``).join('\n')}
-          
+
           Please run the DuckDuckGo native messaging test runner from this branch using [these instructions](https://contributing.bitwarden.com/getting-started/clients/desktop/native-messaging-test-runner) and ensure it functions properly.`;
-          
+
           github.rest.issues.createComment({
             issue_number: context.issue.number,
             owner: context.repo.owner,
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-desktop.yml b/.github/workflows/build-desktop.yml
index 3deb21640e7..b1e0232cb9c 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -387,6 +387,15 @@ jobs:
           rustup target add aarch64-unknown-linux-musl
           node build.js --target=aarch64-unknown-linux-musl --release
 
+      - name: Check index.d.ts generated
+        if: github.event_name == 'pull_request' && steps.cache.outputs.cache-hit != 'true'
+        working-directory: apps/desktop/desktop_native
+        run: |
+          if ! git diff --quiet --name-only -- napi/index.d.ts; then
+            echo "NAPI index.d.ts doesn't match, make sure to regenerate it and commit it"
+            exit 1
+          fi
+
       - name: Build application
         run: npm run dist:lin:arm64
 
diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
index f00ae07fba3..d623f08ebac 100644
--- a/.github/workflows/build-web.yml
+++ b/.github/workflows/build-web.yml
@@ -106,6 +106,10 @@ jobs:
           - artifact_name: selfhosted-COMMERCIAL
             image_name: web
             npm_command: dist:bit:selfhost
+          - artifact_name: selfhosted-DEV
+            image_name: web
+            npm_command: build:bit:selfhost:dev
+            git_metadata: true
           - artifact_name: cloud-QA
             image_name: web-qa-cloud
             npm_command: build:bit:qa
@@ -405,7 +409,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 793fb52eabf..dc4da7d37de 100644
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -97,7 +97,7 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Publish to Chromatic
-        uses: chromaui/action@e8cc4c31775280b175a3c440076c00d19a9014d7 # v11.28.2
+        uses: chromaui/action@d0795df816d05c4a89c80295303970fddd247cce # v13.1.4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           projectToken: ${{ steps.get-kv-secrets.outputs.CHROMATIC-PROJECT-TOKEN }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 7eab45e5b1b..738aef899f5 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -49,6 +49,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)
 
diff --git a/.github/workflows/nx.yml b/.github/workflows/nx.yml
new file mode 100644
index 00000000000..9349239a134
--- /dev/null
+++ b/.github/workflows/nx.yml
@@ -0,0 +1,42 @@
+name: Experimental Nx CI
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+permissions:
+  contents: read
+
+jobs:
+  nx-experiment:
+    name: Run Nx Affected Tasks
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+      
+      - 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
+
+      - name: Set up Node
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        with:
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: ${{ env._NODE_VERSION }}
+      
+      - name: Install dependencies
+        run: npm ci
+      
+      - name: Set Nx SHAs for affected detection
+        uses: nrwl/nx-set-shas@826660b82addbef3abff5fa871492ebad618c9e1 # v4.3.3
+      
+      - name: Run Nx affected tasks
+        continue-on-error: true
+        run: npx nx affected -t build lint test
\ No newline at end of file
diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml
index efb0f541d70..bef686592d4 100644
--- a/.github/workflows/publish-cli.yml
+++ b/.github/workflows/publish-cli.yml
@@ -183,6 +183,7 @@ jobs:
 
   npm:
     name: Publish NPM
+    environment: CLI - NPM
     runs-on: ubuntu-22.04
     needs: setup
     permissions:
@@ -195,23 +196,20 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      
+      - 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: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
+      - name: Set up Node
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         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
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "npm-api-key"
-
-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
+          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: Download and set up artifact
         run: |
@@ -219,19 +217,9 @@ jobs:
           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
 
-      - name: Setup NPM
-        run: |
-          echo 'registry="https://registry.npmjs.org/"' > ./.npmrc
-          echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ./.npmrc
-        env:
-          NPM_TOKEN: ${{ steps.retrieve-secrets.outputs.npm-api-key }}
-
-      - name: Install Husky
-        run: npm install -g husky
-
       - name: Publish NPM
         if: ${{ inputs.publish_type != 'Dry Run' }}
-        run: npm publish --access public --regsitry=https://registry.npmjs.org/  --userconfig=./.npmrc
+        run: npm publish --access public
 
   update-deployment:
     name: Update Deployment Status
diff --git a/.github/workflows/publish-web.yml b/.github/workflows/publish-web.yml
index a6f0f1be066..6446e625156 100644
--- a/.github/workflows/publish-web.yml
+++ b/.github/workflows/publish-web.yml
@@ -179,7 +179,7 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Trigger self-host build
-        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/test-browser-interactions.yml b/.github/workflows/test-browser-interactions.yml
index c6427b2e0d8..3af1a1a8e9d 100644
--- a/.github/workflows/test-browser-interactions.yml
+++ b/.github/workflows/test-browser-interactions.yml
@@ -11,6 +11,7 @@ jobs:
   check-files:
     name: Check files
     runs-on: ubuntu-22.04
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     permissions:
       actions: write
       contents: read
diff --git a/.gitignore b/.gitignore
index 0fa968aa47c..61a20195592 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@ Thumbs.db
 *.launch
 .settings/
 *.sublime-workspace
+.claude
+.serena
 
 # Visual Studio Code
 .vscode/*
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 00000000000..0870553f8d3
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,90 @@
+# Bitwarden Clients - Claude Code Configuration
+
+## 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. Follow the guidelines in `SECURITY.md`.
+
+- **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`
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/src/_locales/ar/messages.json b/apps/browser/src/_locales/ar/messages.json
index 1bb7d3433d2..e8a37262993 100644
--- a/apps/browser/src/_locales/ar/messages.json
+++ b/apps/browser/src/_locales/ar/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "تعديل"
   },
@@ -701,6 +733,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": "نفذ وقت الخزانة"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "حدد طريقة تسجيل الدخول بخطوتين"
   },
-  "recoveryCodeDesc": {
-    "message": "هل تفقد الوصول إلى جميع مزودي التحقق بعاملين؟ استخدم رمز الاسترداد الخاص بك لتعطيل جميع مزودي التحقق بعاملين من حسابك."
-  },
   "recoveryCodeTitle": {
     "message": "رمز الاسترداد"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "يمكنك إيقاف الملء التلقائي في تحميل الصفحة لعناصر تسجيل الدخول الفردية من عرض تحرير العنصر."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "ملء تلقائي عند تحميل الصفحة (إذا كان الإعداد في الخيارات)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "إستخدم الإعداد الإفتراضي"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "النقر خارج النافذة المنبثقة للتحقق من بريدك الإلكتروني للحصول على رمز التحقق الخاص بك سيؤدي إلى إغلاق هذا المنبثق. هل تريد فتح هذا المنبثق في نافذة جديدة حتى لا يغلق؟"
   },
-  "popupU2fCloseMessage": {
-    "message": "لا يمكن لهذا المتصفح معالجة طلبات U2F في هذه النافذة المنبثقة. هل تريد فتح هذا المنبثق في نافذة جديدة بحيث يمكنك تسجيل الدخول باستخدام U2F؟"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "إظهار عداد الشارات"
-  },
-  "badgeCounterDesc": {
-    "message": "حدد عدد تسجيلات الدخول الخاصة بك لصفحة الويب الحالية."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "اسم حامل البطاقة"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "جديد $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "تحرير $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "عرض $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "سجل كلمة المرور"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "خطأ"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "سياسات مؤسستك شغلت الملء التلقائي في تحميل الصفحة."
   },
-  "howToAutofill": {
-    "message": "كيفية الملء التلقائي"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "حدد عنصر من هذه الشاشة، واستخدام الاختصار $COMMAND$، أو استكشاف خيارات أخرى في الإعدادات.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "الاسم البديل للنطاق"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "العناصر مع إعادة طلب كلمة المرور الرئيسية لا يمكن ملئها تلقائيًا عند تحميل الصفحة. التعبئة التلقائية عند تحميل الصفحة.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "ملء تلقائي عند تعيين تحميل الصفحة لاستخدام الإعداد الافتراضي.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "إيقاف تشغيل كلمة المرور الرئيسية مرة أخرى لتحرير هذا الحقل",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/az/messages.json b/apps/browser/src/_locales/az/messages.json
index 2a7659d9002..c877b87f90f 100644
--- a/apps/browser/src/_locales/az/messages.json
+++ b/apps/browser/src/_locales/az/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Axtarışı sıfırla"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Arxivdən çıxart"
+  },
+  "itemsInArchive": {
+    "message": "Arxivdəki elementlər"
+  },
+  "noItemsInArchive": {
+    "message": "Arxivdə element yoxdur"
+  },
+  "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": {
+    "message": "Element arxivə göndərildi"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Element arxivdən çıxarıldı"
+  },
+  "archiveItem": {
+    "message": "Elementi arxivlə"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Düzəliş et"
   },
@@ -701,6 +733,15 @@
   "invalidMasterPassword": {
     "message": "Yararsız ana parol"
   },
+  "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": "Seyf vaxtının bitməsi"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "İki addımlı giriş üsulunu seçin"
   },
-  "recoveryCodeDesc": {
-    "message": "İki faktorlu provayderlərinizə erişə bilmirsiniz? Geri qaytarma kodunuzu istifadə edərək hesabınızdakı bütün iki faktorlu provayderləri söndürün."
-  },
   "recoveryCodeTitle": {
     "message": "Geri qaytarma kodu"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Fərdi giriş elementləri üçün \"Səhifə yüklənəndə avto-doldur\"u elementin Düzəliş et görünüşündən söndürə bilərsiniz."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Səhifə yüklənəndə avto-doldur (Seçimlərdə fəallaşdırılıbsa)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "İlkin ayarı istifadə et"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Doğrulama kodunu alacağınız e-poçtu yoxlamaq üçün bu pəncərə xaricində bir yerə klikləsəniz bu pəncərə bağlanacaq. Bu pəncərənin bağlanmaması üçün yeni bir pəncərədə açmaq istəyirsiniz?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Bu brauzer bu açılan pəncərədə U2F tələblərini emal edə bilmir. U2F istifadə edərək giriş etmək üçün bu açılan pəncərəni yeni bir pəncərədə açmaq istəyirsiniz?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Nişan sayğacını göstər"
-  },
-  "badgeCounterDesc": {
-    "message": "Hazırkı veb səhifə üçün neçə giriş olduğunu göstərir."
+  "showIconsChangePasswordUrls": {
+    "message": "Veb sayt ikonlarını göstər və parol dəyişdirmə URL-lərini al"
   },
   "cardholderName": {
     "message": "Kart sahibinin adı"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Not"
   },
-  "newItemHeader": {
-    "message": "Yeni $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Yeni giriş",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ - düzəliş et",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Yeni kart",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "$TYPE$ - bax",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Yeni kimlik",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Yeni not",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Yeni SSH açarı",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Yeni Send mətni",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Yeni Send faylı",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Girişə düzəliş et",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Karta düzəliş et",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Kimliyə düzəliş et",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Nota düzəliş et",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "SSH açarına düzəliş et",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Send mətninə düzəliş et",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Send faylına düzəliş et",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Girişə bax",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Karta bax",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Kimliyə bax",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Nota bax",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "SSH açarına bax",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Parol tarixçəsi"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Xəta"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Təşkilatınızın siyasətləri, səhifə yüklənəndə avto-doldurmanı işə saldı."
   },
-  "howToAutofill": {
-    "message": "Avto-doldurma necə edilir"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Bu ekrandan bir element seçin, $COMMAND$ qısayolunu istifadə edin və ya ayarlardakı digər seçimləri kəşf edin.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Domen ləqəbi"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "\"Ana parolu təkrar soruş\" özəlliyi olan elementlər səhifə yüklənəndə avto-doldurulmur. \"Səhifə yüklənəndə avto-doldurma\" özəlliyi söndürülüb.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Bu xanaya düzəliş etmək üçün \"Ana parolu təkrar soruş\"u söndürün",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Yan naviqasiyanı aç/bağla"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Keçid açarı, klonlanmış elementə kopyalanmayacaq. Bu elementi klonlamağa davam etmək istəyirsiniz?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Başladan saytın tələb etdiyi doğrulama. Bu özəllik, hələlik ana parolu olmayan hesablara tətbiq olunmur."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Keçid açarı ilə giriş edilsin?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Animasiyaları fəallaşdır"
-  },
   "showAnimations": {
     "message": "Animasiyaları göstər"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Element yeri"
   },
-  "fileSend": {
-    "message": "Fayl \"Send\"i"
-  },
   "fileSends": {
     "message": "Fayl \"Send\"ləri"
   },
-  "textSend": {
-    "message": "Mətn \"Send\"i"
-  },
   "textSends": {
     "message": "Mətn \"Send\"ləri"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum özəl bitmə vaxtı 1 dəqiqədir."
   },
-  "additionalContentAvailable": {
-    "message": "Əlavə məzmun əlçatandır"
-  },
   "fileSavedToDevice": {
     "message": "Fayl cihazda saxlanıldı. Endirilənləri cihazınızdan idarə edin."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Seyfinizə xoş gəlmisiniz!"
   },
+  "phishingPageTitle": {
+    "message": "Fişinq veb sayt"
+  },
+  "phishingPageCloseTab": {
+    "message": "Vərəqi bağla"
+  },
+  "phishingPageContinue": {
+    "message": "Davam"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Bunu niyə görürürsünüz?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Hazırkı səhifə üçün elementləri avto-doldur"
   },
@@ -5584,6 +5657,12 @@
     "message": "Girişlərinizi güvənli şəkildə saxlamağınıza kömək etməsi üçün Parol yarat düyməsinə klikləyərək güclü və unikal parolları asanlıqla yaradın.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Bu ayar barədə"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden, təcrübənizi təkmilləşdirmək üçün hansı ikonun və ya parol dəyişdirmə URL-sinin istifadə olunmalı olduğunu müəyyənləşdirmək məqsədilə saxlanılmış giriş URL-lərini istifadə edəcək. Bu xidməti istifadə etdiyiniz zaman heç bir məlumat yığılmır və ya saxlanılmır."
+  },
   "noPermissionsViewPage": {
     "message": "Bu səhifəyə baxmaq icazəniz yoxdur. Fərqli hesabla giriş etməyə çalışın."
   },
@@ -5601,7 +5680,7 @@
     "message": "Növbəti"
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "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."
   },
   "confirmKeyConnectorDomain": {
diff --git a/apps/browser/src/_locales/be/messages.json b/apps/browser/src/_locales/be/messages.json
index e1af3400be1..fb645e0b815 100644
--- a/apps/browser/src/_locales/be/messages.json
+++ b/apps/browser/src/_locales/be/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Рэдагаваць"
   },
@@ -701,6 +733,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": "Час чакання сховішча"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Згубілі доступ да ўсіх варыянтаў доступу пастаўшчыкоў двухэтапнай аўтэнтыфікацыі? Скарыстайцеся кодам аднаўлення, каб адключыць праверку пастаўшчыкоў двухэтапнай аўтэнтыфікацыі для вашага ўліковага запісу."
-  },
   "recoveryCodeTitle": {
     "message": "Код аднаўлення"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Вы можаце выключыць аўтазапаўненне на старонцы загрузцы для асобных элементаў уваходу ў меню \"Рэдагаваць\"."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Аўтазапаўненне пры загрузцы старонкі (калі ўключана ў параметрах праграмы)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Выкарыстоўваць прадвызначаныя налады"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Націск за межамі ўсплывальнага акна для прагляду праверачнага кода прывядзе да яго закрыцця. Адкрыць гэта ўсплывальнае акно ў новым акне, якое не закрыецца?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Дадзены браўзер не можа апрацоўваць запыты U2F у гэтым усплывальным акне. Адкрыць гэта ўсплывальнае акно ў новым акне, каб мець магчымасць увайсці ў сістэму, выкарыстоўваючы U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Паказваць лічыльнік на значку"
-  },
-  "badgeCounterDesc": {
-    "message": "Паказвае колькасць уваходаў для бягучай вэб-старонкі."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Імя ўладальніка карткі"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "Новы $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Рэдагаваць $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Прагляд $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Гісторыя пароляў"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Памылка"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Аўтазапаўненне пры загрузцы старонцы было ўключана палітыкамі вашай арганізацыі."
   },
-  "howToAutofill": {
-    "message": "Як аўтазапоўніць"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Мянушка дамена"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Уключыць анімацыі"
-  },
   "showAnimations": {
     "message": "Паказаць анімацыі"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/bg/messages.json b/apps/browser/src/_locales/bg/messages.json
index b70e5e6f825..d27e426d4aa 100644
--- a/apps/browser/src/_locales/bg/messages.json
+++ b/apps/browser/src/_locales/bg/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Нулиране на търсенето"
   },
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архивиране",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Изваждане от архива"
+  },
+  "itemsInArchive": {
+    "message": "Елементи в архива"
+  },
+  "noItemsInArchive": {
+    "message": "Няма елементи в архива"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Архивираните елементи ще се показват тук и ще бъдат изключени от общите резултати при търсене и от предложенията за автоматично попълване."
+  },
+  "itemSentToArchive": {
+    "message": "Елементът е преместен в архива"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Елементът е изваден от архива"
+  },
+  "archiveItem": {
+    "message": "Архивиране на елемента"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Архивираните елементи са изключени от общите резултати при търсене и от предложенията за автоматично попълване. Наистина ли искате да архивирате този елемент?"
+  },
   "edit": {
     "message": "Редактиране"
   },
@@ -701,6 +733,15 @@
   "invalidMasterPassword": {
     "message": "Грешна главна парола"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Грешна главна парола. Проверете дали е-пощата е правилна и дали акаунтът Ви е създаден в $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Време за достъп"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Изберете начин за двустепенно удостоверяване"
   },
-  "recoveryCodeDesc": {
-    "message": "Ако сте загубили достъп до двустепенното удостоверяване, може да използвате код за възстановяване, за да изключите двустепенното удостоверяване в абонамента си."
-  },
   "recoveryCodeTitle": {
     "message": "Код за възстановяване"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Ако включите автоматичното попълване при зареждане на страница, след това можете да включвате или изключвате тази функционалност за всеки отделен запис. Това ще бъде стандартният начин на работа за записите, за които не е настроено допълнително."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Автоматично попълване при зареждане на страницата (ако е включено в настройките)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Използване на стандартната настройка"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Ако натиснете бутон на мишката извън изскочилия прозорец за кода за потвърждение, същият този прозорец ще се затвори. Искате ли проверката да се извърши в нормален прозорец, който не се затваря толкова лесно?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Този браузър не поддържа заявки чрез U2F в такъв изскачащ прозорец. Искате ли да се отвори нов прозорец, за да може да се впишете чрез U2F?"
-  },
-  "enableFavicon": {
-    "message": "Показване на иконките на уеб сайтовете"
-  },
-  "faviconDesc": {
-    "message": "Показване на разпознаваемо изображение до всеки запис."
-  },
-  "faviconDescAlt": {
-    "message": "Показване на разпознаваемо изображение до всеки елемент. Прилага се към всички акаунти, в които сте вписан(а)."
-  },
-  "enableBadgeCounter": {
-    "message": "Показване на брояч в значка"
-  },
-  "badgeCounterDesc": {
-    "message": "Показване на броя записи, които имате за текущата уеб страница."
+  "showIconsChangePasswordUrls": {
+    "message": "Показване на иконките на уеб сайтовете и извличане на адресите за смяна на паролата"
   },
   "cardholderName": {
     "message": "Име на притежателя на картата"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Бележка"
   },
-  "newItemHeader": {
-    "message": "Ново $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Нов елемент за вписване",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Редактиране на $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Нова карта",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Преглед на $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Нова самоличност",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Нова бележка",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Нов SSH ключ",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Ново текстово Изпращане",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Ново файлово Изпращане",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Редактиране на елемента за вписване",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Редактиране на картата",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Редактиране на самоличността",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Редактиране на бележката",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Редактиране на SSH ключа",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Редактиране на текстовото Изпращане",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Редактиране на файловото Изпращане",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Преглед на елемента за вписване",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Преглед на картата",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Преглед на самоличността",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Преглед на бележката",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Преглед на SSH ключа",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Хронология на паролата"
@@ -3138,6 +3207,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Ще бъдат изнесени само записите от трезора свързан с $ORGANIZATION$.",
+    "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": "Грешка"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Автоматичното попълване при зареждане на страница е включено в съответствие с политиките на Вашата организация."
   },
-  "howToAutofill": {
-    "message": "Как се ползва автоматичното попълване"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Изберете елемент на този екран, използвайте комбинацията $COMMAND$ или разгледайте други опции в настройките.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Псевдонимен домейн"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Записите с включено изискване за повторно въвеждане на главната парола не могат да бъдат попълвани автоматично при зареждане на страницата. Автоматичното попълване при зареждане на страницата е изключено.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "Автоматичното попълване при зареждане на страницата използва настройката си по подразбиране.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Изключете повторното въвеждане на главната парола, за да редактирате това поле",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Превключване на страничната навигация"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Секретният ключ няма да бъде копиран в клонирания елемент. Искате ли да продължите с клонирането на елемента?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Изисква се проверка от иницииращия сайт. Тази функция все още не е внедрена за акаунти без главна парола."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Вписване със секретен ключ?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Включване на анимациите"
-  },
   "showAnimations": {
     "message": "Показване на анимации"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Местоположение на елемента"
   },
-  "fileSend": {
-    "message": "Файлово изпращане"
-  },
   "fileSends": {
     "message": "Файлови изпращания"
   },
-  "textSend": {
-    "message": "Текстово изпращане"
-  },
   "textSends": {
     "message": "Текстови изпращания"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Минималното персонализирано време за достъп е 1 минута."
   },
-  "additionalContentAvailable": {
-    "message": "Има налично допълнително съдържание"
-  },
   "fileSavedToDevice": {
     "message": "Файлът е запазен на устройството. Можете да го намерите в мястото за сваляния на устройството."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Добре дошли в трезора си!"
   },
+  "phishingPageTitle": {
+    "message": "Измамен уеб сайт"
+  },
+  "phishingPageCloseTab": {
+    "message": "Затваряне на раздела"
+  },
+  "phishingPageContinue": {
+    "message": "Продължаване"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Защо виждате това?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Попълвайте автоматично елементи в текущата страница"
   },
@@ -5584,6 +5657,12 @@
     "message": "Създавайте лесно сложни и уникални пароли като щракнете върху бутона за генериране на парола, за да защитите данните си за вписване.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Относно тази настройка"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Битуорден ще използва запазените адреси за вписване, за да определи коя иконка или адрес за смяна на паролата да се ползва, за да улесни работата Ви. Никакви данни не се събират или съхраняват, когато използвате тази услуга."
+  },
   "noPermissionsViewPage": {
     "message": "Нямате права за преглед на тази страница. Опитайте да се впишете с друг акаунт."
   },
diff --git a/apps/browser/src/_locales/bn/messages.json b/apps/browser/src/_locales/bn/messages.json
index ff36e30adb1..66d3fbe598a 100644
--- a/apps/browser/src/_locales/bn/messages.json
+++ b/apps/browser/src/_locales/bn/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "সম্পাদনা"
   },
@@ -701,6 +733,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": "ভল্টের সময়সীমা"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "আপনার সমস্ত দ্বি-গুণক সরবরাহকারীদের অ্যাক্সেস হারিয়েছেন? আপনার অ্যাকাউন্ট থেকে সমস্ত দ্বি-গুণক সরবরাহকারীদের অক্ষম করতে আপনার পুনরুদ্ধার কোডটি ব্যবহার করুন।"
-  },
   "recoveryCodeTitle": {
     "message": "পুনরুদ্ধার কোড"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "আপনার যাচাইকরণ কোডটির জন্য আপনার ইমেলটি পরীক্ষা করতে পপআপ উইন্ডোটির বাইরে ক্লিক করলে এই পপআপটি বন্ধ হয়ে যাবে। আপনি কি এই পপআপটি একটি নতুন উইন্ডোতে খুলতে চান যাতে এটি বন্ধ না হয়?"
   },
-  "popupU2fCloseMessage": {
-    "message": "ব্রাউজারটি এই পপআপ উইন্ডোতে U2F অনুরোধগুলি প্রক্রিয়া করতে পারে না। আপনি কি এই পপআপটি একটি নতুন উইন্ডোতে খুলতে চান যাতে আপনি U2F ব্যবহার করে লগ ইন করতে পারেন?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "কার্ডধারীর নাম"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "পাসওয়ার্ড ইতিহাস"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/bs/messages.json b/apps/browser/src/_locales/bs/messages.json
index 8acfda7f422..39df44ca95e 100644
--- a/apps/browser/src/_locales/bs/messages.json
+++ b/apps/browser/src/_locales/bs/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/ca/messages.json b/apps/browser/src/_locales/ca/messages.json
index 53c71129630..7f897e9cb4c 100644
--- a/apps/browser/src/_locales/ca/messages.json
+++ b/apps/browser/src/_locales/ca/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Restableix la cerca"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edita"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Heu perdut l'accés a tots els vostres proveïdors de dos factors? Utilitzeu el vostre codi de recuperació per desactivar tots els proveïdors de dos factors del vostre compte."
-  },
   "recoveryCodeTitle": {
     "message": "Codi de recuperació"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Podeu desactivar l'emplenament automàtic a la càrrega de la pàgina per a elements d'inici de sessió individuals des de la vista d'edició de l'element."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Emplenament automàtic a la càrrega de la pàgina (si està habilitat a Opcions)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Utilitza la configuració per defecte"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "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?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Aquest navegador no pot processar sol·licituds U2F en aquesta finestra emergent. Voleu obrir l'emergent en una finestra nova per poder iniciar la sessió mitjançant U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Mostra el comptador insígnia"
-  },
-  "badgeCounterDesc": {
-    "message": "Indiqueu quants inicis de sessió teniu per a la pàgina web actual."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Nom del titular de la targeta"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Nota"
   },
-  "newItemHeader": {
-    "message": "Nou $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edita $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Mostra $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Historial de les contrasenyes"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Les polítiques de l'organització han activat l'emplenament automàtic en carregar la pàgina."
   },
-  "howToAutofill": {
-    "message": "Com emplenar automàticament"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Seleccioneu un element d'aquesta pantalla, utilitzeu la drecera $COMMAND$ o exploreu altres opcions a la configuració.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alies de domini"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Els elements amb una nova sol·licitud de contrasenya mestra no es poden omplir automàticament en carregar la pàgina. L'emplenament automàtic en carregar la pàgina està desactivat.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Desactiveu la sol·licitud de nova contrasenya mestra per editar aquest camp",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Canvia a la navegació lateral"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "La clau de pas no es copiarà a l'element clonat. Voleu continuar clonant aquest element?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verificació requerida pel lloc iniciador. Aquesta funció encara no s'ha implementat per als comptes sense contrasenya mestra."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Inici de sessió amb clau de pas?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Mostra animacions"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "Send de fitxer"
-  },
   "fileSends": {
     "message": "Sends de fitxer"
   },
-  "textSend": {
-    "message": "Send de text"
-  },
   "textSends": {
     "message": "Sends de text"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "El temps d'espera personalitzat mínim és d'1 minut."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/cs/messages.json b/apps/browser/src/_locales/cs/messages.json
index a8209ef4016..8820af69f98 100644
--- a/apps/browser/src/_locales/cs/messages.json
+++ b/apps/browser/src/_locales/cs/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Resetovat hledání"
   },
+  "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"
+  },
+  "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": {
+    "message": "Položka byla přesunuta do archivu"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Položka byla odebrána z archivu"
+  },
+  "archiveItem": {
+    "message": "Archivovat položku"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Upravit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Vyberte metodu dvoufázového přihlášení"
   },
-  "recoveryCodeDesc": {
-    "message": "Ztratili jste přístup ke všem nastaveným poskytovatelům dvoufázového přihlášení? Použijte obnovovací kód pro vypnutí dvoufázového přihlášení."
-  },
   "recoveryCodeTitle": {
     "message": "Kód pro obnovení"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Můžete vypnout automatické vyplňování při načtení stránky pro jednotlivé přihlašovací položky v zobrazení pro úpravu položky."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Automatické vyplnění při načtení stránky (pokud je nastaveno)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Použít výchozí nastavení"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Klepnutím mimo vyskakovací okno při zjišťování ověřovacího kódu zaslaného na e-mail bude vyskakovací okno zavřeno. Chcete otevřít toto vyskakovací okno v novém okně, aby se nezavřelo?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Tento prohlížeč nemůže zpracovat požadavky U2F  ve vyskakovacím okně. Chcete otevřít toto vyskakovací okno v novém okně, abyste se mohli přihlásit pomocí U2F?"
-  },
-  "enableFavicon": {
-    "message": "Zobrazit ikony webových stránek"
-  },
-  "faviconDesc": {
-    "message": "Zobrazí rozeznatelný obrázek vedle každého přihlášení."
-  },
-  "faviconDescAlt": {
-    "message": "Zobrazí rozeznatelný obrázek vedle každého přihlášení. Platí pro všechny přihlášené účty."
-  },
-  "enableBadgeCounter": {
-    "message": "Zobrazovat počet uložených přihlašovacích údajů na stránce"
-  },
-  "badgeCounterDesc": {
-    "message": "Zobrazí počet přihlašovacích údajů pro aktuální webovou stránku na ikoně rozšíření prohlížeče."
+  "showIconsChangePasswordUrls": {
+    "message": "Zobrazit ikony webových stránek a načíst URL adresy pro změnu hesla"
   },
   "cardholderName": {
     "message": "Jméno držitele karty"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Poznámka"
   },
-  "newItemHeader": {
-    "message": "Nové $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nové přihlášení",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Upravit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nová karta",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Zobrazit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nová identita",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nová poznámka",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nový SSH klíč",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Nový textový Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Nový Send se soubory",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Upravit přihlášení",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Upravit kartu",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Upravit identitu",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Upravit poznámku",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Upravit SSH klíč",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Upravit textový Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Upravit Send se soubory",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Zobrazit přihlášení",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Zobrazit kartu",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Zobrazit identitu",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Zobrazit poznámku",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Zobrazit SSH klíč",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Historie hesel"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Chyba"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Podle zásad Vaší organizace je zapnuto automatické vyplňování při načítání stránky."
   },
-  "howToAutofill": {
-    "message": "Jak na automatické vyplňování"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Vyberte položku z této obrazovky, použijte zkratku $COMMAND$ nebo prozkoumejte další volby v nastavení.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Doména aliasu"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Položky se žádostí o změnu hlavního hesla nemohou být automaticky vyplněny při načítání stránky. Automatické vyplnění při načítání stránky je vypnuto.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Pro úpravu tohoto pole vypněte požadavek na hlavní heslo",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Přepnout boční navigaci"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Přístupový klíč nebude zkopírován do duplikované položky. Chete pokračovat v duplikování této položky?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Ověření vyžadované iniciátorem webu. Tato funkce ještě není implementována pro účty bez hlavního hesla."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Přihlásit se pomocí přístupového klíče?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Povolit animace"
-  },
   "showAnimations": {
     "message": "Zobrazit animaci"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Umístění položky"
   },
-  "fileSend": {
-    "message": "Send souboru"
-  },
   "fileSends": {
     "message": "Sends se soubory"
   },
-  "textSend": {
-    "message": "Send textu"
-  },
   "textSends": {
     "message": "Sends s texty"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimální vlastní časový limit je 1 minuta."
   },
-  "additionalContentAvailable": {
-    "message": "Je k dispozici další obsah"
-  },
   "fileSavedToDevice": {
     "message": "Soubor byl uložen. Můžete jej nalézt ve stažené složce v zařízení."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Vítejte ve Vašem trezoru!"
   },
+  "phishingPageTitle": {
+    "message": "Phishingové webová stránka"
+  },
+  "phishingPageCloseTab": {
+    "message": "Zavřít kartu"
+  },
+  "phishingPageContinue": {
+    "message": "Pokračovat"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Proč to vidíte?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Položky automatického vyplňování aktuální stránky"
   },
@@ -5584,6 +5657,12 @@
     "message": "Jednoduše vytvořte silná a unikátní hesla klepnutím na tlačítko Generovat heslo, které Vám pomůže udržet Vaše přihlašovací údaje v bezpečí.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "O tomto nastavení"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden bude používat uložené přihlašovací URI k identifikaci, která ikona nebo změna adresy URL by měla být použita pro zlepšení Vašeho zážitku. Při používání této služby nejsou shromažďovány ani ukládány žádné informace."
+  },
   "noPermissionsViewPage": {
     "message": "Nemáte oprávnění k zobrazení této stránky. Zkuste se přihlásit jiným účtem."
   },
diff --git a/apps/browser/src/_locales/cy/messages.json b/apps/browser/src/_locales/cy/messages.json
index 5f7c624cbda..ded0ad406df 100644
--- a/apps/browser/src/_locales/cy/messages.json
+++ b/apps/browser/src/_locales/cy/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Golygu"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Cod adfer"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Defnyddio'r gosodiad rhagosodedig"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Enw ar y cerdyn"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "$TYPE$ newydd",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Golygu $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Gweld $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Hanes cyfrineiriau"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Gwall"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "Sut i lenwi'n awtomatig"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Dewiswch eitem o'r sgrin hon, defnyddiwch y llwybr byr $COMMAND$, neu darganfyddwch ddewisiadau eraill yn y gosodiadau.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Galluogi animeiddio"
-  },
   "showAnimations": {
     "message": "Dangos animeiddio"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/da/messages.json b/apps/browser/src/_locales/da/messages.json
index e3a18790a85..04d287947ee 100644
--- a/apps/browser/src/_locales/da/messages.json
+++ b/apps/browser/src/_locales/da/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Redigér"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Mistet adgang til alle dine to-faktor-udbydere? Brug din genoprettelseskode til at deaktivere alle to-faktor udbydere på din konto."
-  },
   "recoveryCodeTitle": {
     "message": "Gendannelseskode"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Autoudfyldning ved sideindlæsning kan slås fra for individuelle loginemner fra emnets redigeringsvisning."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autoudfyld ved sideindlæsning (hvis opsat i Indstillinger)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Anvend standardindstilling"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Ved at klikke uden for pop-up-vinduet for at tjekke din e-mail for din bekræftelseskode vil få denne popup til at lukke. Vil du åbne denne popup i et nyt vindue, så det ikke lukker?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Denne browser kan ikke behandle U2F-anmodninger i dette popup-vindue. Vil du åbne denne popup i et nyt vindue, så du kan logge ind ved hjælp af U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Vis badge-tæller"
-  },
-  "badgeCounterDesc": {
-    "message": "Vis hvor mange logins du har til den aktuelle webside."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Kortholders navn"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "Ny $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Redigér $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Vis $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Adgangskodehistorik"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Fejl"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Organisationspolitikkerne har aktiveret autoudfyldning ved sideindlæsning."
   },
-  "howToAutofill": {
-    "message": "Sådan autoudfyldes"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Vælg et emne fra denne skærm, brug genvejen $COMMAND$ eller udforsk andre valgmuligheder i Indstillinger.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Aliasdomæne"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Emner, hvor der anmodes om hovedadgangskode igen, kan ikke autoudfyldes ved sideindlæsning. Autoudfyldning ved sideindlæsning er slået fra.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Slå anmodning om hovedadgangskode igen fra for at redigere dette felt",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Slå sidenavigering til/fra"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Adgangsnøglen kopieres ikke til det klonede emne. Fortsæt kloningen af emnet alligevel?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Bekræftelse krævet af startwebstedet. Denne funktion er endnu ikke implementeret for konti uden hovedadgangskode."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log ind med adgangsnøgle?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Aktivér animationer"
-  },
   "showAnimations": {
     "message": "Vis animationer"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Emneplacering"
   },
-  "fileSend": {
-    "message": "Fil Send"
-  },
   "fileSends": {
     "message": "Fil-Sends"
   },
-  "textSend": {
-    "message": "Tekst Send"
-  },
   "textSends": {
     "message": "Tekst-Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Tilpasset minimumstimeout udgør 1 minut."
   },
-  "additionalContentAvailable": {
-    "message": "Yderligere indhold er tilgængeligt"
-  },
   "fileSavedToDevice": {
     "message": "Fil gemt på enheden. Håndtér fra enhedens downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/de/messages.json b/apps/browser/src/_locales/de/messages.json
index 0836c82c0c2..ce26078d427 100644
--- a/apps/browser/src/_locales/de/messages.json
+++ b/apps/browser/src/_locales/de/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Suche zurücksetzen"
   },
+  "archiveNoun": {
+    "message": "Archiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archivieren",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Nicht mehr archivieren"
+  },
+  "itemsInArchive": {
+    "message": "Einträge im Archiv"
+  },
+  "noItemsInArchive": {
+    "message": "Keine Einträge im Archiv"
+  },
+  "noItemsInArchiveDesc": {
+    "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"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Eintrag aus dem Archiv entfernt"
+  },
+  "archiveItem": {
+    "message": "Eintrag archivieren"
+  },
+  "archiveItemConfirmDesc": {
+    "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?"
+  },
   "edit": {
     "message": "Bearbeiten"
   },
@@ -557,7 +589,7 @@
     "message": "Anzeigen"
   },
   "viewLogin": {
-    "message": "Login ansehen"
+    "message": "Zugangsdaten anzeigen"
   },
   "noItemsInList": {
     "message": "Keine Einträge zum Anzeigen vorhanden."
@@ -701,6 +733,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"
   },
@@ -893,7 +934,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"
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Zwei-Faktor-Authentifizierungsmethode auswählen"
   },
-  "recoveryCodeDesc": {
-    "message": "Zugang zu allen Zwei-Faktor Anbietern verloren? Benutze deinen Wiederherstellungscode, um alle Zwei-Faktor Anbieter in deinem Konto zu deaktivieren."
-  },
   "recoveryCodeTitle": {
     "message": "Wiederherstellungscode"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Du kannst Auto-Ausfüllen beim Laden der Seite für einzelne Zugangsdaten-Einträge in der Bearbeiten-Ansicht des Eintrags deaktivieren."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Auto-Ausfüllen beim Laden der Seite (wenn in Optionen aktiviert)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Nutze Standardeinstellung"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "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?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Dieser Browser kann U2F-Anfragen in diesem Popup-Fenster nicht verarbeiten. Möchtest du dieses Popup in einem neuen Fenster öffnen, damit du dich mit U2F anmelden kannst?"
-  },
-  "enableFavicon": {
-    "message": "Website-Symbole anzeigen"
-  },
-  "faviconDesc": {
-    "message": "Ein wiedererkennbares Bild neben jedem Login anzeigen."
-  },
-  "faviconDescAlt": {
-    "message": "Ein wiedererkennbares Bild neben jedem Login anzeigen. Gilt für alle eingeloggten Konten."
-  },
-  "enableBadgeCounter": {
-    "message": "Badge-Zähler anzeigen"
-  },
-  "badgeCounterDesc": {
-    "message": "Zeigt an, wie viele Zugangsdaten du für die aktuelle Webseite besitzt."
+  "showIconsChangePasswordUrls": {
+    "message": "Website-Symbole anzeigen und URLs zum Ändern von Passwörtern ermitteln"
   },
   "cardholderName": {
     "message": "Name des Karteninhabers"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Notiz"
   },
-  "newItemHeader": {
-    "message": "Neue $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Neue Zugangsdaten",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ bearbeiten",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Neue Karte",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "$TYPE$ ansehen",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Neue Identität",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Neue Notiz",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Neuer SSH-Schlüssel",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Neues Text-Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Neues Datei-Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Zugangsdaten bearbeiten",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Karte bearbeiten",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Identität bearbeiten",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Notiz bearbeiten",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "SSH-Schlüssel bearbeiten",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Text-Send bearbeiten",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Datei-Send bearbeiten",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Zugangsdaten anzeigen",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Karte anzeigen",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Identität anzeigen",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Notiz anzeigen",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "SSH-Schlüssel anzeigen",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Passwortverlauf"
@@ -2172,7 +2241,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."
@@ -2590,7 +2659,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",
@@ -2600,7 +2669,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",
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Fehler"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Deine Organisationsrichtlinien haben das automatische Ausfüllen beim Laden der Seite aktiviert."
   },
-  "howToAutofill": {
-    "message": "So funktioniert automatisches Ausfüllen"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Wähle einen Eintrag von dieser Bildschirmseite, verwende das Tastaturkürzel $COMMAND$ oder entdecke andere Optionen in den Einstellungen.",
     "placeholders": {
@@ -3700,7 +3784,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."
@@ -3782,7 +3866,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"
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias-Domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Einträge, die eine erneuten Abfrage des Master-Passworts verlangen, können nicht beim Laden einer Seite automatisch ausgefüllt werden. Auto-Ausfüllen beim Laden einer Seite deaktiviert.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Deaktiviere die erneute Abfrage des Master-Passworts, um dieses Feld zu bearbeiten",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Seitennavigation umschalten"
   },
@@ -4135,10 +4211,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."
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Der Passkey wird nicht in den duplizierten Eintrag kopiert. Möchtest du mit dem Duplizieren dieses Eintrags fortfahren?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Überprüfung durch die initiierende Website erforderlich. Diese Funktion ist noch nicht für Konten ohne Master-Passwort implementiert."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Mit Passkey anmelden?"
   },
@@ -4378,7 +4451,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": {
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Animationen aktivieren"
-  },
   "showAnimations": {
     "message": "Animationen anzeigen"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Eintrags-Standort"
   },
-  "fileSend": {
-    "message": "Datei-Send"
-  },
   "fileSends": {
     "message": "Datei-Sends"
   },
-  "textSend": {
-    "message": "Text-Send"
-  },
   "textSends": {
     "message": "Text-Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Das minimal benutzerdefinierte Timeout beträgt 1 Minute."
   },
-  "additionalContentAvailable": {
-    "message": "Zusätzlicher Inhalt ist verfügbar"
-  },
   "fileSavedToDevice": {
     "message": "Datei auf Gerät gespeichert. Greife darauf über die Downloads deines Geräts zu."
   },
@@ -5456,10 +5517,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"
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Willkommen in deinem Tresor!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing-Website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Tab schließen"
+  },
+  "phishingPageContinue": {
+    "message": "Weiter"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Warum wird dir das angezeigt?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Einträge für die aktuelle Seite automatisch ausfüllen"
   },
@@ -5516,7 +5589,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"
@@ -5549,16 +5622,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"
   },
@@ -5584,8 +5657,14 @@
     "message": "Generiere ganz einfach starke und einzigartige Passwörter, indem du auf den \"Passwort generieren\"-Button klickst, um dir zu helfen, deine Zugangsdaten sicher zu halten.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Über diese Einstellung"
+  },
+  "permitCipherDetailsDescription": {
+    "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.",
@@ -5601,10 +5680,10 @@
     "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"
   }
 }
diff --git a/apps/browser/src/_locales/el/messages.json b/apps/browser/src/_locales/el/messages.json
index c2ea283e4d9..139899b10ac 100644
--- a/apps/browser/src/_locales/el/messages.json
+++ b/apps/browser/src/_locales/el/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Επαναφορά αναζήτησης"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Επεξεργασία"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Έχετε χάσει την πρόσβαση σε όλους τους παρόχους δύο παραγόντων; Χρησιμοποιήστε τον κωδικό ανάκτησης για να απενεργοποιήσετε όλους τους παρόχους δύο παραγόντων από το λογαριασμό σας."
-  },
   "recoveryCodeTitle": {
     "message": "Κωδικός ανάκτησης"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Μπορείτε να απενεργοποιήσετε την αυτόματη συμπλήρωση κατά τη φόρτωση της σελίδας για μεμονωμένα αντικείμενα σύνδεσης από την προβολή Επεξεργασία αντικειμένου."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Αυτόματη συμπλήρωση κατά τη φόρτωση της σελίδας (αν έχει ενεργοποιηθεί στις Επιλογές)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Χρήση προεπιλεγμένης ρύθμισης"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Εάν κάνετε κλικ έξω από το αναδυόμενο παράθυρο για να ελέγξετε το email για κωδικό επαλήθευσης, το αναδυόμενο παράθυρο θα κλείσει. Θέλετε να ανοίξετε αυτό το αναδυόμενο σε νέο παράθυρο ώστε να μην κλείνει;"
   },
-  "popupU2fCloseMessage": {
-    "message": "Αυτό το πρόγραμμα περιήγησης δεν μπορεί να επεξεργαστεί αιτήματα του U2F σε αυτό το αναδυόμενο παράθυρο. Θέλετε να ανοίξετε το αναδυόμενο σε νέο παράθυρο, ώστε να μπορείτε να συνδεθείτε χρησιμοποιώντας U2F;"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Εμφάνιση μετρητή εμβλημάτων"
-  },
-  "badgeCounterDesc": {
-    "message": "Υποδείξτε πόσες συνδέσεις έχετε για την τρέχουσα ιστοσελίδα."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Όνομα κατόχου κάρτας"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "Νέα $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Επεξεργασία $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Εμφάνιση $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Ιστορικό κωδικού πρόσβασης"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Σφάλμα"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Οι πολιτικές του οργανισμού σας έχουν ενεργοποιήσει την αυτόματη συμπλήρωση με φόρτωση σελίδας."
   },
-  "howToAutofill": {
-    "message": "Πώς να συμπληρώσετε αυτόματα"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Επιλέξτε ένα αντικείμενο από αυτήν την οθόνη, χρησιμοποιήστε τη συντόμευση $COMMAND$, ή εξερευνήστε άλλες επιλογές στις ρυθμίσεις.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Ψευδώνυμο τομέα"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Τα αντικείμενα με υπόδειξη κύριου κωδικού πρόσβασης δεν μπορούν να συμπληρωθούν αυτόματα κατά τη φόρτωση της σελίδας. Η αυτόματη συμπλήρωση έχει απενεργοποιηθεί κατά τη φόρτωση της σελίδας.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "Η αυτόματη συμπλήρωση κατά τη φόρτωση της σελίδας ορίστηκε να χρησιμοποιεί τις προεπιλεγμένες ρυθμίσεις.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Απενεργοποιήστε την υπόδειξη κύριου κωδικού πρόσβασης για να επεξεργαστείτε αυτό το πεδίο",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Εναλλαγή πλευρικής πλοήγησης"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Το κλειδί πρόσβασης δε θα αντιγραφεί στο κλωνοποιημένο αντικείμενο. Θέλετε να συνεχίσετε την κλωνοποίηση αυτού του αντικειμένου;"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Απαιτείται επαλήθευση από τον ιστότοπο εκκίνησης. Αυτή η λειτουργία δεν έχει ακόμα υλοποιηθεί για λογαριασμούς χωρίς τον κύριο κωδικό πρόσβασης."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Σύνδεση με κλειδί πρόσβασης;"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Ενεργοποίηση κινούμενων εικόνων"
-  },
   "showAnimations": {
     "message": "Εμφάνιση εφέ κίνησης"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Τοποθεσία Αντικειμένου"
   },
-  "fileSend": {
-    "message": "Δημιουργία Αποστολής"
-  },
   "fileSends": {
     "message": "Send αρχείων"
   },
-  "textSend": {
-    "message": "Κείμενο Αποστολής"
-  },
   "textSends": {
     "message": "Send κειμένων"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Το ελάχιστο προσαρμοσμένο χρονικό όριο λήξης είναι 1 λεπτό."
   },
-  "additionalContentAvailable": {
-    "message": "Διατίθεται πρόσθετο περιεχόμενο"
-  },
   "fileSavedToDevice": {
     "message": "Το αρχείο αποθηκεύτηκε στη συσκευή. Διαχειριστείτε το από τις λήψεις της συσκευής σας."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index a44b1e11c32..df47d357746 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4379,7 +4452,7 @@
   },
    "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."  
+    "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.",
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle":{
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/en_GB/messages.json b/apps/browser/src/_locales/en_GB/messages.json
index d5a554e0163..8dc87aa722a 100644
--- a/apps/browser/src/_locales/en_GB/messages.json
+++ b/apps/browser/src/_locales/en_GB/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off auto-fill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Auto-fill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this pop-up window. Do you want to open this pop-up in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognisable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognisable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organisation policies have turned on auto-fill on page load."
   },
-  "howToAutofill": {
-    "message": "How to auto-fill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be auto-filled on page load. Auto-fill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/en_IN/messages.json b/apps/browser/src/_locales/en_IN/messages.json
index 7cf57ebd099..cf8b7e08d22 100644
--- a/apps/browser/src/_locales/en_IN/messages.json
+++ b/apps/browser/src/_locales/en_IN/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to disable all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "After enabling Auto-fill on Page Load, you can enable or disable the feature for individual login items. This is the default setting for login items that are not separately configured."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Auto-fill on Page Load (if enabled in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this pop-up window. Do you want to open this pop-up in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognisable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognisable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organisation policies have turned on auto-fill on page load."
   },
-  "howToAutofill": {
-    "message": "How to auto-fill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be auto-filled on page load. Auto-fill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/es/messages.json b/apps/browser/src/_locales/es/messages.json
index 4f9d67b15f1..27404fdc5f6 100644
--- a/apps/browser/src/_locales/es/messages.json
+++ b/apps/browser/src/_locales/es/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Restablecer búsqueda"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Editar"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Selecciona un método de inicio de sesión en dos pasos"
   },
-  "recoveryCodeDesc": {
-    "message": "¿Has perdido el acceso a todos tus métodos de autenticación en dos pasos? Utiliza tu código de recuperación para deshabilitar todos los métodos de autenticación en dos pasos de tu cuenta."
-  },
   "recoveryCodeTitle": {
     "message": "Código de recuperación"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Puedes desactivar el autocompletado al cargar la página para elementos individuales de inicio de sesión desde la vista de Edición del elemento."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Auto-relleno en carga de página (si está habilitado en opciones)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Usar configuración predeterminada"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Pulsar fuera de la ventana emergente para comprobar tu correo de verificación, hará que esta se cierre. ¿Quieres abrir esta ventana emergente en una nueva ventana para evitar su cierre?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Este navegador no puede procesar las peticiones U2F en esta ventana emergente. ¿Desea abrir esta ventana emergente en una nueva ventana para que pueda iniciar sesión usando U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Mostrar el contador numérico"
-  },
-  "badgeCounterDesc": {
-    "message": "Indique cuántos inicios de sesión tiene para la página web actual."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Nombre en la tarjeta"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Nota"
   },
-  "newItemHeader": {
-    "message": "Nuevo $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Editar $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Ver $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Historial de contraseñas"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Las políticas de su organización han activado autocompletar al cargar la página."
   },
-  "howToAutofill": {
-    "message": "Cómo autocompletar"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Selecciona un elemento de esta pantalla, usa el acceso directo $COMMAND$ o explora otras opciones en ajustes.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Seudónimo del dominio"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Los elementos que requieren la contraseña maestra no se pueden rellenar automáticamente al cargar la página. Se desactivó el autorrellenado de la página.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Desactiva la solicitud de contraseña maestra para editar este campo",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Activar/desactivar navegación lateral"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "La clave de acceso no se copiará al elemento clonado. ¿Desea continuar clonando este elemento?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verificación requerida por el sitio inicial. Esta característica aún no está implementada para cuentas sin contraseña maestra."
-  },
   "logInWithPasskeyQuestion": {
     "message": "¿Iniciar sesión con clave de acceso?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Activar animaciones"
-  },
   "showAnimations": {
     "message": "Mostrar animaciones"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Ubicación del elemento"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "El tiempo de espera mínimo personalizado es de 1 minuto."
   },
-  "additionalContentAvailable": {
-    "message": "Contenido adicional disponible"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "¡Bienvenido a tu caja fuerte!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Crea fácilmente contraseñas seguras y únicas haciendo clic en el botón Generar contraseña para ayudarte a mantener tus inicios de sesión seguros.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "No tienes permisos para ver esta página. Intenta iniciar sesión con otra cuenta."
   },
diff --git a/apps/browser/src/_locales/et/messages.json b/apps/browser/src/_locales/et/messages.json
index 68e57c06dbd..a4fb0892e46 100644
--- a/apps/browser/src/_locales/et/messages.json
+++ b/apps/browser/src/_locales/et/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Muuda"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Puudub ligipääs kaheastmelise kinnitamise teenusele? Kasuta Taastamise koodi, et kaheastmeline kinnitamine oma kontol välja lülitada."
-  },
   "recoveryCodeTitle": {
     "message": "Taastamise kood"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "\"Luba kontoandmete täitmine\" sisselülitamisel saad selle siiski individuaalselt iga kirje seadetes välja lülitada. See seadistus rakendub kõikidele kirjetele, mida pole eraldi konfigureeritud."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Luba kontoandmete täitmine (kui see on aktiveeritud)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Kasuta vaikeseadistust"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "See aken sulgub, kui klikid oma e-posti aknale, et sealt kinnituskoodi vaadata. Soovid selle hüpikakna uues aknas avada, et seda ei juhtuks?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Kasutatav brauser ei suuda selles aknas U2F päringuid töödelda. Kas avan uue akna, et saaksid U2F abil sisse logida?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Kuva kirjete arvu"
-  },
-  "badgeCounterDesc": {
-    "message": "Kuvab numbrina konkreetsel veebilehel olevate kirjete arvu."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Kaardiomaniku nimi"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "Uus $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Paroolide ajalugu"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Viga"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Sinu organisatsioon ei võimalda lehe laadimisel automaatset kontoandmete täitmist kasutada."
   },
-  "howToAutofill": {
-    "message": "Kuidas automaatselt täita"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domeen"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Pääsukoodi ei kopeerita kloonitud kirjele. Oled kindel, et soovid jätkata?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Tere tulemast sinu hoidlasse!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/eu/messages.json b/apps/browser/src/_locales/eu/messages.json
index ea3f38764dd..cc6b510f37e 100644
--- a/apps/browser/src/_locales/eu/messages.json
+++ b/apps/browser/src/_locales/eu/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Editatu"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Bi urratseko egiaztatzeko modu guztietarako sarbidea galdu duzu? Erabili zure berreskuratze-kodea zure kontuko bi urratseko egiaztatze hornitzaile guztiak desaktibatzeko."
-  },
   "recoveryCodeTitle": {
     "message": "Berreskuratze-kodea"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Orrialdearen kargatze aukeretan auto-betetzea aktibatu ondoren, banakako saio-hasierak aktibatu edo desaktibatu ditzakezu."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Auto-bete orrialdea kargatzean (ezarpenetan gaituta badago)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Erabili ezarpen lehenetsiak"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Leiho gainjarritik kanpora klik eginez gero, zure emaila egiaztatzeko leiho gainjarria itxi egingo da. Leiho berri batean ireki nahi duzu leiho gainjarri hau itxi ez dadin?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Nabigatzaile honek ezin ditu U2F eskaerak prozesatu leiho gainjarri honetan. Leiho berri batean ireki nahi duzu leiho gainjarri hau saioa U2F erabiliz hasi ahal izateko?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Erakutsi txartelen kontagailua"
-  },
-  "badgeCounterDesc": {
-    "message": "Adierazi zenbat saio-hasiera dituzun uneko webgunerako."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Txartelaren titularraren izena"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Pasahitz historia"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Akatsa"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/fa/messages.json b/apps/browser/src/_locales/fa/messages.json
index dde97ff4058..4ec4d513039 100644
--- a/apps/browser/src/_locales/fa/messages.json
+++ b/apps/browser/src/_locales/fa/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "ویرایش"
   },
@@ -701,6 +733,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": "متوقف شدن گاو‌صندوق"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "انتخاب ورود دو مرحله‌ای"
   },
-  "recoveryCodeDesc": {
-    "message": "دسترسی به تمامی ارائه‌دهندگان دو مرحله‌ای را از دست داده‌اید؟ از کد بازیابی خود برای غیرفعال‌سازی ارائه‌دهندگان دو مرحله‌ای از حسابتان استفاده کنید."
-  },
   "recoveryCodeTitle": {
     "message": "کد بازیابی"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "می‌توانید پر کردن خودکار هنگام بارگیری صفحه را برای موارد ورود به سیستم از نمای ویرایش مورد خاموش کنید."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "پر کردن خودکار بارگذاری صفحه (درصورت فعال بودن در گزینه‌ها)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "استفاده از تنظیمات پیش‌فرض"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "در خارج از پنجره پاپ آپ کلیک کنید که ایمیل‌تان بررسی شود برای کد تأییدیه که باعث می‌شود این پنجره بسته شود. آیا می‌خواهید این پاپ آپ را در یک پنجره جدید باز کنید تا آن را نبندید؟"
   },
-  "popupU2fCloseMessage": {
-    "message": "این مرورگر نمی‌تواند درخواستهای U2F را در این پنجره پاپ آپ پردازش کند. آیا می‌خواهید این پنجره را در یک پنجره جدید باز کنید تا بتوانید با استفاده از U2F وارد شوید؟"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "نمایش شمارنده نشان"
-  },
-  "badgeCounterDesc": {
-    "message": "تعداد ورود به صفحه وب فعلی را مشخص کن."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "نام صاحب کارت"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "یادداشت"
   },
-  "newItemHeader": {
-    "message": "$TYPE$ جدید",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "ویرایش $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "مشاهده $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "تاریخچه کلمه عبور"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "خطا"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "خط مشی‌های سازمان شما پر کردن خودکار هنگام بارگیری صفحه را روشن کرده است."
   },
-  "howToAutofill": {
-    "message": "نحوه پر کردن خودکار"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "یک مورد را از این صفحه انتخاب کنید، از میان‌بر $COMMAND$ استفاده کنید، یا گزینه‌های دیگر را در تنظیمات بررسی کنید.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "دامنه مستعار"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "موارد با درخواست مجدد کلمه عبور اصلی را نمی‌توان در بارگذاری صفحه به‌صورت خودکار پر کرد. پر کردن خودکار در بارگیری صفحه خاموش شد.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "پر کردن خودکار در بارگیری صفحه برای استفاده از تنظیمات پیش‌فرض تنظیم شده است.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "برای ویرایش این فیلد، درخواست مجدد کلمه عبور اصلی را خاموش کنید",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "تغییر وضعیت ناوبری کناری"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "کلید عبور در مورد شبیه‌سازی شده کپی نمی‌شود. آیا می‌خواهید به شبیه‌سازی این مورد ادامه دهید؟"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "تأیید توسط سایت آغازگر الزامی است. این ویژگی هنوز برای حساب‌های کاربری بدون کلمه عبور اصلی اجرا نشده است."
-  },
   "logInWithPasskeyQuestion": {
     "message": "با کلید عبور وارد می‌شوید؟"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "فعال‌سازی انیمیشن‌ها"
-  },
   "showAnimations": {
     "message": "نمایش انیمیشن‌ها"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "مکان مورد"
   },
-  "fileSend": {
-    "message": "پرونده ارسال"
-  },
   "fileSends": {
     "message": "پرونده ارسال‌ها"
   },
-  "textSend": {
-    "message": "ارسال متن"
-  },
   "textSends": {
     "message": "ارسال‌های متن"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "حداقل مهلت زمانی سفارشی ۱ دقیقه است."
   },
-  "additionalContentAvailable": {
-    "message": "محتوای اضافی در دسترس است"
-  },
   "fileSavedToDevice": {
     "message": "پرونده در دستگاه ذخیره شد. از بخش بارگیری‌های دستگاه خود مدیریت کنید."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "به گاوصندوق خود خوش آمدید!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "پر کردن خودکار موارد برای صفحه فعلی"
   },
@@ -5584,6 +5657,12 @@
     "message": "با کلیک روی دکمه تولید کلمه عبور، به‌راحتی کلمات عبور قوی و منحصر به‌ فرد ایجاد کنید تا ورودهای شما ایمن باقی بمانند.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "شما اجازه دسترسی به این صفحه را ندارید. لطفاً با حساب کاربری دیگری وارد شوید."
   },
diff --git a/apps/browser/src/_locales/fi/messages.json b/apps/browser/src/_locales/fi/messages.json
index 046769b9043..5edc9e84c63 100644
--- a/apps/browser/src/_locales/fi/messages.json
+++ b/apps/browser/src/_locales/fi/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Nollaa haku"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Muokkaa"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Valitse todennustapa"
   },
-  "recoveryCodeDesc": {
-    "message": "Etkö voi käyttää kaksivaiheisen kirjautumisen todentajiasi? Poista kaikki tilillesi määritetyt todentajat käytöstä palautuskoodillasi."
-  },
   "recoveryCodeTitle": {
     "message": "Palautuskoodi"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Automaattinen täyttö voidaan ottaa käyttöön tai poistaa käytöstä kohdekohtaisesti muokkaamalla yksittäisiä kirjautumistietoja."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Automaattitäyttö sivun avautuessa (jos määritetty asetuksista)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Käytä oletusasetusta"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Painallus ponnahdusikkunan ulkopuolelle todennuskoodin sähköpostista noutoa varten sulkee ikkunan. Haluatko avata näkymän uuteen ikkunaan, jotta se pysyy avoinna?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Tämä selain ei voi käsitellä U2F-pyyntöjä tässä ponnahdusikkunassa. Haluatko avata näkymän uuteen ikkunaan vahvistaaksesi kirjautumisen U2F-suojausavaimella?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Näytä laskuri"
-  },
-  "badgeCounterDesc": {
-    "message": "Ilmaisee nykyiselle sivulle sopivien kirjautumistietojen määrän."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Kortinhaltijan nimi"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Muistiinpano"
   },
-  "newItemHeader": {
-    "message": "Uusi $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Muokkaa tyyppiä $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Näytä $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Salasanahistoria"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Virhe"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Organisaatiokäytännöt ovat poistaneet käytöstä avautuessa suoritettavan automaattisen täytön."
   },
-  "howToAutofill": {
-    "message": "Miten automaattitäyttöä käytetään"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Valitse kohde tästä ruudusta, käytä pikanäppäintä $COMMAND$ tai tutustu muihin vaihtoehtoihin asetuksissa.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Aliaksen verkkotunnus"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Pääsalasanan vahvistuksen vaativia kohteita ei voida automaattitäyttää sivun avautuessa. Automaattitäyttö sivun avautuessa poistettiin käytöstä.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Poista pääsalasanan uudelleenkysely käytöstä muokataksesi kenttää",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Näytä/piilota sivuvalikko"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Pääsyavain ei kopioidu kloonattuun kohteeseen. Haluatko jatkaa kloonausta?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Käynnistänyt sivusto edellyttää vahvistusta. Ominaisuutta ei ole vielä toteutettu tileille, joilla ei ole pääsalasanaa."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Kirjaudutaanko pääsyavaimella?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Käytä animaatioita"
-  },
   "showAnimations": {
     "message": "Näytä animaatiot"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Kohteen sijainti"
   },
-  "fileSend": {
-    "message": "Tiedosto-Send"
-  },
   "fileSends": {
     "message": "Tiedosto-Sendit"
   },
-  "textSend": {
-    "message": "Teksti-Send"
-  },
   "textSends": {
     "message": "Teksti-Sendit"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Mukautetun aikakatkaisun vähimmäisaika on yksi minuutti."
   },
-  "additionalContentAvailable": {
-    "message": "Lisäsisältöä on käytettävissä"
-  },
   "fileSavedToDevice": {
     "message": "Tiedosto tallennettiin laitteelle. Hallitse sitä laitteesi latauksista."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Tervetuloa holviisi!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Täytä nykyisen sivun kohteet automaattisesti"
   },
@@ -5584,6 +5657,12 @@
     "message": "Luo helposti vahvoja ja uniikkeja salasanoja klikkaamalla Luo salasana -painiketta. Sen avuilla voit pitää kirjautumisesi turvallisina.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "Sinulla ei ole oikeuksia tähän sivuun. Yritä kirjautua sisään toisella tilillä."
   },
diff --git a/apps/browser/src/_locales/fil/messages.json b/apps/browser/src/_locales/fil/messages.json
index 8c24dd456e5..2afa450a7d0 100644
--- a/apps/browser/src/_locales/fil/messages.json
+++ b/apps/browser/src/_locales/fil/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "I-edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Nawalan ka ng access sa lahat ng iyong mga two-factor provider? Gamitin ang iyong recovery code para i-off ang lahat ng two-factor providers mula sa iyong account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Maaari mong i-off ang auto-fill sa pag-load ng pahina para sa indibidwal na login items mula sa view ng Edit ng item."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Auto-fill sa pag-load ng pahina (kung naka-set up sa Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Gamitin ang default na setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Kapag ikaw ay mag-click sa labas ng popup window para tingnan ang iyong email para sa iyong code ng pagpapatunay, ang popup na ito ay magsasara. Nais mo bang buksan ang popup na ito sa isang bagong window upang hindi ito sarado?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Ang browser na ito ay hindi maaaring prosesuhin ang mga hiling ng U2F sa popup window na ito. Nais mo bang buksan ang popup na ito sa isang bagong window upang ma-log in gamit ang U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Ipakita ang badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Ipahiwatig kung gaano karaming mga login ang mayroon ka para sa kasalukuyang pahina ng web."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Pangalan ng cardholder"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Kasaysayan ng Password"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Mali"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Ang mga patakaran ng iyong organisasyon ay nagbigay ng pag-automatikong pag-load sa pahina."
   },
-  "howToAutofill": {
-    "message": "Paano mag-auto-fill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/fr/messages.json b/apps/browser/src/_locales/fr/messages.json
index 039ba8142ef..c74f0248693 100644
--- a/apps/browser/src/_locales/fr/messages.json
+++ b/apps/browser/src/_locales/fr/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Réinitialiser la recherche"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Modifier"
   },
@@ -701,6 +733,15 @@
   "invalidMasterPassword": {
     "message": "Mot de passe principal invalide"
   },
+  "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": "Délai d'expiration du coffre"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Sélectionnez la méthode d'authentification à deux facteurs"
   },
-  "recoveryCodeDesc": {
-    "message": "Accès perdu à tous vos services d'authentification à double facteurs ? Utilisez votre code de récupération pour désactiver tous les services de double authentifications sur votre compte."
-  },
   "recoveryCodeTitle": {
     "message": "Code de récupération"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Vous pouvez désactiver la saisie automatique au chargement de la page pour les éléments de connexion individuels à partir de la vue Éditer l'élément."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Saisir automatiquement au chargement de la page (si configuré dans les options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Utiliser le paramètre par défaut"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "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 ?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Ce navigateur ne peut pas traiter les demandes U2F dans cette fenêtre popup. Voulez-vous ouvrir cette popup dans une nouvelle fenêtre afin de pouvoir vous connecter à l'aide de l'U2F ?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Afficher le compteur de badge"
-  },
-  "badgeCounterDesc": {
-    "message": "Indique le nombre d'identifiants dont vous disposez pour la page web en cours."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Nom du titulaire de la carte"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "Créer un(e) $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Éditer $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Voir les $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Historique des mots de passe"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Erreur"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Les politiques de sécurité de votre organisation ont activé la saisie automatique lors du chargement de la page."
   },
-  "howToAutofill": {
-    "message": "Comment saisir automatiquement"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Sélectionnez un élément à partir de cet écran, utilisez le raccourci $COMMAND$ ou explorez d'autres options dans les paramètres.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Domaine de l'alias"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Les éléments pour lesquels le mot de passe principal est redemandé ne peuvent pas être remplis automatiquement lors du chargement de la page. La saisie automatique au chargement de la page est désactivée.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Désactivez la ressaisie du mot de passe principal pour modifier ce champ",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Basculer la navigation latérale"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "La clé d'identification (passkey) ne sera pas copiée dans l'élément cloné. Voulez-vous continuer à cloner cet élément ?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Vérification requise par le site initiateur. Cette fonctionnalité n'est pas encore implémentée pour les comptes sans mot de passe principal."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Se connecter avec une clé d'accès ?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Activer les animations"
-  },
   "showAnimations": {
     "message": "Afficher les animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Emplacement de l'élément"
   },
-  "fileSend": {
-    "message": "Send en fichier"
-  },
   "fileSends": {
     "message": "Envoi de fichiers"
   },
-  "textSend": {
-    "message": "Send en texte"
-  },
   "textSends": {
     "message": "Envoi de textes"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Le délai d'expiration personnalisé minimum est de 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Du contenu supplémentaire est disponible"
-  },
   "fileSavedToDevice": {
     "message": "Fichier enregistré sur l'appareil. Gérez à partir des téléchargements de votre appareil."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Bienvenue dans votre coffre !"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Remplissage automatique des éléments de la page actuelle"
   },
@@ -5584,6 +5657,12 @@
     "message": "Créez facilement des mots de passe forts et uniques en cliquant sur le bouton Générer un mot de passe pour vous aider à sécuriser vos connexions.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "Vous n'avez pas les autorisations pour consulter cette page. Essayez de vous connecter avec un autre compte."
   },
@@ -5601,10 +5680,10 @@
     "message": "Next"
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "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."
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Confirmez le domaine de Key Connector"
   }
 }
diff --git a/apps/browser/src/_locales/gl/messages.json b/apps/browser/src/_locales/gl/messages.json
index f8fbd03b759..421adf16a2f 100644
--- a/apps/browser/src/_locales/gl/messages.json
+++ b/apps/browser/src/_locales/gl/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Editar"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Perdiche o acceso ós provedores de verificación en dous pasos (2FA)? Emprega o teu código de recuperación para desactivalos."
-  },
   "recoveryCodeTitle": {
     "message": "Código de recuperación"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Podes apagar o autoenchido para entradas concretas nas súas páxinas de edición."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autoenchido ó cargar a páxina (se está activado nos Axustes)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Usar axustes por defecto"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Se clicas fóra desta ventá emerxente para comprobar o código do correo, cerrarase. Queres convertila nunha nova ventá completa para que non se cerre?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Este navegador non pode procesar peticións U2F nesta ventá emerxente. Queres convertila nunha ventá completa para poder continuar?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Amosar contador na icona"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicar cantas credenciais tes gardadas para a web aberta."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Titular da tarxeta"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "Novo $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Modificar $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Ver $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Historial de contrasinais"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Erro"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "As directivas da organización activaron o autoenchido ó cargar a páxina."
   },
-  "howToAutofill": {
-    "message": "Como autoencher"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Selecciona unha entrada desta pantalla, emprega o atallo $COMMAND$, ou explora outras opcións en axustes.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias do dominio"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "As entradas que requiran volver a inserir o contrasinal mestre non poden ser autoenchidas ó cargar a páxina.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Desactiva volver a requirir o contrasinal mestre para modificar este campo",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Activar/desactivar navegación lateral"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "A Clave de acceso non se incluirá na entrada clonada. Queres continuar co duplicado?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verificación requirida polo sitio inicial. Esta función aínda non está implementada para contas sen contrasinal mestre."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Iniciar sesión con Clave de acceso?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Activar animacións"
-  },
   "showAnimations": {
     "message": "Amosar animacións"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Ubicación da entrada"
   },
-  "fileSend": {
-    "message": "Arquivo Send"
-  },
   "fileSends": {
     "message": "Arquivos Send"
   },
-  "textSend": {
-    "message": "Texto Send"
-  },
   "textSends": {
     "message": "Textos Send"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "O tempo mínimo personalizado é de 1 minuto."
   },
-  "additionalContentAvailable": {
-    "message": "Hai dispoñibles contidos adicionais"
-  },
   "fileSavedToDevice": {
     "message": "Arquivo gardado no dispositivo. Xestiónao dende as descargas do dispositivo."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/he/messages.json b/apps/browser/src/_locales/he/messages.json
index 1cc76b23633..affba06eafd 100644
--- a/apps/browser/src/_locales/he/messages.json
+++ b/apps/browser/src/_locales/he/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "אפס חיפוש"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "ערוך"
   },
@@ -701,6 +733,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": "פסק זמן לכספת"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "בחר שיטת כניסה דו־שלבית"
   },
-  "recoveryCodeDesc": {
-    "message": "איבדת גישה לכל הספקים הדו־גורמיים שלך? השתמש בקוד השחזור שלך כדי לכבות את כל הספקים הדו־גורמיים מהחשבון שלך."
-  },
   "recoveryCodeTitle": {
     "message": "קוד שחזור"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "אתה יכול לכבות מילוי אוטומטי בעת טעינת עמוד עבור פריטי כניסה בודדים מתצוגת העריכה של הפריט."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "מילוי אוטומטי בעת טעינת עמוד (אם מוגדר באפשרויות)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "השתמש בהגדרת ברירת המחדל"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "לחיצה מחוץ לחלונית הצפה שנפתחה בכדי לבדוק את פרטי האימות תגרום לחלונית שנפתחה, להסגר. האם ברצונך להציג את המידע בחלון שאינו נסגר?"
   },
-  "popupU2fCloseMessage": {
-    "message": "דפדפן זה לא יכול לעבד בקשות U2F בחלון צף זה. האם ברצונך לפתוח את החלון הצף כחלון חדש רגיל כדי שתוכל להכנס באמצעות U2F?"
-  },
-  "enableFavicon": {
-    "message": "הצג סמלי אתר אינטרנט"
-  },
-  "faviconDesc": {
-    "message": "הצג תמונה מוכרת ליד כל כניסה."
-  },
-  "faviconDescAlt": {
-    "message": "הצג תמונה מוכרת ליד כל כניסה. חל על כל החשבונות המחוברים."
-  },
-  "enableBadgeCounter": {
-    "message": "הצג מונה סמל"
-  },
-  "badgeCounterDesc": {
-    "message": "מציין כמה כניסות יש לך עבור עמוד הרשת הנוכחי."
+  "showIconsChangePasswordUrls": {
+    "message": "הצג סמלי אתרי אינטרנט ואחזר כתובות URL לשינוי סיסמה"
   },
   "cardholderName": {
     "message": "שם בעל הכרטיס"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "הערה"
   },
-  "newItemHeader": {
-    "message": "$TYPE$ חדש",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "ערוך $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "הצג $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "היסטוריית סיסמאות"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "שגיאה"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "פוליסות הארגון שלך הפעילו מילוי אוטומטי בעת טעינת עמוד."
   },
-  "howToAutofill": {
-    "message": "כיצד למלא אוטומטית"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "בחר פריט ממסך זה, בחר את קיצור הדרך $COMMAND$, או חקור אפשרויות אחרות בהגדרות.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "דומיין כינוי"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "פריטים עם בקשת סיסמה ראשית חוזרת לא ניתנים למילוי אוטומטי בעת טעינת עמוד. מילוי אוטומטי בעת טעינת נכבה.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "מילוי אוטומטי בעת טעינת הוגדר להשתמש בהגדרת ברירת מחדל.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "כבה בקשת סיסמה ראשית חוזרת כדי לערוך שדה זה",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "החלף מצב ניווט צדדי"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "מפתח הגישה לא יועתק לפריט המשוכפל. האם ברצונך להמשיך לשכפל פריט זה?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "נדרש אימות על ידי האתר היוזם. תכונה זו עדיין לא מיושמת עבור חשבונות ללא סיסמה ראשית."
-  },
   "logInWithPasskeyQuestion": {
     "message": "להיכנס עם מפתח גישה?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "אפשר הנפשות"
-  },
   "showAnimations": {
     "message": "הצג הנפשות"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "מיקום פריט"
   },
-  "fileSend": {
-    "message": "סֵנְד של קובץ"
-  },
   "fileSends": {
     "message": "סֵנְדים של קובץ"
   },
-  "textSend": {
-    "message": "סֵנְד של טקסט"
-  },
   "textSends": {
     "message": "סֵנְדים של טקסט"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "פסק זמן מותאם אישית מינימלי הוא דקה 1."
   },
-  "additionalContentAvailable": {
-    "message": "תוכן נוסף זמין"
-  },
   "fileSavedToDevice": {
     "message": "הקובץ נשמר למכשיר. נהל מהורדות המכשיר שלך."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "ברוך בואך אל הכספת שלך!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "פריטים למילוי אוטומטי עבור הדף הנוכחי"
   },
@@ -5584,6 +5657,12 @@
     "message": "צור בקלות סיסמאות חזקות וייחודיות על ידי לחיצה על הלחצן 'צור סיסמה' כדי לעזור לך לשמור את הכניסות שלך מאובטחות.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "אודות הגדרה זו"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden ישתמש בכתובות URI של כניסות שמורות כדי לזהות באיזה סמל או URL לשינוי סיסמה יש להשתמש על מנת לשפר את החוויה שלך. לא נאסף או נשמר מידע כלשהו כאשר אתה משתמש בשירות זה."
+  },
   "noPermissionsViewPage": {
     "message": "אין לך הרשאות כדי לראות עמוד זה. נסה להיכנס עם חשבון אחר."
   },
diff --git a/apps/browser/src/_locales/hi/messages.json b/apps/browser/src/_locales/hi/messages.json
index a9ebd8170bf..323d72f802d 100644
--- a/apps/browser/src/_locales/hi/messages.json
+++ b/apps/browser/src/_locales/hi/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "खोज रीसेट करें"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "संपादन करें"
   },
@@ -701,6 +733,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": "वॉल्ट मध्यांतर"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "अपने दो कारक प्रदाताओं के सभी के लिए उपयोग खो दिया है? अपने खाते से सभी दो-कारक प्रदाताओं को अक्षम करने के लिए अपने रिकवरी कोड का उपयोग करें।"
-  },
   "recoveryCodeTitle": {
     "message": "Recovery Code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "पेज लोड पर ऑटो-फिल को सक्षम करने के बाद, आप व्यक्तिगत लॉगिन आइटम के लिए सुविधा को सक्षम या अक्षम कर सकते हैं।यह लॉगिन आइटम के लिए डिफ़ॉल्ट सेटिंग है जो अलग से कॉन्फ़िगर नहीं हैं।"
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "पेज लोड पर ऑटो-भरें (यदि विकल्पों में सक्षम हैं)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "डिफ़ॉल्ट सेटिंग का उपयोग करें"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "अपने सत्यापन कोड के लिए अपने ईमेल की जांच करने के लिए पॉपअप विंडो के बाहर क्लिक करने से यह पॉपअप बंद हो जाएगा।क्या आप इस पॉपअप को एक नई विंडो में खोलना चाहते हैं ताकि यह बंद न हो?"
   },
-  "popupU2fCloseMessage": {
-    "message": "यह ब्राउज़र इस पॉपअप विंडो में U2F अनुरोधों को संसाधित नहीं कर सकता है।क्या आप इस पॉपअप को एक नई विंडो में खोलना चाहते हैं ताकि आप U2F का उपयोग करके लॉग इन कर सकें?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "बैज काउंटर दिखाएं"
-  },
-  "badgeCounterDesc": {
-    "message": "इंगित करें कि आपके पास वर्तमान वेब पेज के लिए कितने लॉगिन हैं।"
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder Name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "नोट"
   },
-  "newItemHeader": {
-    "message": "नया $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ संपादन",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "पासवर्ड इतिहास"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "एरर"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "ऑटो-फ़िल कैसे करें"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "डोमेन उपनाम"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "एनिमेशन दिखाएं"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "न्यूनतम कस्टम टाइमआउट 1 मिनट है."
   },
-  "additionalContentAvailable": {
-    "message": "अतिरिक्त सामग्री उपलब्ध है"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/hr/messages.json b/apps/browser/src/_locales/hr/messages.json
index 22bac18ecf7..34c114c214d 100644
--- a/apps/browser/src/_locales/hr/messages.json
+++ b/apps/browser/src/_locales/hr/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Ponovno postavljanje pretraživanja"
   },
+  "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"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Arhivirane stavke biti će prikazane ovdje i biti će izuzete iz rezultata općih pretraga i preporuka auto-ispune."
+  },
+  "itemSentToArchive": {
+    "message": "Stavka poslana u arhivu"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Stavka maknute 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?"
+  },
   "edit": {
     "message": "Uredi"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Odaberi način prijave dvostrukom autentifikacijom"
   },
-  "recoveryCodeDesc": {
-    "message": "Izgubljen je pristup uređaju za dvostruku autentifikaciju? Koristi svoj kôd za oporavak za onemogućavanje svih pružatelja usluga dvostruke autentifikacije na tvojem računu."
-  },
   "recoveryCodeTitle": {
     "message": "Kôd za oporavak"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Auto-ispunu kod učitavanju stranice je moguće uključiti/isključiti za svaku pojedinu prijavu unutar uređivanja stavke."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Auto-ispuna kod učitavanja stranice (ako je uključeno u Postavkama)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Koristi zadane postavke"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Ako klikneš izvan iskočnog prozora, za provjeru kôda za provjeru iz e-pošte, on će se zatvoriti. Želiš li ovaj iskočni prozor otvoriti u novom prozoru kako se ne bi zatvorio?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Ovaj preglednik ne može obraditi U2F zahtjeve u ovom iskočnom prozoru. Želiš li otvoriti ovaj iskočni prozor u novom prozoru za prijavu putem U2F?"
-  },
-  "enableFavicon": {
-    "message": "Prikaži ikone mrežnih mjesta"
-  },
-  "faviconDesc": {
-    "message": "Prikaži prepoznatljivu sliku pored svake prijave."
-  },
-  "faviconDescAlt": {
-    "message": "Prikaži prepoznatljivu sliku pokraj svake prijave. Primjenjuje se na sve prijavljene račune."
-  },
-  "enableBadgeCounter": {
-    "message": "Prikaži značku brojača"
-  },
-  "badgeCounterDesc": {
-    "message": "Prikazuje broj spremljenih prijava za trenutnu web stranicu."
+  "showIconsChangePasswordUrls": {
+    "message": "Prikaži ikonu web mjesta i dohvati URL za promjenu lozinke"
   },
   "cardholderName": {
     "message": "Vlasnik platne kartice"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Bilješka"
   },
-  "newItemHeader": {
-    "message": "Novi $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nova prijava",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Uredi $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nova kartica",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Pogledaj $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Novi identitet",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nova bilješka",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Novi SSH ključ",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Novi teksutalni Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Novi datotečni Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Uredi prijavu",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Uredi karticu",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Uredi identitet",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Uređivanje bilješke",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Uredi SSH ključ",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Uredi tekstualni Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Uredi datotečni Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Prikaži prijavu",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Prikaži karticu",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Prikaži identitet",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Prikaži bilješku",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Prikaži SSH ključ",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Povijest"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Pogreška"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Prema pravilima tvoje organizacije uključena je auto-ispuna prilikom učitavanja stranice."
   },
-  "howToAutofill": {
-    "message": "Kako auto-ispuniti"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Odaberi stavku s ovog zaslona, upotrijebi prečac $COMMAND$ ili istraži druge opcije u postavkama.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domene"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Stavke za koje je potrebna glavna lozinka neće se auto-ispuniti kod učitavanja stranice. Auto-ispuna pri učitavanju stranice je isključena.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Isključi traženje glavne lozinke za promjenu ovog polja",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "U/Isključi bočnu navigaciju"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Pristupni ključ se neće kopirati u kloniranu stavku. Želiš li nastaviti klonirati ovu stavku?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Ishodišna stranica zahtijeva verifikaciju. Ova značajka još nije implementirana za račune bez glavne lozinke."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Prijava pristupnim ključem?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Omogući animacije"
-  },
   "showAnimations": {
     "message": "Prikaži animacije"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Lokacija stavke"
   },
-  "fileSend": {
-    "message": "Send datoteke"
-  },
   "fileSends": {
     "message": "Send datoteke"
   },
-  "textSend": {
-    "message": "Send teksta"
-  },
   "textSends": {
     "message": "Send tekstovi"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Najmanje prilagođeno vrijeme je 1 minuta."
   },
-  "additionalContentAvailable": {
-    "message": "Dostupan je dodatni sadržaj"
-  },
   "fileSavedToDevice": {
     "message": "Datoteka spremljena na uređaj. Upravljaj u preuzimanjima svog uređaja."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Dobrodošli u svoj trezor!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing web stranica"
+  },
+  "phishingPageCloseTab": {
+    "message": "Zatvori karticu"
+  },
+  "phishingPageContinue": {
+    "message": "Nastavi"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Zašto ovo vidiš?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Auto-ispuni stavke za trenutnu stranicu"
   },
@@ -5584,6 +5657,12 @@
     "message": "Jednostavno stvori jake i sigurne lozinke odabirom tipke Generiraj lozinku kako bi tvoje prijave ostale sigurne.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "O ovoj postavci"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden će koristiti spremljene URI-je za prijavu kako bi identificirao ikonu ili URL za promjenu lozinke koji treba koristiti za poboljšanje tvojeg iskustva. Nikakvi podaci se ne prikupljaju, niti spremaju kada koristiš ovu uslugu."
+  },
   "noPermissionsViewPage": {
     "message": "Nemaš dozvolu za pregled ove stranice. Pokušaj se prijaviti s drugim računom."
   },
diff --git a/apps/browser/src/_locales/hu/messages.json b/apps/browser/src/_locales/hu/messages.json
index b44439f6578..2cafe38fab4 100644
--- a/apps/browser/src/_locales/hu/messages.json
+++ b/apps/browser/src/_locales/hu/messages.json
@@ -6,11 +6,11 @@
     "message": "Bitwarden logó"
   },
   "extName": {
-    "message": "Bitwarden Password Manager",
+    "message": "Bitwarden Jelszókezelő",
     "description": "Extension name, MUST be less than 40 characters (Safari restriction)"
   },
   "extDesc": {
-    "message": "At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information",
+    "message": "Legyen otthon, munkában, vagy úton, a Bitwarden könnyen biztosítja jelszavát, kulcsait, és kényes információit",
     "description": "Extension description, MUST be less than 112 characters (Safari restriction)"
   },
   "loginOrCreateNewAccount": {
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Keresés visszaállítása"
   },
+  "archiveNoun": {
+    "message": "Archívum",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archívum",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Visszavétel archívumból"
+  },
+  "itemsInArchive": {
+    "message": "Archívum elemek száma"
+  },
+  "noItemsInArchive": {
+    "message": "Nincs elem az archívumban."
+  },
+  "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"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Az elem kikerült a kedvencekbő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?"
+  },
   "edit": {
     "message": "Szerkesztés"
   },
@@ -701,6 +733,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"
   },
@@ -866,13 +907,13 @@
     "message": "Kijelentkezett"
   },
   "loggedOutDesc": {
-    "message": "You have been logged out of your account."
+    "message": "Kijelentkezett fiókjából."
   },
   "loginExpired": {
     "message": "Bejelentkezési munkamenete lejárt."
   },
   "logIn": {
-    "message": "Log in"
+    "message": "Bejelentkezés"
   },
   "logInToBitwarden": {
     "message": "Bejelentkezés a Bitwardenbe"
@@ -896,16 +937,16 @@
     "message": "Kövessük az alábbi lépéseket a biztonsági kulccsal bejelentkezés befejezéséhez."
   },
   "restartRegistration": {
-    "message": "Restart registration"
+    "message": "Regisztráció újraindítása"
   },
   "expiredLink": {
-    "message": "Expired link"
+    "message": "Lejárt hivatkozás"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Please restart registration or try logging in."
+    "message": "Kérem kezdje újra a regisztrációt, vagy próbáljon meg bejelentkezni."
   },
   "youMayAlreadyHaveAnAccount": {
-    "message": "You may already have an account"
+    "message": "Lehetséges, hogy már rendelkezik fiókkal"
   },
   "logOutConfirmation": {
     "message": "Biztos benne, hogy ki szeretnél jelentkezni?"
@@ -1176,7 +1217,7 @@
     "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": "Ja ne! Nem tudtuk elmenteni. Próbálja meg beírni a kézzel.",
     "description": "Detailed error message shown when saving login details fails."
   },
   "changePasswordWarning": {
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Kétlépcsős bejelentkezési mód használata"
   },
-  "recoveryCodeDesc": {
-    "message": "Elveszett a hozzáférés az összes kétlépcsős szolgáltatóhoz? A helyreállító kód használatával letilthatók fiókból a kétlépcsős szolgáltatók."
-  },
   "recoveryCodeTitle": {
     "message": "Helyreállító kód"
   },
@@ -1609,7 +1647,7 @@
     "description": "Represents the message for allowing the user to enable the autofill overlay"
   },
   "autofillSuggestionsSectionTitle": {
-    "message": "Autofill suggestions"
+    "message": "Automatikus kitöltés javaslatok"
   },
   "autofillSpotlightTitle": {
     "message": "Az automatikus kitöltési javaslatok könnyű megtalálása"
@@ -1630,7 +1668,7 @@
     "message": "Automat kitöltés bekapcsolása"
   },
   "showInlineMenuLabel": {
-    "message": "Show autofill suggestions on form fields"
+    "message": "Automatikus kitöltési javaslatok megjelenítése űrlapmezőknél"
   },
   "showInlineMenuIdentitiesLabel": {
     "message": "Az identitások megjelenítése javaslatként"
@@ -1639,10 +1677,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."
@@ -1655,7 +1693,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": {
@@ -1663,7 +1701,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"
@@ -1675,7 +1713,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"
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Az egyes bejelentkezési elemeknél kikapcsolhatjuk oldalbetöltéskor az automatikus kitöltést az elem Szerkesztés nézetében."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Automatikus kitöltés oldal betöltésnél (Ha engedélyezett az opcióknál)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Alapbeállítások használata"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Az ellenőrző kódot tartalmazó email egy olyan felugró ablakban nyílik meg, mely a mellette levő területre kattinva bezáródik. Szeretnéd az emailt egy olyan ablakban megnyitni, ami nem záródhat így be?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Ez a böngésző nem dolgozza fel az U2F kéréseket ebben a felbukkanó ablakban. Szeretnénk megnyitni a felbukkanó ablakot új böngészőablakban az U2F segítségével történő bejelentkezéshez?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Számláló jelvény megjelenítése"
-  },
-  "badgeCounterDesc": {
-    "message": "Jelöljük meg, hogy hány bejelentkezés van az aktuális weboldalnál."
+  "showIconsChangePasswordUrls": {
+    "message": "Webhely ikonok megjelenítése és jelszó webcímek módosításának lekérése"
   },
   "cardholderName": {
     "message": "Kártyatulajdonos neve"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Jegyzet"
   },
-  "newItemHeader": {
-    "message": "Új $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Új bejelentkezés",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ szerkesztése",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Új kártya",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "$TYPE$ megtekintése",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Új személyazonosság",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Új jegyzet",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Új SSH kulcs",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Új szöveges Send elem",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Új fájl Send elem",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Bejelentkezés szerkesztése",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Kártya szerkesztése",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Személyazonossság szerkesztése",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Jegyzet szerkesztése",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "SSH kulcs szerkesztése",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Send szöveg szerkesztése",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Send fájl szerkesztése",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Bejelentkezés megtekintése",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Kártya megtekintése",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Személyazonosság megtekintése",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Jegyzet megtekintése",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "SSH kulcs megtekintése",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Jelszó előzmények"
@@ -2368,7 +2437,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"
@@ -2404,10 +2473,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"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Hiba"
   },
@@ -3527,11 +3614,8 @@
   "autofillPageLoadPolicyActivated": {
     "message": "A szervezeti szabályzat bekapcsolta az automatikus kitöltést az oldalbetöltéskor."
   },
-  "howToAutofill": {
-    "message": "Az automatikus kitöltés működése"
-  },
   "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",
@@ -3540,7 +3624,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"
@@ -3549,10 +3633,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"
@@ -3914,30 +3998,22 @@
   "aliasDomain": {
     "message": "Áldomain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "A mesterjelszót újra bekérő elemeket nem lehet automatikusan kitölteni az oldal betöltésekor. Az automatikus kitöltés az oldal betöltésekor kikapcsolásra kerül.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Kapcsoljuk ki a mesterjelszó újbóli bekérését a mező szerkesztéséhez.",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "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": {
@@ -3945,7 +4021,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": {
@@ -4013,7 +4089,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": {
@@ -4099,7 +4175,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."
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "A hozzáférési kulcs nem kerül másolásra a klónozott elembe. Folytatjuk ennek az elemnek a klónozását?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "A kezdeményező hely által megkövetelt ellenőrzés. Ez a szolgáltatás még nincs megvalósítva mesterjelszó nélküli fiókok esetén."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Bejelentkezés hozzáférési kulccsal?"
   },
@@ -4398,27 +4471,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": {
@@ -4598,7 +4671,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"
@@ -4661,7 +4734,7 @@
     }
   },
   "itemsWithNoFolder": {
-    "message": "Items with no folder"
+    "message": "Be nem mappázott elemek"
   },
   "itemDetails": {
     "message": "Elem részletek"
@@ -4670,7 +4743,7 @@
     "message": "Elem neve"
   },
   "organizationIsDeactivated": {
-    "message": "Organization is deactivated"
+    "message": "A szervezet deaktiválásra került"
   },
   "owner": {
     "message": "Tulajdonos"
@@ -4680,7 +4753,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ó"
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Animációk engedélyezése"
-  },
   "showAnimations": {
     "message": "Animációk megjelenítése"
   },
@@ -4911,7 +4981,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."
@@ -4920,7 +4990,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",
@@ -5018,13 +5088,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",
@@ -5033,7 +5103,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",
@@ -5042,7 +5112,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",
@@ -5055,13 +5125,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",
@@ -5070,7 +5140,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "Elem áthelyezve a $ORGNAME$ szervezethez",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Elem helyek"
   },
-  "fileSend": {
-    "message": "Fájl típusú Send"
-  },
   "fileSends": {
     "message": "Fájl küldés"
   },
-  "textSend": {
-    "message": "Szöveg típusú Send"
-  },
   "textSends": {
     "message": "Szöveg küldés"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "A minimális egyedi időkifutás 1 perc."
   },
-  "additionalContentAvailable": {
-    "message": "Kiegészítő tartalom érhető el."
-  },
   "fileSavedToDevice": {
     "message": "A fájl mentésre került az eszközre. Kezeljük az eszközről a letöltéseket."
   },
@@ -5240,7 +5301,7 @@
     "message": "Feloldás biometrikusan"
   },
   "authenticating": {
-    "message": "Authenticating"
+    "message": "Hitelesítés"
   },
   "fillGeneratedPassword": {
     "message": "Generált jelszó kitöltés",
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Üdvözlet a széfben!"
   },
+  "phishingPageTitle": {
+    "message": "Adathalász webhely"
+  },
+  "phishingPageCloseTab": {
+    "message": "Fül bezárása"
+  },
+  "phishingPageContinue": {
+    "message": "Folytatás"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Miért látható ez?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Az aktuális oldal elemeinek automatikus kitöltése"
   },
@@ -5584,6 +5657,12 @@
     "message": "Könnyedén hozhatunk létre erős és egyedi jelszavakat a Jelszó generálása gombra kattintva, amely segít megőrizni a bejelentkezések biztonságát.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Informció erről a beállításról"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "A Bitwarden mentett bejelentkezési webcímeket használ annak azonosítására, hogy melyik ikont vagy jelszó webcímet kell használni az élmény javítása érdekében. A szolgáltatás használatakor nincs információ gyűjtés vagy mentés."
+  },
   "noPermissionsViewPage": {
     "message": "Nincs jogosultság az oldal megtekintéséhez. Próbáljunk meg másik fiókkal bejelentkezni."
   },
diff --git a/apps/browser/src/_locales/id/messages.json b/apps/browser/src/_locales/id/messages.json
index 81b1ba32229..80886711095 100644
--- a/apps/browser/src/_locales/id/messages.json
+++ b/apps/browser/src/_locales/id/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Atur ulang pencarian"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Pilih metode log masuk dua langkah"
   },
-  "recoveryCodeDesc": {
-    "message": "Kehilangan akses ke semua penyedia dua faktor Anda? Gunakan kode pemulihan untuk menonaktifkan semua penyedia dua faktor dari akun Anda."
-  },
   "recoveryCodeTitle": {
     "message": "Kode Pemulihan"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Setelah mengaktifkan Auto-Fill waktu website terbuka, kamu dapat mengaktifkan atau meng-nonaktifkan feature ini untuk setiap item. Ini adalah konfigurasi standard untuk item yang tidak dikonfigurasi terpisah."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Auto-fill waktu website terbuka (Jika diaktifkan di Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Gunakan pengaturan baku"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Tindakan klik diluar jendela popup untuk memeriksa  kode verifikasi di dalam surel Anda akan menyebabkan popup ini ditutup. Apakah Anda ingin membuka popup ini di jendela baru sehingga terus tetap terbuka?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Peramban ini tidak bisa memproses permintaan U2F di jendela popup ini. Apakah Anda ingin membuka popup ini di jendela baru sehingga Anda dapat masuk menggunakan U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Tampilkan hitungan di lencana"
-  },
-  "badgeCounterDesc": {
-    "message": "Tunjukkan seberapa banyak login yang Anda miliki untuk halaman web saat ini."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Nama Pemegang Kartu"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Catatan"
   },
-  "newItemHeader": {
-    "message": "$TYPE$ baru",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Sunting $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Lihat $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Riwayat Kata Sandi"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Galat"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Kebijakan organisasi Anda telah menyalakan isi otomatis ketika halaman dimuat."
   },
-  "howToAutofill": {
-    "message": "Bagaimana cara mengisi otomatis"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Pilih sebuah benda dari layar ini, gunakan pintasan $COMMAND$, atau jelajahi pilihan lainnya di pengaturan.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Domain alias"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Benda dengan meminta ulang kata sandi utama tidak dapat diisikan otomatis ketika halaman dimuat. Isi otomatis ketika halaman dimuat dimatikan.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Matikan minta ulang kata sandi utama untuk menyunting kolom ini",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Saklar bilah isi navigasi"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Kunci sandi tidak akan disalin ke benda yang digandakan. Apakah Anda ingin melanjutkan menggandakan benda ini?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verifikasi diperlukan oleh situs yang menyelenggarakan. Fitur ini belum diterapkan untuk akun tanpa kata sandi utama."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Masuk dengan kunci sandi?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Nyalakan animasi"
-  },
   "showAnimations": {
     "message": "Tampilkan animasi"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Lokasi Item"
   },
-  "fileSend": {
-    "message": "Berkas Send"
-  },
   "fileSends": {
     "message": "Berkas-berkas Send"
   },
-  "textSend": {
-    "message": "Teks Send"
-  },
   "textSends": {
     "message": "Teks Send"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimal tenggat waktu ubahsuai adalah 1 menit."
   },
-  "additionalContentAvailable": {
-    "message": "Konten tambahan telah tersedia"
-  },
   "fileSavedToDevice": {
     "message": "Berkas tersimpan di perangkat. Kelola dari unduhan perangkat Anda."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Selamat datang di brankas Anda!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Benda-benda isi otomatis untuk halaman saat ini"
   },
@@ -5584,6 +5657,12 @@
     "message": "Buat kata sandi yang kuat dan unik dengan mudah dengan menekan pada tombol Buat kata sandi untuk membantu Anda menyimpan login Anda dengan aman.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "Anda tidak memiliki izin untuk melihat halaman ini. Coba masuk dengan akun yang berbeda."
   },
diff --git a/apps/browser/src/_locales/it/messages.json b/apps/browser/src/_locales/it/messages.json
index c05a3ad6c81..c9a51f416e4 100644
--- a/apps/browser/src/_locales/it/messages.json
+++ b/apps/browser/src/_locales/it/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Svuota ricerca"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Modifica"
   },
@@ -701,6 +733,15 @@
   "invalidMasterPassword": {
     "message": "Password principale errata"
   },
+  "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": "Timeout cassaforte"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Seleziona metodo di accesso in due passaggi"
   },
-  "recoveryCodeDesc": {
-    "message": "Hai perso l'accesso a tutti i tuoi metodi di verifica in due passaggi? Usa il tuo codice di recupero per disattivarli tutti dal tuo account."
-  },
   "recoveryCodeTitle": {
     "message": "Codice di recupero"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Puoi disattivare il riempimento automatico al caricamento della pagina per singoli login dalla sezione Modifica elemento."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Riempi automaticamente al caricamento della pagina (se abilitato in Impostazioni)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Usa impostazione predefinita"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "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?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Questo browser non può elaborare richieste U2F in questo pop-up. Aprire questo pop-up in una nuova finestra per accedere usando U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Mostra badge contatore"
-  },
-  "badgeCounterDesc": {
-    "message": "Mostra il numero di login salvati per il sito web corrente nell'icona dell'estensione."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Titolare della carta"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Nota"
   },
-  "newItemHeader": {
-    "message": "Nuovo $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Modifica $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Visualizza $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Cronologia delle password"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Errore"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Le politiche della tua organizzazione hanno abilitato il riempimento automatico al caricamento della pagina."
   },
-  "howToAutofill": {
-    "message": "Come riempire automaticamente"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Seleziona un elemento da questa schermata, usa la scorciatoia $COMMAND$, o esplora altre opzioni nelle impostazioni.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Dominio alias"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Gli elementi che richiedono di inserire di nuovo la password principale non possono essere riempiti automaticamente al caricamento della pagina.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Disattiva l'inserimento della password principale di nuovo per modificare questo campo",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Attiva/Disattiva navigazione laterale"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "La passkey non sarà copiata nell'elemento clonato. Vuoi continuare a clonare questo elemento?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verifica richiesta dal sito web. Questa funzionalità non è ancora implementata per gli account senza password principale."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Accedi con passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Abilita animazioni"
-  },
   "showAnimations": {
     "message": "Mostra animazioni"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Posizione elemento"
   },
-  "fileSend": {
-    "message": "Send di File"
-  },
   "fileSends": {
     "message": "Send File"
   },
-  "textSend": {
-    "message": "Send di Testo"
-  },
   "textSends": {
     "message": "Send Testo"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Il timeout personalizzato minimo è 1 minuto."
   },
-  "additionalContentAvailable": {
-    "message": "Sono disponibili ulteriori contenuti"
-  },
   "fileSavedToDevice": {
     "message": "File salvato sul dispositivo. Gestisci dai download del dispositivo."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Benvenuto nella tua cassaforte!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Riempimento automatico per questa pagina"
   },
@@ -5584,6 +5657,12 @@
     "message": "Crea facilmente password forti e uniche cliccando sul pulsante 'Genera password' per aiutarti a mantenere al sicuro i tuoi login.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "Non hai i permessi per visualizzare questa pagina. Prova ad accedere con un altro account."
   },
diff --git a/apps/browser/src/_locales/ja/messages.json b/apps/browser/src/_locales/ja/messages.json
index d05c5a13128..0fa768e3716 100644
--- a/apps/browser/src/_locales/ja/messages.json
+++ b/apps/browser/src/_locales/ja/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "編集"
   },
@@ -701,6 +733,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": "保管庫のタイムアウト"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "2段階認証の方法を選択"
   },
-  "recoveryCodeDesc": {
-    "message": "すべての2段階認証プロパイダにアクセスできなくなったときは、リカバリーコードを使用するとアカウントの2段階認証を無効化できます。"
-  },
   "recoveryCodeTitle": {
     "message": "リカバリーコード"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "ページ読み込み時に自動入力を有効にすると、個々のログインアイテムの機能を有効または無効にできます。 これは個別に設定されていないログインアイテムに適用されるデフォルト設定です。"
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "ページ読み込み時に自動入力する (オプションで有効な場合)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "デフォルト設定を使用"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "認証コードを確認するためにポップアップの外をクリックすると、このポップアップが閉じてしまいます。閉じてしまわないよう、新しいウインドウでこのポップアップを開きますか？"
   },
-  "popupU2fCloseMessage": {
-    "message": "このブラウザーでは U2F 要求をポップアップウインドウでは実行できません。U2F でログインできるよう、新しいウインドウで開き直しますか？"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "バッジカウンターを表示"
-  },
-  "badgeCounterDesc": {
-    "message": "現在のページに一致するログイン情報の数を表示します"
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "カードの名義人名"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "$TYPE$ を新規作成",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ を編集",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "$TYPE$ を表示",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "パスワードの履歴"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "エラー"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "組織のポリシーはページ読み込み時の自動入力をオンにしました。"
   },
-  "howToAutofill": {
-    "message": "自動入力する方法"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "この画面からアイテムを選択するか、ショートカット $COMMAND$を使用するか、設定で他のオプションを確認してください。",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "エイリアスドメイン"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "マスターパスワードの再入力を促すアイテムは、ページ読み込み時に自動入力できません。ページ読み込み時の自動入力をオフにしました。",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "ページ読み込み時の自動入力はデフォルトの設定を使うよう設定しました。",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "このフィールドを編集するには、マスターパスワードの再入力をオフにしてください",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "サイドナビゲーションの切り替え"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "パスキーは複製されたアイテムにコピーされません。このアイテムを複製しますか？"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "開始サイトでの認証が必要です。この機能はマスターパスワードのないアカウントではまだ対応していません。"
-  },
   "logInWithPasskeyQuestion": {
     "message": "パスキーでログインしますか?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "アニメーションを有効化"
-  },
   "showAnimations": {
     "message": "アニメーションを表示"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "アイテムの場所"
   },
-  "fileSend": {
-    "message": "ファイル Send"
-  },
   "fileSends": {
     "message": "ファイル Send"
   },
-  "textSend": {
-    "message": "テキスト Send"
-  },
   "textSends": {
     "message": "テキスト Send"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "カスタムタイムアウトの最小値は1分です。"
   },
-  "additionalContentAvailable": {
-    "message": "追加コンテンツが利用可能です"
-  },
   "fileSavedToDevice": {
     "message": "ファイルをデバイスに保存しました。デバイスのダウンロードで管理できます。"
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/ka/messages.json b/apps/browser/src/_locales/ka/messages.json
index 68e2cf47230..13f3da81404 100644
--- a/apps/browser/src/_locales/ka/messages.json
+++ b/apps/browser/src/_locales/ka/messages.json
@@ -162,7 +162,7 @@
     "message": "Copy passport number"
   },
   "copyLicenseNumber": {
-    "message": "Copy license number"
+    "message": "დააკოპირეთ ლიცენზიის ნომერი"
   },
   "copyPrivateKey": {
     "message": "Copy private key"
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "ჩასწორება"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "შეცდომა"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "ანიმაციების ჩართვა"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/km/messages.json b/apps/browser/src/_locales/km/messages.json
index be0400906cc..dcd86eb4337 100644
--- a/apps/browser/src/_locales/km/messages.json
+++ b/apps/browser/src/_locales/km/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/kn/messages.json b/apps/browser/src/_locales/kn/messages.json
index a4a56b0dd8f..16e6cc2a631 100644
--- a/apps/browser/src/_locales/kn/messages.json
+++ b/apps/browser/src/_locales/kn/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "ಎಡಿಟ್"
   },
@@ -701,6 +733,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": "ವಾಲ್ಟ್ ಕಾಲಾವಧಿ"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "ನಿಮ್ಮ ಎಲ್ಲಾ ಎರಡು ಅಂಶ ಪೂರೈಕೆದಾರರಿಗೆ ಪ್ರವೇಶವನ್ನು ಕಳೆದುಕೊಂಡಿದ್ದೀರಾ? ನಿಮ್ಮ ಖಾತೆಯಿಂದ ಎಲ್ಲಾ ಎರಡು ಅಂಶ ಪೂರೈಕೆದಾರರನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ನಿಮ್ಮ ಮರುಪಡೆಯುವಿಕೆ ಕೋಡ್ ಬಳಸಿ."
-  },
   "recoveryCodeTitle": {
     "message": "ಮರುಪಡೆಯುವಿಕೆ ಕೋಡ್"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "ಪುಟ ಲೋಡ್‌ನಲ್ಲಿ ಸ್ವಯಂ-ಭರ್ತಿ ಸಕ್ರಿಯಗೊಳಿಸಿದ ನಂತರ, ನೀವು ವೈಯಕ್ತಿಕ ಲಾಗಿನ್ ಐಟಂಗಳಿಗಾಗಿ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬಹುದು ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಬಹುದು. ಪ್ರತ್ಯೇಕವಾಗಿ ಕಾನ್ಫಿಗರ್ ಮಾಡದ ಲಾಗಿನ್ ಐಟಂಗಳ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ ಇದು."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "ಪುಟ ಲೋಡ್‌ನಲ್ಲಿ ಸ್ವಯಂ ಭರ್ತಿ (ಆಯ್ಕೆಗಳಲ್ಲಿ ಸಕ್ರಿಯಗೊಳಿಸಿದ್ದರೆ)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ ಬಳಸಿ"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "ನಿಮ್ಮ ಪರಿಶೀಲನಾ ಕೋಡ್‌ಗಾಗಿ ನಿಮ್ಮ ಇಮೇಲ್ ಪರಿಶೀಲಿಸಲು ಪಾಪ್ಅಪ್ ವಿಂಡೋದ ಹೊರಗೆ ಕ್ಲಿಕ್ ಮಾಡುವುದರಿಂದ ಈ ಪಾಪ್ಅಪ್ ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ. ಈ ಪಾಪ್ಅಪ್ ಅನ್ನು ಮುಚ್ಚದಿರುವಂತೆ ಹೊಸ ವಿಂಡೋದಲ್ಲಿ ತೆರೆಯಲು ನೀವು ಬಯಸುವಿರಾ?"
   },
-  "popupU2fCloseMessage": {
-    "message": "ಈ ಬ್ರೌಸರ್ ಈ ಪಾಪ್ಅಪ್ ವಿಂಡೋದಲ್ಲಿ ಯು 2 ಎಫ್ ವಿನಂತಿಗಳನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಈ ಪಾಪ್ಅಪ್ ಅನ್ನು ಹೊಸ ವಿಂಡೋದಲ್ಲಿ ತೆರೆಯಲು ನೀವು ಬಯಸುವಿರಾ, ಇದರಿಂದ ನೀವು ಯು 2 ಎಫ್ ಬಳಸಿ ಲಾಗ್ ಇನ್ ಆಗಬಹುದು."
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "ಕಾರ್ಡುದಾರನ ಹೆಸರು"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "ಪಾಸ್ವರ್ಡ್ ಇತಿಹಾಸ"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/ko/messages.json b/apps/browser/src/_locales/ko/messages.json
index f27465a26f1..9b80dae4d7c 100644
--- a/apps/browser/src/_locales/ko/messages.json
+++ b/apps/browser/src/_locales/ko/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "편집"
   },
@@ -701,6 +733,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": "보관함 시간 제한"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "모든 2단계 인증을 사용할 수 없는 상황인가요? 복구 코드를 사용하여 계정의 모든 2단계 인증을 비활성화할 수 있습니다."
-  },
   "recoveryCodeTitle": {
     "message": "복구 코드"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "페이지 로드 시 자동 완성을 켠 뒤에는 각 로그인 항목별로 이 기능을 켜거나 끌 수 있습니다. 이 옵션은 해당 기능을 개별적으로 구성하지 않은 항목에 사용되는 기본 설정값입니다."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "페이지 로드 시 자동 완성 (옵션에서 켜져 있을 경우)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "기본 설정 사용"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "인증 코드가 담긴 이메일을 확인하기 위해 팝업 창의 바깥쪽을 누르면 이 팝업이 닫힙니다. 팝업 창이 닫히는 것을 방지하기 위해 이 팝업을 새 창에서 다시 여시겠습니까?"
   },
-  "popupU2fCloseMessage": {
-    "message": "이 브라우저의 팝업 창에서는 U2F 요청을 처리할 수 없습니다. U2F로 로그인할 수 있도록 이 창을 새 창에서 여시겠습니까?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "배지 갯수 표시"
-  },
-  "badgeCounterDesc": {
-    "message": "현재 웹 페이지에 저장된 로그인 정보의 수를 표시합니다."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "카드 소유자 이름"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "새 $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ 수정",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "$TYPE$ 보기",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "비밀번호 변경 기록"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "오류"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "조직 정책에 따라, 페이지 로드 시 자동 완성 기능을 켰습니다."
   },
-  "howToAutofill": {
-    "message": "자동 완성 사용법"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "이 화면에서 항목을 선택하거나, 바로 가기 $COMMAND$를 사용하거나, 설정의 다른 옵션을 탐색하세요.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "도메인 별칭"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "마스터 비밀번호 재 요청이 있는 항목은 페이지 로드에서 자동으로 채울 수 없습니다. 페이지 로드의 자동 완성이 꺼졌습니다.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "페이지 로드 시 자동 완성이 기본 설정을 사용하도록 설정되었습니다.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "마스터 암호 재 요청을 해제하여 이 필드를 편집합니다",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "사이드 내비게이션 전환"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "패스키는 복제된 아이템에 복사되지 않습니다. 계속 이 항목을 복제하시겠어요?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "사이트에서 인증을 요구합니다. 이 기능은 비밀번호가 없는 계정에서는 아직 지원하지 않습니다."
-  },
   "logInWithPasskeyQuestion": {
     "message": "패스키로 로그인하시겠어요?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "애니메이션 활성화"
-  },
   "showAnimations": {
     "message": "애니메이션 표시"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "항목 위치"
   },
-  "fileSend": {
-    "message": "파일 Send"
-  },
   "fileSends": {
     "message": "파일 Send"
   },
-  "textSend": {
-    "message": "텍스트 Send"
-  },
   "textSends": {
     "message": "텍스트 Send"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "최소 사용자 지정 시간 초과는 1분입니다."
   },
-  "additionalContentAvailable": {
-    "message": "추가 콘텐츠를 사용할 수 있습니다"
-  },
   "fileSavedToDevice": {
     "message": "파일을 장치에 저장했습니다. 장치 다운로드로 관리할 수 있습니다."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/lt/messages.json b/apps/browser/src/_locales/lt/messages.json
index 7ca0353af67..478164a7f9c 100644
--- a/apps/browser/src/_locales/lt/messages.json
+++ b/apps/browser/src/_locales/lt/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Keisti"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Praradai prieigą prie visų savo dviejų veiksnių teikėjų? Naudok atkūrimo kodą, kad iš savo paskyros išjungtum visus dviejų veiksnių teikėjus."
-  },
   "recoveryCodeTitle": {
     "message": "Atkūrimo kodas"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Galite išjungti automatinį pildymą įkeliant puslapį atskiriems prisijungimo elementams, elemento redagavimo rodinyje."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Automatinis pildymas įkeliant puslapį (jei nustatyta Parinktyse)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Naudoti numatytuosius nustatymus"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Paspaudę už iššokančio lango, kad patikrintum, ar el. paštu gausi patvirtinimo kodą, uždarys šį iššokantį langą. Ar nori atidaryti šį iššokantį langą naujame lange, kad jis neužsidarytų?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Ši naršyklė negali apdoroti U2F prašymų šiame iššokančiame lange. Ar nori atidaryti šį iššokantį langą naujame lange, kad galėtum prisijungti naudodamas (-a) U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Rodyti ženkliukų skaitiklį"
-  },
-  "badgeCounterDesc": {
-    "message": "Nurodoma, kiek prisijungimų turi dabartiniame žiniatinklio puslapyje."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Mokėjimo kortelės savininko vardas"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "Naujas $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Redaguoti $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Peržiūrėti $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Slaptažodžio istorija"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Klaida"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "Kaip automatiškai užpildyti"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Domeno slapyvardis"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Elementai su pagrindinio slaptažodžio raginimu negali būti automatiškai užpildyti įkeliant puslapį. Automatinis pildymas, įkeliant puslapį, išjungtas.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Išjunkite pagrindinio slaptažodžio raginimą, jei norite redaguoti šį lauką",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Perjungti šoninę naršymą"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Elemento vieta"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/lv/messages.json b/apps/browser/src/_locales/lv/messages.json
index 08a99915648..f9a8c3fba2b 100644
--- a/apps/browser/src/_locales/lv/messages.json
+++ b/apps/browser/src/_locales/lv/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Atiestatīt meklēšanu"
   },
+  "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"
+  },
+  "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ā"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Vienums 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?"
+  },
   "edit": {
     "message": "Labot"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Atlasīt divpakāpju pieteikšanās veidu"
   },
-  "recoveryCodeDesc": {
-    "message": "Zaudēta piekļuve visiem divpakāpju nodrošinātājiem? Izmanto atkopes kodus, lai atspējotu visus sava konta divpakāpju nodrošinātājus!"
-  },
   "recoveryCodeTitle": {
     "message": "Atkopes kods"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Automātisko aizpildi lapas ielādes brīdī atsevišķiem pieteikšanās vienumiem var atslēgt vienuma labošanas skatā."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Automātiski aizpildīt lapas ielādes brīdī (ja iespējots iestatījumos)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Izmantot noklusējuma iestatījumu"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Klikšķināšana ārpus uznirstošā loga, lai e-pastā apskatītu apliecinājuma kodu, to aizvērs. Vai atvērt to atsevišķā logā, lai tas netiktu aizvērts?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Šis pārlūks nevar apstrādāt U2F pieprasījumus šajā uznirstošajā logā. Vai atvērt to atsevišķā logā, lai varētu pieteikties, izmantojot U2F?"
-  },
-  "enableFavicon": {
-    "message": "Rādīt tīmekļvietņu ikonas"
-  },
-  "faviconDesc": {
-    "message": "Attēlot atpazīstamu attēlu pie katra pieteikšanās vienuma."
-  },
-  "faviconDescAlt": {
-    "message": "Parādīt atpazīstamu attēlu pie katra pieteikšanās vienuma. Attiecas uz visiem kontiem, kuros ir notikusi pieteikšanās."
-  },
-  "enableBadgeCounter": {
-    "message": "Rādīt skaita nozīmīti"
-  },
-  "badgeCounterDesc": {
-    "message": "Attēlot pašreizējāi tīmekļa vietnei atbilstošo pieteikšanās vienumu skaitu."
+  "showIconsChangePasswordUrls": {
+    "message": "Rādīt tīmekļvietņu ikonas un iegūt paroles nomaiņas URL"
   },
   "cardholderName": {
     "message": "Kartes īpašnieka vārds"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Piezīme"
   },
-  "newItemHeader": {
-    "message": "Jauns/a $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Jauns pieteikšanās vienums",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Labot $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Jauna karte",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Apskatīt $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Jauna identitāte",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Jauna piezīme",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Jauna SSH atslēga",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Jauns teksta Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Jauns datnes Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Labot pieteikšanās vienumu",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Labot karti",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Labot identitāti",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Labot piezīmi",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Labot SSH atslēgu",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Labot teksta Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Labot datnes Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Apskatīt pieteikšanās vienumu",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Apskatīt karti",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Skatīt identitāti",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Apskatīt piezīmi",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Apskatīt SSH atslēgu",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Paroļu vēsture"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Kļūda"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Tavas apvienības nosacījumos ir ieslēgta automātiskā aizpilde lapas ielādes brīdī."
   },
-  "howToAutofill": {
-    "message": "Kā automātiski aizpildīt"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Jāizvēlas šī skata vienums, jāizmanto īsceļš $COMMAND$ vai iestatījumos jāizpēta citas iespējas.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Aizstājdomēns"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Vienumus ar galvenās paroles pārvaicāšanu nevar automātiski aizpildīt lapas ielādes brīdī. Automātiskā aizpilde lapas ielādes brīdī ir izslēgta.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Jāizslēdz galvenās paroles pārvaicāšana, lai labotu šo lauku",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Pārslēgt sānu pārvietošanās joslu"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Piekļuves atslēga netiks ievietota klonētajā vienumā. Vai turpināt šī vienuma klonēšanu?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Vietne, kurā tika uzsākta darbība, pieprasa apliecinājumu. Šī iespēja vēl nav īstenota kontiem, kuriem nav galvenās paroles."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Pieteikties ar piekļuves atslēgu?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Iespējot animācijas"
-  },
   "showAnimations": {
     "message": "Rādīt animācijas"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Vienuma atrašanās vieta"
   },
-  "fileSend": {
-    "message": "Datņu Send"
-  },
   "fileSends": {
     "message": "Datņu Send"
   },
-  "textSend": {
-    "message": "Teksta Send"
-  },
   "textSends": {
     "message": "Teksta Send"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Mazākā pieļaujamā pielāgotā noildze ir 1 minūte."
   },
-  "additionalContentAvailable": {
-    "message": "Ir pieejams papildu saturs"
-  },
   "fileSavedToDevice": {
     "message": "Datne saglabāta ierīcē. Tā ir atrodama ierīces lejupielāžu mapē."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Laipni lūdzam Tavā glabātavā!"
   },
+  "phishingPageTitle": {
+    "message": "Pikšķerēšanas tīmekļvietne"
+  },
+  "phishingPageCloseTab": {
+    "message": "Aizvērt cilni"
+  },
+  "phishingPageContinue": {
+    "message": "Turpināt"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Kāpēc šis ir redzams?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Automātiska pašreizējās lapas vienumu aizpildīšana"
   },
@@ -5584,6 +5657,12 @@
     "message": "Vienkārša spēcīgu un neatkārtojamu paroļu izveidošana ar pogu \"Izveidot paroli\", lai palīdzētu uzturēt pieteikšanās vienumus drošus.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Par šo iestatījumu"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden izmantos saglabātos pieteikšanās vienuma URI, lai noteiktu, kuru ikonu vai paroles nomaiņas URL izmantot, lai uzlabotu pieredzi. Šī pakalpojuma izmantošanas laikā nekāda informācija netiek ievākta vai saglabāta."
+  },
   "noPermissionsViewPage": {
     "message": "Nav atļaujas apskatīt šo lapu. Jāmēģina pieteikties ar citu kontu."
   },
diff --git a/apps/browser/src/_locales/ml/messages.json b/apps/browser/src/_locales/ml/messages.json
index 00bd531945c..cd99f32714e 100644
--- a/apps/browser/src/_locales/ml/messages.json
+++ b/apps/browser/src/_locales/ml/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "തിരുത്തുക"
   },
@@ -701,6 +733,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": "വാൾട് ടൈംഔട്ട്"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "നിങ്ങളുടെ രണ്ട്-ഘടക ദാതാക്കളിലേക്കുള്ള ആക്‌സസ്സ് നഷ്‌ടപ്പെട്ടോ? നിങ്ങളുടെ അക്കൗണ്ടിൽ നിന്ന് രണ്ട്-ഘടക ദാതാക്കളെ പ്രവർത്തനരഹിതമാക്കാൻ നിങ്ങളുടെ റിക്കവറി കോഡ് ഉപയോഗിക്കുക."
-  },
   "recoveryCodeTitle": {
     "message": "റിക്കവറി കോഡ്"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "നിങ്ങളുടെ സ്ഥിരീകരണ കോഡിനായി നിങ്ങളുടെ ഇമെയിൽ പരിശോധിക്കുന്നതിന് പോപ്പ്അപ്പ് വിൻഡോയ്ക്ക് പുറത്ത് ക്ലിക്കുചെയ്യുന്നത് ഈ പോപ്പ്അപ്പ് അടയ്‌ക്കുന്നതിന് കാരണമാകും. ഈ പോപ്പ്അപ്പ് അടയ്‌ക്കാത്തവിധം ഒരു പുതിയ വിൻ‌ഡോയിൽ‌ തുറക്കാൻ‌ നിങ്ങൾ‌ താൽ‌പ്പര്യപ്പെടുന്നോ?"
   },
-  "popupU2fCloseMessage": {
-    "message": "ഈ ബ്ര pop സറിന് ഈ പോപ്പ്അപ്പ് വിൻഡോയിൽ U2F അഭ്യർത്ഥനകൾ പ്രോസസ്സ് ചെയ്യാൻ കഴിയില്ല. യു 2 എഫ് ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യാൻ ഈ പോപ്പ്അപ്പ് ഒരു പുതിയ വിൻഡോയിൽ തുറക്കാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "കാർഡ് ഉടമയുടെ പേര്"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "പാസ്സ്‌വേഡ് നാൾവഴി"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/mr/messages.json b/apps/browser/src/_locales/mr/messages.json
index d370a096583..e639bae2662 100644
--- a/apps/browser/src/_locales/mr/messages.json
+++ b/apps/browser/src/_locales/mr/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/my/messages.json b/apps/browser/src/_locales/my/messages.json
index be0400906cc..dcd86eb4337 100644
--- a/apps/browser/src/_locales/my/messages.json
+++ b/apps/browser/src/_locales/my/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/nb/messages.json b/apps/browser/src/_locales/nb/messages.json
index a86b371e537..b01d5a5ebbf 100644
--- a/apps/browser/src/_locales/nb/messages.json
+++ b/apps/browser/src/_locales/nb/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Rediger"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Velg 2-trinnspåloggingsmetode"
   },
-  "recoveryCodeDesc": {
-    "message": "Har du mistet tilgang til alle dine 2-trinnsleverandører? Bruk din gjenopprettingskode til å fjerne alle 2-trinnsleverandører fra din konto."
-  },
   "recoveryCodeTitle": {
     "message": "Gjenopprettingskode"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Du kan skru av auto-utfylling ved sideinnlastinger for individuelle innloggingsgjenstander fra gjenstandens «Redigér»-visning."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Auto-utfyll på sideinnlastning (hvis aktivert i Alternativer)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Bruk standardinnstillinger"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Å klikke utenfor dette oppsprettsvinduet for å sjekke E-postinnboksen din for en verifiseringskoden, vil lukke denne oppspretten. Vil du åpne oppsprettet i et nytt vindu sånn at den ikke lukkes?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Denne nettleseren kan ikke behandle U2F-forespørsler i dette popup-vinduet. Vil du åpne denne popupen i et nytt vindu, slik at du kan logge deg på med U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Vis merke-teller"
-  },
-  "badgeCounterDesc": {
-    "message": "Indiker hvor mange innlogginger du har for den aktuelle nettsiden."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Kortholderens navn"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "Ny $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Rediger $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Vis $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Passordhistorikk"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Feil"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Virksomhetsreglene dine har slått på automatisk utfylling av sidene."
   },
-  "howToAutofill": {
-    "message": "Hvordan bruke auto-utfylling"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Velg en gjenstand fra denne skjermen, bruk snarveien $COMMAND$, eller utforsk andre alternativer i innstillingene.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias-domene"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Skru av/på sidenavigering"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Passnøkkelen kopieres ikke til det klonede elementet. Vil du fortsette kloningen av denne gjenstanden?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Vil du logge inn med passnøkkel?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Aktiver animasjoner"
-  },
   "showAnimations": {
     "message": "Vis animasjoner"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Gjenstandens plassering"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minste egendefinerte tidsavbrudd er 1 minutt."
   },
-  "additionalContentAvailable": {
-    "message": "Ytterligere innhold er tilgjengelig"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Velkommen til hvelvet ditt!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/ne/messages.json b/apps/browser/src/_locales/ne/messages.json
index be0400906cc..dcd86eb4337 100644
--- a/apps/browser/src/_locales/ne/messages.json
+++ b/apps/browser/src/_locales/ne/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/nl/messages.json b/apps/browser/src/_locales/nl/messages.json
index 87910f9172c..62f81cf0897 100644
--- a/apps/browser/src/_locales/nl/messages.json
+++ b/apps/browser/src/_locales/nl/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Zoekopdracht resetten"
   },
+  "archiveNoun": {
+    "message": "Archief",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archiveren",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Dearchiveren"
+  },
+  "itemsInArchive": {
+    "message": "Items in archief"
+  },
+  "noItemsInArchive": {
+    "message": "Geen items in archief"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Gearchiveerde items verschijnen hier en worden uitgesloten van algemene zoekresultaten en automatisch invulsuggesties."
+  },
+  "itemSentToArchive": {
+    "message": "Item naar archief verzonden"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item verwijderd uit archief"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Bewerken"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Kies methode voor tweestapslogin"
   },
-  "recoveryCodeDesc": {
-    "message": "Ben je de toegang tot al je tweestapsaanbieders verloren? Gebruik dan je herstelcode om alle tweestapsaanbieders op je account uit te schakelen."
-  },
   "recoveryCodeTitle": {
     "message": "Herstelcode"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Na het inschakelen van Automatisch invullen bij laden van pagina, kun je de functie voor individuele inlogitems in- of uitschakelen. Dit is de standaardinstelling voor inlogitems die niet afzonderlijk zijn geconfigureerd."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Automatisch invullen bij laden van pagina (als ingeschakeld in Opties)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Standaardinstelling gebruiken"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Als je buiten het pop-upvenster klikt om je e-mail te controleren op een verificatiecode, dan zal de pop-up sluiten. Wil je het pop-upvenster openen in een nieuw scherm, zodat het niet wordt gesloten?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Deze browser kan U2F-verzoeken niet verwerken in dit popupvenster. Wilt je deze pop-up openen in een nieuw venster zodat je kunt inloggen met U2F?"
-  },
-  "enableFavicon": {
-    "message": "Websitepictogrammen weergeven"
-  },
-  "faviconDesc": {
-    "message": "Een herkenbare afbeelding naast iedere login weergeven."
-  },
-  "faviconDescAlt": {
-    "message": "Toon een herkenbare afbeelding naast elke login. Geldt voor alle ingelogde accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Teller weergeven"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicatie van het aantal logins dat je hebt voor de huidige webpagina."
+  "showIconsChangePasswordUrls": {
+    "message": "Websitepictogrammen weergeven en URL's voor wachtwoordwijzigingen ophalen"
   },
   "cardholderName": {
     "message": "Naam kaarthouder"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Notitie"
   },
-  "newItemHeader": {
-    "message": "Nieuwe $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nieuwe login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ bewerken",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nieuwe kaart",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "$TYPE$ weergeven",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nieuwe identiteit",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nieuwe notitie",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nieuwe SSH-sleutel",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Nieuwe Send (tekst)",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Nieuwe Send (bestand)",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Login bewerken",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Kaart bewerken",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Identiteit bewerken",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Notitie bewerken",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "SSH-sleutel bewerken",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Send (tekst) bewerken",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Send (bestand) bewerken",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Login bekijken",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Kaart bekijken",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Identiteit bekijken",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Notitie bekijken",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "SSH-sleutel bekijken",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Geschiedenis"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Fout"
   },
@@ -3377,10 +3464,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$",
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Je organisatiebeleid heeft het automatisch invullen bij laden van pagina ingeschakeld."
   },
-  "howToAutofill": {
-    "message": "Hoe automatisch invullen"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Selecteer een item in dit scherm, gebruik de sneltoets $COMMAND$ of verken andere opties in de instellingen.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Aliasdomein"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items met hoofdwachtwoord re-prompt kunnen niet automatisch worden ingevuld bij het laden van de pagina. Automatisch invullen bij laden van pagina uitgeschakeld.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Hoofdwachtwoord herhaalprompt uitschakelen om dit veld te bewerken",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Zijnavigatie schakelen"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "De passkey wordt niet gekopieerd naar het gekloonde item. Wil je doorgaan met het klonen van dit item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "De initiërende site vereist verificatie. Deze functie is nog niet geïmplementeerd voor accounts zonder hoofdwachtwoord."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Inloggen met passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Animaties inschakelen"
-  },
   "showAnimations": {
     "message": "Animaties weergeven"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Itemlocatie"
   },
-  "fileSend": {
-    "message": "Bestand verzenden"
-  },
   "fileSends": {
     "message": "Bestanden verzenden"
   },
-  "textSend": {
-    "message": "Tekst-Sends"
-  },
   "textSends": {
     "message": "Tekst-Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimale aangepaste time-out is 1 minuut."
   },
-  "additionalContentAvailable": {
-    "message": "Extra inhoud beschikbaar"
-  },
   "fileSavedToDevice": {
     "message": "Bestand op apparaat opgeslagen. Beheer vanaf de downloads op je apparaat."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welkom in je kluis!"
   },
+  "phishingPageTitle": {
+    "message": "Kwaadaardige website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Tabblad sluiten"
+  },
+  "phishingPageContinue": {
+    "message": "Doorgaan"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Waarom zie je dit?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Automatisch invullen van items voor de huidige pagina"
   },
@@ -5584,6 +5657,12 @@
     "message": "Maak eenvoudig sterke en unieke wachtwoorden door op de knop Wachtwoord genereren te klikken om je logins veilig te houden.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Over deze instelling"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden gebruikt opgeslagen login-URI's om te bepalen welk pictogram of URL voor het wijzigen van het wachtwoord moet worden gebruikt om je ervaring te verbeteren. Er wordt geen informatie verzameld of opgeslagen wanneer je deze service gebruikt."
+  },
   "noPermissionsViewPage": {
     "message": "Je hebt geen rechten om deze pagina te bekijken. Probeer in te loggen met een ander account."
   },
diff --git a/apps/browser/src/_locales/nn/messages.json b/apps/browser/src/_locales/nn/messages.json
index be0400906cc..dcd86eb4337 100644
--- a/apps/browser/src/_locales/nn/messages.json
+++ b/apps/browser/src/_locales/nn/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/or/messages.json b/apps/browser/src/_locales/or/messages.json
index be0400906cc..dcd86eb4337 100644
--- a/apps/browser/src/_locales/or/messages.json
+++ b/apps/browser/src/_locales/or/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/pl/messages.json b/apps/browser/src/_locales/pl/messages.json
index 1be9d204250..8d96ccaffc6 100644
--- a/apps/browser/src/_locales/pl/messages.json
+++ b/apps/browser/src/_locales/pl/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Zresetuj wyszukiwanie"
   },
+  "archiveNoun": {
+    "message": "Archiwum",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archiwizuj",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Usuń z archiwum"
+  },
+  "itemsInArchive": {
+    "message": "Elementy w archiwum"
+  },
+  "noItemsInArchive": {
+    "message": "Brak elementów w archiwum"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Zarchiwizowane elementy pojawią się tutaj i zostaną wykluczone z wyników wyszukiwania i sugestii autouzupełniania."
+  },
+  "itemSentToArchive": {
+    "message": "Element został przeniesiony do archiwum"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Element został usunięty z archiwum"
+  },
+  "archiveItem": {
+    "message": "Archiwizuj element"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Zarchiwizowane elementy są wykluczone z wyników wyszukiwania i sugestii autouzupełniania. Czy na pewno chcesz archiwizować element?"
+  },
   "edit": {
     "message": "Edytuj"
   },
@@ -701,6 +733,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"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Blokowanie sejfu"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Wybierz metodę logowania dwustopniowego"
   },
-  "recoveryCodeDesc": {
-    "message": "Nie masz dostępu do logowania dwustopniowego? Użyj kodu odzyskiwania, aby je wyłączyć."
-  },
   "recoveryCodeTitle": {
     "message": "Kod odzyskiwania"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Możesz wyłączyć autouzupełnianie po załadowaniu strony dla poszczególnych elementów w opcjach konkretnych elementów."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Uzupełniaj po załadowaniu strony (jeśli włączono w opcjach)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Użyj domyślnego ustawienia"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Kliknięcie poza okno, w celu sprawdzenia wiadomość z kodem weryfikacyjnym spowoduje, że zostanie ono zamknięte. Czy chcesz otworzyć nowe okno tak, aby się nie zamknęło?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Przeglądarka nie może przetworzyć żądań U2F. Czy chcesz otworzyć nowe okno, aby zalogować się za pomocą U2F?"
-  },
-  "enableFavicon": {
-    "message": "Pokaż ikony stron internetowych"
-  },
-  "faviconDesc": {
-    "message": "Pokaż rozpoznawalną ikonę obok danych logowania."
-  },
-  "faviconDescAlt": {
-    "message": "Pokaż rozpoznawalną ikonę obok danych logowania. Dotyczy wszystkich zalogowanych kont."
-  },
-  "enableBadgeCounter": {
-    "message": "Pokaż licznik na ikonie"
-  },
-  "badgeCounterDesc": {
-    "message": "Pokazuje liczbę danych logowania dla obecnej strony internetowej."
+  "showIconsChangePasswordUrls": {
+    "message": "Pokaż ikony stron internetowych i pobierz adresy URL do zmiany hasła"
   },
   "cardholderName": {
     "message": "Właściciel karty"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Notatka"
   },
-  "newItemHeader": {
-    "message": "$TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nowe dane logowania",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nowa karta",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Pokaż $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nowa tożsamość",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nowa notatka",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nowy klucz SSH",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Nowa wysyłka tekstu",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Nowa wysyłka pliku",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edytuj dane logowania",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edytuj kartę",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edytuj tożsamość",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edytuj notatkę",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edytuj klucz SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edytuj tekst wysyłki",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edytuj plik wysyłki",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Pokaż dane logowania",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Pokaż kartę",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Pokaż tożsamość",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Pokaż notatkę",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Pokaż klucz SSH",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Historia hasła"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Błąd"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Twoja organizacja włączyła autouzupełnianie po załadowaniu strony."
   },
-  "howToAutofill": {
-    "message": "Jak uzupełniać dane"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Wybierz element, użyj skrótu $COMMAND$ lub zobacz inne opcje w ustawieniach.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Domena aliasu"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Elementy z pytaniem o hasło główne nie mogą być autouzupełniane przy wczytywaniu strony. Autouzupełnianie podczas wczytywania strony zostało wyłączone.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Wyłącz prośbę o podanie hasła głównego, aby edytować to pole",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Przełącz nawigację boczną"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Klucz dostępu nie zostanie skopiowany do sklonowanego elementu. Czy chcesz kontynuować klonowanie elementu?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Weryfikacja jest wymagana przez stronę inicjującą. Ta funkcja nie jest jeszcze dostępna dla kont bez hasła głównego."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Zalogować się kluczem dostępu?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Włącz animacje"
-  },
   "showAnimations": {
     "message": "Pokaż animacje"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Lokalizacja elementu"
   },
-  "fileSend": {
-    "message": "Plik wysyłki"
-  },
   "fileSends": {
     "message": "Wysyłki plików"
   },
-  "textSend": {
-    "message": "Tekst wysyłki"
-  },
   "textSends": {
     "message": "Wysyłki tekstów"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimalny niestandardowy czas to 1 minuta."
   },
-  "additionalContentAvailable": {
-    "message": "Dostępna jest dodatkowa zawartość"
-  },
   "fileSavedToDevice": {
     "message": "Plik został zapisany na urządzeniu."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Witaj w sejfie!"
   },
+  "phishingPageTitle": {
+    "message": "Witryna phishingowa"
+  },
+  "phishingPageCloseTab": {
+    "message": "Zamknij kartę"
+  },
+  "phishingPageContinue": {
+    "message": "Kontynuuj"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Dlaczego to widzę?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Uzupełniaj elementy na stronie internetowej"
   },
@@ -5584,6 +5657,12 @@
     "message": "Twórz silne i unikalne hasła, klikając przycisk Wygeneruj hasło, aby zapewnić bezpieczeństwo danych logowania.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "O ustawieniu"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden użyje zapisanych adresów URL danych logowania, aby określić, która ikona lub adres URL zmiany hasła powinien zostać użyty w celu poprawy komfortu użytkowania. Usługa nie zapisuje żadnych danych."
+  },
   "noPermissionsViewPage": {
     "message": "Nie masz uprawnień do przeglądania tej strony. Zaloguj się na inne konto."
   },
diff --git a/apps/browser/src/_locales/pt_BR/messages.json b/apps/browser/src/_locales/pt_BR/messages.json
index 7e192777a4b..746c04bdf0f 100644
--- a/apps/browser/src/_locales/pt_BR/messages.json
+++ b/apps/browser/src/_locales/pt_BR/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Editar"
   },
@@ -701,6 +733,15 @@
   "invalidMasterPassword": {
     "message": "Senha mestra invá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": "Cofre - tempo esgotado"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Escolher iniciar sessão em duas etapas"
   },
-  "recoveryCodeDesc": {
-    "message": "Perdeu o acesso a todos os seus provedores de duas etapas? Utilize o seu código de recuperação para desativar todos os provedores de duas etapas da sua conta."
-  },
   "recoveryCodeTitle": {
     "message": "Código de Recuperação"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Você pode desativar o preenchimento automático no carregamento da página para credenciais individuais na tela de Editar do item."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Preencher automaticamente ao carregar a página (se configurado nas Opções)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Usar configuração padrão"
   },
@@ -1760,23 +1795,8 @@
   "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?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Este navegador não pode processar requisições U2F nesta janela popup. Você quer abrir este popup em uma nova janela para que você possa entrar usando U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Mostrar contador de insígnia"
-  },
-  "badgeCounterDesc": {
-    "message": "Indique quantos acessos você tem para a página “web” atual."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Titular do Cartão"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Nota"
   },
-  "newItemHeader": {
-    "message": "Nova $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Editar $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Visualizar $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Histórico de Senha"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Erro"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Suas políticas de organização ativaram o preenchimento automático ao carregar a página."
   },
-  "howToAutofill": {
-    "message": "Como preencher automaticamente"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Selecione um item desta tela, use o atalho $COMMAND$, ou explore outras opções nas configurações.",
     "placeholders": {
@@ -3588,7 +3672,7 @@
     "message": "Lembrar deste dispositivo para permanecer conectado"
   },
   "manageDevices": {
-    "message": "Manage devices"
+    "message": "Gerenciar dispositivos"
   },
   "currentSession": {
     "message": "Current session"
@@ -3631,7 +3715,7 @@
     "message": "Needs approval"
   },
   "devices": {
-    "message": "Devices"
+    "message": "Dispositivos"
   },
   "accessAttemptBy": {
     "message": "Access attempt by $EMAIL$",
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias do domínio"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Os itens com confirmação de senha mestra não podem ser preenchidos automaticamente ao carregar a página. O preenchimento automático ao carregar a página será desativado.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Desative a re-solicitação de senha mestra para editar este campo",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Ativar/desativar navegação lateral"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "A chave de acesso não será copiada para o item clonado. Deseja continuar clonando este item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verificação requerida pelo site que a iniciou. Esse recurso ainda não está implementado para contas sem senha mestra."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Fazer ‘login’ com chave de acesso?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Habilita animações"
-  },
   "showAnimations": {
     "message": "Exibir animações"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Localização do Item"
   },
-  "fileSend": {
-    "message": "Arquivo enviado"
-  },
   "fileSends": {
     "message": "Arquivos enviados"
   },
-  "textSend": {
-    "message": "Enviar texto"
-  },
   "textSends": {
     "message": "Texto enviado"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Tempo limite mínimo personalizado é 1 minuto."
   },
-  "additionalContentAvailable": {
-    "message": "Conteúdo adicional está disponível"
-  },
   "fileSavedToDevice": {
     "message": "Arquivo salvo no dispositivo. Gerencie a partir das transferências do seu dispositivo."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/pt_PT/messages.json b/apps/browser/src/_locales/pt_PT/messages.json
index 605b3dd520c..345be1766de 100644
--- a/apps/browser/src/_locales/pt_PT/messages.json
+++ b/apps/browser/src/_locales/pt_PT/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Repor pesquisa"
   },
+  "archiveNoun": {
+    "message": "Arquivo",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arquivar",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Desarquivar"
+  },
+  "itemsInArchive": {
+    "message": "Itens no arquivo"
+  },
+  "noItemsInArchive": {
+    "message": "Nenhum item no arquivo"
+  },
+  "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"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removido do arquivo"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Editar"
   },
@@ -701,6 +733,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"
   },
@@ -1235,10 +1276,10 @@
     "message": "Tema"
   },
   "themeDesc": {
-    "message": "Altere o tema de cores da aplicação."
+    "message": "Altere o tema da aplicação."
   },
   "themeDescAlt": {
-    "message": "Altere o tema de cores da aplicação. Aplica-se a todas as contas com sessão iniciada."
+    "message": "Altere o tema da aplicação. Aplica-se a todas as contas com sessão iniciada."
   },
   "dark": {
     "message": "Escuro",
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Selecionar método de verificação de dois passos"
   },
-  "recoveryCodeDesc": {
-    "message": "Perdeu o acesso a todos os seus fornecedores de verificação de dois passos? Utilize o seu código de recuperação para desativar todos os fornecedores de verificação de dois passos da sua conta."
-  },
   "recoveryCodeTitle": {
     "message": "Código de recuperação"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Pode desativar o preenchimento automático ao carregar a página para itens de início de sessão individuais a partir da vista Editar do item."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Preencher automaticamente ao carregar a página (se configurado nas Opções)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Utilizar a predefinição"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Ao clicar fora da janela pop-up para verificar o código de verificação no seu e-mail fará com que este pop-up se feche. Pretende abrir esta janela pop-up numa nova janela para que não se feche?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Este navegador não pode processar pedidos U2F nesta janela pop-up. Pretende abrir este pop-up numa nova janela para poder iniciar sessão utilizando o U2F?"
-  },
-  "enableFavicon": {
-    "message": "Mostrar ícones do site"
-  },
-  "faviconDesc": {
-    "message": "Mostrar uma imagem reconhecível junto a cada credencial."
-  },
-  "faviconDescAlt": {
-    "message": "Mostrar uma imagem reconhecível junto a cada credencial. Aplica-se a todas as contas com sessão iniciada."
-  },
-  "enableBadgeCounter": {
-    "message": "Mostrar distintivo de contador"
-  },
-  "badgeCounterDesc": {
-    "message": "Indica quantas credenciais tem para a página Web atual."
+  "showIconsChangePasswordUrls": {
+    "message": "Mostrar ícones de sites e recuperar URLs de alteração de palavra-passe"
   },
   "cardholderName": {
     "message": "Titular do cartão"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Nota"
   },
-  "newItemHeader": {
-    "message": "Novo(a) $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nova credencial",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Editar $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Novo cartão",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Ver $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nova identidade",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nova nota",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nova chave SSH",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Novo Send de texto",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Novo Send de ficheiro",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Editar credencial",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Editar cartão",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Editar identidade",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Editar nota",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Editar chave SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Editar Send de texto",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Editar Send de ficheiro",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Ver credencial",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Ver cartão",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Ver identidade",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Ver nota",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Ver chave SSH",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Histórico de palavras-passe"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Erro"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "As políticas da sua organização ativaram o preenchimento automático ao carregar a página."
   },
-  "howToAutofill": {
-    "message": "Como preencher automaticamente"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Selecione um item a partir deste ecrã, utilize o atalho $COMMAND$ ou explore outras opções nas definições.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias de domínio"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Os itens que voltem a pedir a palavra-passe mestra não podem ser preenchidos automaticamente no carregamento da página. Preenchimento automático no carregamento da página desativado.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Desativar o pedido para reintroduzir a palavra-passe mestra para editar este campo",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Ativar/desativar navegação lateral"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "A chave de acesso não será copiada para o item duplicado. Pretende ainda assim duplicar este item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verificação exigida pelo site inicial. Esta funcionalidade ainda não está implementada para contas sem palavra-passe mestra."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Iniciar sessão com a chave de acesso?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Ativar animações"
-  },
   "showAnimations": {
     "message": "Mostrar animações"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Localização do item"
   },
-  "fileSend": {
-    "message": "Send de ficheiro"
-  },
   "fileSends": {
     "message": "Sends de ficheiros"
   },
-  "textSend": {
-    "message": "Send de texto"
-  },
   "textSends": {
     "message": "Sends de texto"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "O tempo limite mínimo personalizado é de 1 minuto."
   },
-  "additionalContentAvailable": {
-    "message": "Estão disponíveis conteúdos adicionais"
-  },
   "fileSavedToDevice": {
     "message": "Ficheiro guardado no dispositivo. Gira-o a partir das transferências do seu dispositivo."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Bem-vindo ao seu cofre!"
   },
+  "phishingPageTitle": {
+    "message": "Site de phishing"
+  },
+  "phishingPageCloseTab": {
+    "message": "Fechar separador"
+  },
+  "phishingPageContinue": {
+    "message": "Continuar"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Porque é que está a ver isto?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Preenchimento automático de itens para a página atual"
   },
@@ -5584,6 +5657,12 @@
     "message": "Crie facilmente palavras-passe fortes e únicas clicando no botão Gerar palavra-passe para o ajudar a manter as suas credenciais seguras.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Acerca desta definição"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "O Bitwarden utilizará os URIs de credenciais guardadas para identificar qual o ícone ou URL de alteração de palavra-passe que deve ser utilizado para melhorar a sua experiência. Nenhuma informação é recolhida ou guardada quando utiliza este serviço."
+  },
   "noPermissionsViewPage": {
     "message": "Não tem permissões para ver esta página. Tente iniciar sessão com uma conta diferente."
   },
diff --git a/apps/browser/src/_locales/ro/messages.json b/apps/browser/src/_locales/ro/messages.json
index 5c9655f9759..2dcf2fb6181 100644
--- a/apps/browser/src/_locales/ro/messages.json
+++ b/apps/browser/src/_locales/ro/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Editare"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Ați pierdut accesul la toți furnizorii de autentificare în două etape? Utilizați codul de recuperare pentru a dezactiva toți acești furnizori din contul dvs."
-  },
   "recoveryCodeTitle": {
     "message": "Cod de recuperare"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Puteți dezactiva completarea automată la încărcarea paginii pentru elementele de autentificare individuale din vizualizarea Editare element."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Completare automată la încărcarea paginii (dacă este configurată în Opțiuni)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Utilizați setarea implicită"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Dând clic în afara ferestrei pop-up pentru a vă verifica e-mailul pentru codul de verificare, aceasta se va închide. Doriți să deschideți acest pop-up într-o fereastră nouă, astfel încât aceasta să nu se închidă?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Acest browser nu poate procesa cererile U2F în această fereastră pop-up. Doriți să deschideți acest pop-up într-o fereastră nouă, astfel încât să vă puteți conecta utilizând U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Afișați contorul de insigne"
-  },
-  "badgeCounterDesc": {
-    "message": "Indică numărul de autentificări pe care le aveți pentru pagina web curentă."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Numele titularului cardului"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Istoric parole"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Eroare"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Politicile organizației dvs. au activat auto-completarea la încărcarea paginii."
   },
-  "howToAutofill": {
-    "message": "Instrucțiuni de auto-completare"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Elementele în care parola principală este solicitată din nou nu pot fi completate automat la încărcarea paginii. Completarea automată la încărcarea paginii este dezactivată.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Dezactivați reintroducerea parolei principale pentru a edita acest câmp",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/ru/messages.json b/apps/browser/src/_locales/ru/messages.json
index 72166573df6..593e2b5d672 100644
--- a/apps/browser/src/_locales/ru/messages.json
+++ b/apps/browser/src/_locales/ru/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Сбросить поиск"
   },
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архивировать",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Разархивировать"
+  },
+  "itemsInArchive": {
+    "message": "Элементы в архиве"
+  },
+  "noItemsInArchive": {
+    "message": "В архиве нет элементов"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Архивированные элементы появятся здесь и будут исключены из общих результатов поиска и предложений автозаполнения."
+  },
+  "itemSentToArchive": {
+    "message": "Элемент отправлен в архив"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Элемент удален из архива"
+  },
+  "archiveItem": {
+    "message": "Архивировать элемент"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Архивированные элементы исключены из общих результатов поиска и предложений автозаполнения. Вы уверены, что хотите архивировать этот элемент?"
+  },
   "edit": {
     "message": "Изменить"
   },
@@ -701,6 +733,15 @@
   "invalidMasterPassword": {
     "message": "Неверный мастер-пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неверный мастер-пароль. Подтвердите, что ваш адрес email указан верно и ваш аккаунт был создан на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Тайм-аут хранилища"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Выбрать другой метод двухэтапной аутентификации"
   },
-  "recoveryCodeDesc": {
-    "message": "Потеряли доступ ко всем вариантам двухэтапной аутентификации? Используйте код восстановления, чтобы отключить двухэтапную аутентификацию для вашей учетной записи."
-  },
   "recoveryCodeTitle": {
     "message": "Код восстановления"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Вы можете отключить автозаполнение при загрузке страницы для отдельных логинов в режиме редактирования элемента."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Автозаполнение при загрузке страницы (если включено в настройках)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Использовать настройки по умолчанию"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Щелчок за пределами этого окна для просмотра кода проверки из электронной почты приведет к его закрытию. Открыть bitwarden в новом окне?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Этот браузер не может обрабатывать запросы U2F в этом всплывающем окне. Вы хотите открыть это всплывающее окно в новом окне, чтобы иметь возможность войти в систему, используя U2F?"
-  },
-  "enableFavicon": {
-    "message": "Показать значки сайтов"
-  },
-  "faviconDesc": {
-    "message": "Отображать узнаваемое изображение рядом с каждым логином."
-  },
-  "faviconDescAlt": {
-    "message": "Показывать узнаваемое изображение рядом с каждым логином. Применяется ко всем авторизованным аккаунтам."
-  },
-  "enableBadgeCounter": {
-    "message": "Показать счетчик на значке"
-  },
-  "badgeCounterDesc": {
-    "message": "Показывает количество логинов для текущей веб-страницы."
+  "showIconsChangePasswordUrls": {
+    "message": "Показывать значки сайтов и извлекать URL изменения пароля"
   },
   "cardholderName": {
     "message": "Имя владельца карты"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Заметка"
   },
-  "newItemHeader": {
-    "message": "Новый $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Новый логин",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Изменить $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Новая карта",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Просмотр $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Новая личная информация",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Новая заметка",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Новый ключ SSH",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Новая текстовая Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Новая файловая Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Изменить логин",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Редактировать карту",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Редактировать личную информацию",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Редактировать заметку",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Редактировать ключ SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Изменить тестовую Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Изменить файловую Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Просмотр логина",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Просмотр карты",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Просмотр личной информации",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Просмотр заметки",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Просмотр ключа SSH",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "История паролей"
@@ -3138,6 +3207,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Будет экспортировано только хранилище организации, связанное с $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Будет экспортировано только хранилище организации, связанное с $ORGANIZATION$. Коллекции Мои элементы включены не будут.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Ошибка"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Автозаполнение при загрузке страницы было активировано политиками вашей организации."
   },
-  "howToAutofill": {
-    "message": "Как использовать автозаполнение"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Выберите элемент на этой странице, используйте сочетание клавиш: $COMMAND$ или ознакомьтесь с другими параметрами в настройках.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Псевдоним домена"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Элементы с повторным запросом мастер-пароля не могут быть автоматически заполнены при загрузке страницы. Автозаполнение при загрузке страницы выключено.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "Автозаполнение при загрузке страницы использует настройку по умолчанию.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Для редактирования этого поля отключите повторный запрос мастер-пароля",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Переключить боковую навигацию"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Passkey не будет скопирован в клонированный элемент. Продолжить клонирование этого элемента?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Необходима верификация со стороны инициирующего сайта. Для аккаунтов без мастер-пароля эта возможность пока не реализована."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Войти с passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Включить анимацию"
-  },
   "showAnimations": {
     "message": "Показать анимацию"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Расположение элемента"
   },
-  "fileSend": {
-    "message": "Файловая Send"
-  },
   "fileSends": {
     "message": "Файловая Send"
   },
-  "textSend": {
-    "message": "Текстовая Send"
-  },
   "textSends": {
     "message": "Текстовая Send"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Минимальный пользовательский тайм-аут составляет 1 минуту."
   },
-  "additionalContentAvailable": {
-    "message": "Дополнительный контент доступен"
-  },
   "fileSavedToDevice": {
     "message": "Файл сохранен на устройстве. Управляйте им из загрузок устройства."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Добро пожаловать в ваше хранилище!"
   },
+  "phishingPageTitle": {
+    "message": "Фишинг-сайт"
+  },
+  "phishingPageCloseTab": {
+    "message": "Закрыть вкладку"
+  },
+  "phishingPageContinue": {
+    "message": "Продолжить"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Почему вы это видите?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Автозаполнение элементов на текущей странице"
   },
@@ -5584,6 +5657,12 @@
     "message": "Легко создавайте надежные и уникальные пароли, нажатием на кнопку 'Сгенерировать пароль', чтобы обеспечить безопасность ваших логинов.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Об этой настройке"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden будет использовать сохраненные URI логинов, чтобы определить, какой значок или URL для смены пароля следует использовать для улучшения вашего взаимодействия. При использовании этого сервиса никакая информация не собирается и не сохраняется."
+  },
   "noPermissionsViewPage": {
     "message": "У вас нет прав для просмотра этой страницы. Попробуйте авторизоваться под другим аккаунтом."
   },
diff --git a/apps/browser/src/_locales/si/messages.json b/apps/browser/src/_locales/si/messages.json
index c0edd60f344..8218a5d8787 100644
--- a/apps/browser/src/_locales/si/messages.json
+++ b/apps/browser/src/_locales/si/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "සංස්කරණය"
   },
@@ -701,6 +733,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": "සුරක්ෂිතාගාරය වේලාව"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "ඔබගේ ද්වි-සාධක සපයන්නන් සියලු ප්රවේශ අහිමි? ඔබගේ ගිණුමෙන් සියලුම ද්වි-සාධක සපයන්නන් අක්රීය කිරීමට ඔබගේ ප්රතිසාධන කේතය භාවිතා කරන්න."
-  },
   "recoveryCodeTitle": {
     "message": "ප්රතිසාධන කේතය"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "පිටු පැටවුම් මත වාහන-පිරවීම සක්රීය කිරීමෙන් පසු, ඔබ තනි පිවිසුම් අයිතම සඳහා විශේෂාංගය සක්රිය හෝ අක්රිය කළ හැකිය. වෙන වෙනම වින්යාස කර නොමැති පිවිසුම් අයිතම සඳහා පෙරනිමි සැකසුම මෙයයි."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "පිටු පැටවුම් මත ස්වයංක්රීය-පිරවීම (විකල්ප සක්රීය නම්)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "පෙරනිමි සැකසුම භාවිතා"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "ඔබගේ සත්යාපන කේතය සඳහා ඔබගේ ඊ-තැපැල් පරීක්ෂා කිරීමට උත්පතන කවුළුවෙන් පිටත ක්ලික් කිරීමෙන් මෙම උත්පතන වසා දැමීමට හේතු වේ. මෙම උත්පතන නව කවුළුවක විවෘත කිරීමට ඔබට අවශ්යද?"
   },
-  "popupU2fCloseMessage": {
-    "message": "මෙම බ්රවුසරයට මෙම උත්පතන කවුළුව තුළ U2F ඉල්ලීම් සැකසීමට නොහැක. ඔබට U2F භාවිතයෙන් පිවිසිය හැකි වන පරිදි නව කවුළුවක මෙම උත්පතන විවෘත කිරීමට අවශ්යද?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "කාඞ්පත් හිමි නම"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "මුරපද ඉතිහාසය"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/sk/messages.json b/apps/browser/src/_locales/sk/messages.json
index 6f1f578b14f..cfc1404e9bf 100644
--- a/apps/browser/src/_locales/sk/messages.json
+++ b/apps/browser/src/_locales/sk/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Resetovať vyhľadávanie"
   },
+  "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"
+  },
+  "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": {
+    "message": "Položka bola archivovaná"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Položka bola odobraná z archívu"
+  },
+  "archiveItem": {
+    "message": "Archivovať položku"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Upraviť"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Vyberte metódu dvojstupňového prihlásenia"
   },
-  "recoveryCodeDesc": {
-    "message": "Stratili ste prístup ku všetkým vašim dvojstupňovým poskytovateľom? Použite váš záchranný kód pre vypnutie všetkých poskytovateľov vo vašom účte."
-  },
   "recoveryCodeTitle": {
     "message": "Záchranný kód"
   },
@@ -1686,9 +1724,6 @@
   "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."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Automatické vypĺňanie pri načítaní stránky (ak je povolené v možnostiach)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Pôvodné nastavenia"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Kliknutie mimo popup okna na prezretie vášho emailu pre overovací kód spôsobí zavretie tohto popupu. Chcete otvoriť tento popup v novom okne tak, aby sa nezavrel?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Tento prehliadač nedokáže spracovať U2F požiadavku v popup okne. Chcete ho otvoriť v novom okne aby ste sa mohli prihlásiť pomocou U2F?"
-  },
-  "enableFavicon": {
-    "message": "Zobraziť favikony stránok"
-  },
-  "faviconDesc": {
-    "message": "Pri každom prihlásení zobrazí rozpoznateľný obrázok."
-  },
-  "faviconDescAlt": {
-    "message": "Vedľa každého účtu zobraziť rozpoznateľný obrázok. Použije sa na všetky prihlásené účty."
-  },
-  "enableBadgeCounter": {
-    "message": "Zobraziť počítadlo na ikone"
-  },
-  "badgeCounterDesc": {
-    "message": "Ukazuje, koľko prihlásení máte pre aktuálnu webovú stránku."
+  "showIconsChangePasswordUrls": {
+    "message": "Zobraziť ikony webových stránok a načítať adresy URL na zmenu hesla"
   },
   "cardholderName": {
     "message": "Meno vlastníka karty"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Poznámka"
   },
-  "newItemHeader": {
-    "message": "Nové $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nové prihlásenie",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Upraviť $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nová karta",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Zobraziť $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nová identita",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nová poznámka",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nový kľúč SSH",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Nový textový Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Nový súborový Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Upraviť prihlásenie",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Upraviť kartu",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Upraviť identitu",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Upraviť poznámku",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Upraviť kľúč SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Upraviť textový Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Upraviť súborový Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Zobraziť prihlásenie",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Zobraziť kartu",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Zobraziť identitu",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Zobraziť poznámku",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Zobraziť kľúč SSH",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "História hesla"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Chyba"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "V pravidlách vašej organizácie je zapnuté automatické vypĺňanie pri načítaní stránky."
   },
-  "howToAutofill": {
-    "message": "Ako používať automatické vypĺňanie"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Vyberte položku z ponuky, použite klávesovú skratku $COMMAND$, alebo preskúmajte ďalšie možnosti nastavenia.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias doména"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Položky, ktoré vyžadujú opätovné zadanie hlavného hesla sa nedajú automaticky vyplniť pri načítaní stránky. Automatické vypĺňanie pri načítaní stránky je vypnuté.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "Automatické vypĺňanie pri načítaní stránky nastavené na pôvodnú predvoľbu.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Vypnite výzvu na opätovné zadanie hlavného hesla na úpravu tohto poľa",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Prepnúť bočnú navigáciu"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Prístupový kľúč sa do klonovanej položky neskopíruje. Chcete pokračovať v klonovaní tejto položky?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Overenie požadované iniciujúcim webom. Táto funkcia zatiaľ nie je implementovaná pre účty bez hlavného hesla."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Prihlásiť sa s prístupovým kľúčom?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Povoliť animácie"
-  },
   "showAnimations": {
     "message": "Zobraziť animácie"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Umiestnenie položky"
   },
-  "fileSend": {
-    "message": "Send so súborom"
-  },
   "fileSends": {
     "message": "Sendy so súborom"
   },
-  "textSend": {
-    "message": "Textový Send"
-  },
   "textSends": {
     "message": "Textové Sendy"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimálny vlastný časový limit je 1 minúta."
   },
-  "additionalContentAvailable": {
-    "message": "K dispozícii je ďalší obsah"
-  },
   "fileSavedToDevice": {
     "message": "Súbor sa uložil do zariadenia. Spravujte stiahnuté súbory zo zariadenia."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Vitajte vo svojom trezore!"
   },
+  "phishingPageTitle": {
+    "message": "Phishingová webová stránka"
+  },
+  "phishingPageCloseTab": {
+    "message": "Zavrieť kartu"
+  },
+  "phishingPageContinue": {
+    "message": "Pokračovať"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Prečo to vidíte?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Položky na automatické vypĺňanie pre aktuálnu stránku"
   },
@@ -5584,6 +5657,12 @@
     "message": "Jednoducho vytvorte silné a jedinečné heslá kliknutím na tlačidlo Generovať heslo, aby ste zabezpečili prihlasovacie údaje.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "O tomto nastavení"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden použije uložené prihlasovacie URI na určenie ikony alebo adresy URL na zmenu hesla, ktoré by sa mali použiť na zlepšenie vášho zážitku. Pri používaní tejto služby sa nezbierajú ani neukladajú žiadne informácie."
+  },
   "noPermissionsViewPage": {
     "message": "Nemáte oprávnenie na zobrazenie tejto stránky. Skúste sa prihlásiť pomocou iného účtu."
   },
diff --git a/apps/browser/src/_locales/sl/messages.json b/apps/browser/src/_locales/sl/messages.json
index 1f2295f2c59..23327bbb1ae 100644
--- a/apps/browser/src/_locales/sl/messages.json
+++ b/apps/browser/src/_locales/sl/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Uredi"
   },
@@ -701,6 +733,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:"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Ste izgubili dostop do vseh ponudnikov dvostopenjske prijave? Uporabite svojo kodo za obnovitev in tako onemogočite dvostopenjsko prijavo v svoj račun."
-  },
   "recoveryCodeTitle": {
     "message": "Koda za obnovitev"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Samodejno izpolnjevanje ob naložitvi strani lahko izklopite za posamčne prijave, ko jih urejate."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Samodejno izpolni ob naložitvi strani (če je omogočeno v Možnostih)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Uporabi privzete nastavitve"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Če kliknete izven tega pojavnega okna, da bi preverili pošto, se to pojavno okno zaprlo. Želite odpreti to pojavno okno v novem oknu, da se ne bo zaprlo?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Ta spletni brskalnik ne more obdelati U2F zahteve v tem pojavnem oknu. Želite odpreti to pojavno okno v novem oknu, tako, da se lahko prijavite z U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Ime imetnika kartice"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Zgodovina gesel"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Napaka"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "V pravilih vaše organizacije je vklopljeno samodejno izpolnjevanje."
   },
-  "howToAutofill": {
-    "message": "Kako uporabljati samodejno izpolnjevanje"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/sr/messages.json b/apps/browser/src/_locales/sr/messages.json
index e48e10ce1b6..a915463799a 100644
--- a/apps/browser/src/_locales/sr/messages.json
+++ b/apps/browser/src/_locales/sr/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Ресетовати претрагу"
   },
+  "archiveNoun": {
+    "message": "Архива",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архива",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Врати из архиве"
+  },
+  "itemsInArchive": {
+    "message": "Ставке у архиви"
+  },
+  "noItemsInArchive": {
+    "message": "Нема ставка у архиви"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Архивиране ставке ће се овде појавити и бити искључени из општих резултата претраге и сугестија о ауто-пуњењу."
+  },
+  "itemSentToArchive": {
+    "message": "Ставка је послата у архиву"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Ставка је уклоњена из архиве"
+  },
+  "archiveItem": {
+    "message": "Архивирај ставку"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Архивиране ставке су искључене из општих резултата претраге и предлога за ауто попуњавање. Јесте ли сигурни да желите да архивирате ову ставку?"
+  },
   "edit": {
     "message": "Уреди"
   },
@@ -701,6 +733,15 @@
   "invalidMasterPassword": {
     "message": "Погрешна главна лозинка"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неважећа главна лозинка. Потврдите да је ваш имејл тачан и ваш рачун је креиран на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Тајмаут сефа"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Одабрати методу пријављивања у два корака"
   },
-  "recoveryCodeDesc": {
-    "message": "Изгубили сте приступ свим својим двофакторским добављачима? Употребите код за опоравак да онемогућите све двофакторске добављаче из налога."
-  },
   "recoveryCodeTitle": {
     "message": "Шифра за опоравак"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Након што омогућите ауто-попуњавање странице, можете омогућити или онемогућити функцију за појединачне ставке за пријаву. Ово је подразумевана поставка за ставке за пријаву које нису различито конфигурисане."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Ауто-попуњавање након учитавања странице (ако је омогућено у опцијама)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Користи подразумевано подешавање"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Ако кликнете изван искачућег прозора да бисте проверили имејл за верификациони код, овај прозор ће се затворити. Да ли желите да отворите овај прозор у новом прозору да се не би затворио?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Овај прегледач не може да обрађује U2F захтеве у овом искачућем прозору. Да ли желите да отворите овај искачући прозор у новом прозору како бисте могли да се пријавите користећи U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Прикажи бедж са бројачем"
-  },
-  "badgeCounterDesc": {
-    "message": "Означи број пријава које се могу користити на тренутној Web страници."
+  "showIconsChangePasswordUrls": {
+    "message": "Прикажи иконе веб локација и преузмите линкове промене лозинке"
   },
   "cardholderName": {
     "message": "Име Власника Картице"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Белешка"
   },
-  "newItemHeader": {
-    "message": "Нови $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Ново пријављивање",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Уреди $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Нова картица",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Видети $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Нови идентитет",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Нова белешка",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Нов SSH кљич",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Нови текст Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Нова датотека Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Уреди пријаву",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Уреди картицу",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Уреди идентитет",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Уреди белешку",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Уреди SSH кључ",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Уреди текст Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Уреди датотеку Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Преглед пријаве",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Преглед картице",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Преглед идентитета",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Преглед белешке",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Преглед SSH кључа",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Историја Лозинке"
@@ -3138,6 +3207,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Извешће се само сеф организације повезана са $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Извешће се само сеф организације повезан са $ORGANIZATION$. Колекције мојих предмета неће бити укључене.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Грешка"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Смернице ваше организације су укључиле ауто-пуњење при учитавању странице."
   },
-  "howToAutofill": {
-    "message": "Како ауто-попуњавати"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Изаберите ставку са овог екрана, користите пречицу $COMMAND$, или истражите друге опције у подешавањима.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Домен алијаса"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Ставке са упитом за поновно постављање главне лозинке не могу се ауто-попунити при учитавању странице. Ауто-попуњавање при учитавању странице је искључено.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "Ауто-попуњавање при учитавању странице је подешено да користи подразумевано подешавање.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Искључите поновни упит главне лозинке да бисте уредили ово поље",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Укључите бочну навигацију"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Приступни кључ неће бити копиран на клонирану ставку. Да ли желите да наставите са клонирањем ставке?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Верификацију захтева сајт који покреће. Ова функција још увек није имплементирана за налоге без главне лозинке."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Пријавите се са приступним кључем?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Омогући анимације"
-  },
   "showAnimations": {
     "message": "Прикажи анимације"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Смештај ставке"
   },
-  "fileSend": {
-    "message": "Датотека „Send“"
-  },
   "fileSends": {
     "message": "Датотека „Send“"
   },
-  "textSend": {
-    "message": "Текст „Send“"
-  },
   "textSends": {
     "message": "Текст „Send“"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Минимално прилагођено временско ограничење је 1 минут."
   },
-  "additionalContentAvailable": {
-    "message": "Додатни садржај је доступан"
-  },
   "fileSavedToDevice": {
     "message": "Датотека је сачувана на уређају. Управљајте преузимањима са свог уређаја."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Добродошли у ваш сеф!"
   },
+  "phishingPageTitle": {
+    "message": "Пронађен злонамеран сајт"
+  },
+  "phishingPageCloseTab": {
+    "message": "Затвори језичак"
+  },
+  "phishingPageContinue": {
+    "message": "Настави"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Зашто видите ово?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Ауто-пуњење предмета за тренутну страницу"
   },
@@ -5584,6 +5657,12 @@
     "message": "Лако креирајте снажне и јединствене лозинке кликом на дугме „Генерирате лозинку“ да вам помогне да чувате своје пријаве на сигурно.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "О овом подешавању"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden ће користити сачуване URI-јеве за пријаву да би одредио коју икону или URL за промену лозинке треба користити како би побољшао ваше искуство. Никакви подаци нису сакупљени нити сачувани приликом коришћења ове услуге."
+  },
   "noPermissionsViewPage": {
     "message": "Немате дозволе за преглед ове странице. Покушајте да се пријавите са другим налогом."
   },
diff --git a/apps/browser/src/_locales/sv/messages.json b/apps/browser/src/_locales/sv/messages.json
index 1fb9498f2df..fb83fdf22b6 100644
--- a/apps/browser/src/_locales/sv/messages.json
+++ b/apps/browser/src/_locales/sv/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Nollställ sökning"
   },
+  "archiveNoun": {
+    "message": "Arkiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arkivera",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Packa upp"
+  },
+  "itemsInArchive": {
+    "message": "Objekt i arkiv"
+  },
+  "noItemsInArchive": {
+    "message": "Inga objekt i arkivet"
+  },
+  "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"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Objekt borttaget från arkiv"
+  },
+  "archiveItem": {
+    "message": "Arkivera objekt"
+  },
+  "archiveItemConfirmDesc": {
+    "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?"
+  },
   "edit": {
     "message": "Redigera"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Välj metod för tvåstegsverifiering"
   },
-  "recoveryCodeDesc": {
-    "message": "Förlorat åtkomst till alla dina metoder för tvåstegsverifiering? Använd din återställningskod för att inaktivera tvåstegsverifiering på ditt konto."
-  },
   "recoveryCodeTitle": {
     "message": "Återställningskod"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Efter att du har aktiverat automatisk ifyllnad vid sidhämtning kan du aktivera eller inaktivera funktionen för enskilda inloggningsobjekt. Detta är standardinställningen för inloggningsobjekt som inte är konfigurerade separat."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Automatisk ifyllning vid sidhämtning (om aktiverat i Alternativ)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Använd standardinställningen"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Om du klickar utanför popup-fönstret för att kontrollera din email efter din verifieringskod så stängs popup-fönstret. Vill du öppna popup-fönstret i ett nytt fönster, så att det inte stängs?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Den här webbläsaren kan inte bearbeta U2F-förfrågningar i detta popup-fönster. Vill du öppna ett nytt fönster så att du kan logga in med U2F?"
-  },
-  "enableFavicon": {
-    "message": "Visa webbplatsikoner"
-  },
-  "faviconDesc": {
-    "message": "Visa en igenkännbar bild bredvid varje inloggning."
-  },
-  "faviconDescAlt": {
-    "message": "Visa en igenkännbar bild bredvid varje inloggning. Gäller för alla inloggade konton."
-  },
-  "enableBadgeCounter": {
-    "message": "Visa aktivitetsräknaren"
-  },
-  "badgeCounterDesc": {
-    "message": "Visa hur många inloggningar du har för den aktuella webbsidan."
+  "showIconsChangePasswordUrls": {
+    "message": "Visa webbplatsikoner och URLer för lösenordsändringar"
   },
   "cardholderName": {
     "message": "Kortinnehavarens namn"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Anteckning"
   },
-  "newItemHeader": {
-    "message": "Ny $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Ny inloggning",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Redigera $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nytt kort",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Visa $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Ny identitet",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Ny anteckning",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Ny SSH-nyckel",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Ny textsändning",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Ny filsändning",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Redigera inloggning",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Redigera kort",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Redigera identitet",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Redigera anteckning",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Redigera SSH-nyckel",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Redigera textsändning",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Redigera filsändning",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Visa inloggning",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Visa kort",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Visa identitet",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Visa anteckning",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Visa SSH-nyckel",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Lösenordshistorik"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Fel"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Dina organisationspolicyer har aktiverat automatisk ifyllnad vid sidladdning."
   },
-  "howToAutofill": {
-    "message": "Hur du fyller i automatiskt"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Välj ett objekt från den här skärmen, använd genvägen $COMMAND$ eller utforska andra alternativ i inställningarna.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Aliasdomän"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Objekt med \"Återupprepa huvudlösenord\" kan inte fyllas i automatiskt vid sidladdning. Automatisk ifyllning vid sidladdning avstängd.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Stäng av \"återupprepa huvudlösenord\" för att redigera detta fält",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Växla sidonavigering"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Inloggningsnyckeln kommer inte att kopieras till det klonade objektet. Vill du fortsätta klona det här objektet?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verifiering krävs av den initierande webbplatsen. Denna funktion är ännu inte implementerad för konton utan huvudlösenord."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Logga in med nyckel?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Aktivera animationer"
-  },
   "showAnimations": {
     "message": "Visa animationer"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Föremålets placering"
   },
-  "fileSend": {
-    "message": "Skicka fil"
-  },
   "fileSends": {
     "message": "Skicka filer"
   },
-  "textSend": {
-    "message": "Skicka text"
-  },
   "textSends": {
     "message": "Text skickas"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minsta anpassade timeout är 1 minut."
   },
-  "additionalContentAvailable": {
-    "message": "Ytterligare innehåll är tillgängligt"
-  },
   "fileSavedToDevice": {
     "message": "Fil sparad till enhet. Hantera nedladdningar från din enhet."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Välkommen till ditt valv!"
   },
+  "phishingPageTitle": {
+    "message": "Webbsida för nätfiske"
+  },
+  "phishingPageCloseTab": {
+    "message": "Stäng flik"
+  },
+  "phishingPageContinue": {
+    "message": "Fortsätt"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Varför ser du detta?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofyll objekt för den aktuella sidan"
   },
@@ -5584,6 +5657,12 @@
     "message": "Skapa enkelt starka och unika lösenord genom att klicka på knappen Generera lösenord så att du kan hålla dina inloggningar säkra.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Om denna inställning"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden använder sparade inloggnings-URI: er för att identifiera vilken ikon eller URL för lösenordsändring som ska användas för att förbättra din upplevelse. Ingen information samlas in eller sparas när du använder denna tjänst."
+  },
   "noPermissionsViewPage": {
     "message": "Du har inte behörighet att visa den här sidan. Försök att logga in med ett annat konto."
   },
diff --git a/apps/browser/src/_locales/ta/messages.json b/apps/browser/src/_locales/ta/messages.json
index 1c6d7bc4528..8d1f1ccf87f 100644
--- a/apps/browser/src/_locales/ta/messages.json
+++ b/apps/browser/src/_locales/ta/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "தேடலை மீட்டமை"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "திருத்து"
   },
@@ -701,6 +733,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": "வால்ட் காலக்கெடு"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "டூ-ஸ்டெப் உள்நுழைவு முறையைத் தேர்ந்தெடுக்கவும்"
   },
-  "recoveryCodeDesc": {
-    "message": "உங்கள் டூ-ஃபாக்டர் வழங்குநர்கள் அனைவருக்கும் அணுகலை இழந்தீர்களா? உங்கள் கணக்கிலிருந்து அனைத்து டூ-ஃபாக்டர் வழங்குநர்களையும் முடக்க உங்கள் மீட்புக் குறியீட்டைப் பயன்படுத்தவும்."
-  },
   "recoveryCodeTitle": {
     "message": "மீட்புக் குறியீடு"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "உள்நுழைவு பொருட்களுக்கான டிஃபால்ட் ஆட்டோஃபில் அமைப்பை ஐட்டம்-இன் எடிட் வியூவிலிருந்து பக்க லோட்-இல் முடக்கலாம்."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "பக்கம் லோட் ஆகும்போது ஆட்டோஃபில் (விருப்பங்களில் அமைக்கப்பட்டிருந்தால்)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "டிஃபால்ட் அமைப்பைப் பயன்படுத்து"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "உங்கள் சரிபார்ப்புக் குறியீட்டிற்கான உங்கள் மின்னஞ்சலைச் சரிபார்க்க, பாப்அப் சாளரத்திற்கு வெளியே கிளிக் செய்வதால், இந்த பாப்அப் மூடப்படும். இந்த பாப்அப் மூடாமல் இருக்க, புதிய சாளரத்தில் திறக்க விரும்புகிறீர்களா?"
   },
-  "popupU2fCloseMessage": {
-    "message": "இந்த உலாவி இந்தப் பாப்அப் சாளரத்தில் U2F கோரிக்கைகளை செயலாக்க முடியாது. U2F ஐப் பயன்படுத்தி உள்நுழைய, இந்த பாப்அப்பை புதிய சாளரத்தில் திறக்க விரும்புகிறீர்களா?"
-  },
-  "enableFavicon": {
-    "message": "வலைத்தள ஐகான்களைக் காட்டு"
-  },
-  "faviconDesc": {
-    "message": "ஒவ்வொரு உள்நுழைவுக்கும் அருகில் அடையாளம் காணக்கூடிய படத்தைக் காட்டு."
-  },
-  "faviconDescAlt": {
-    "message": "ஒவ்வொரு உள்நுழைவுக்கும் அருகில் அடையாளம் காணக்கூடிய படத்தைக் காட்டு. உள்நுழைந்துள்ள அனைத்து கணக்குகளுக்கும் பொருந்தும்."
-  },
-  "enableBadgeCounter": {
-    "message": "பேட்ஜ் கவுண்டரைக் காட்டு"
-  },
-  "badgeCounterDesc": {
-    "message": "தற்போதைய இணையப் பக்கத்தில் உங்களிடம் உள்ள உள்நுழைவுகளின் எண்ணிக்கையைக் குறிக்கவும்."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "அட்டைதாரர் பெயர்"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "குறிப்பு"
   },
-  "newItemHeader": {
-    "message": "புதிய $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "திருத்து $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "பார்வை $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "கடவுச்சொல் வரலாறு"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "பிழை"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "பக்கம் ஏற்றப்படும்போது தானியங்கு நிரப்புதலை உங்கள் நிறுவனக் கொள்கைகள் செயல்படுத்தியுள்ளன."
   },
-  "howToAutofill": {
-    "message": "தானியங்கு நிரப்புவது எப்படி"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "இந்தத் திரையில் இருந்து ஒரு உருப்படியைத் தேர்ந்தெடுக்கவும், $COMMAND$ என்ற குறுக்குவழியைப் பயன்படுத்தவும் அல்லது அமைப்புகளில் பிற விருப்பங்களை ஆராயவும்.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "புனைப்பெயர் டொமைன்"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "மாஸ்டர் கடவுச்சொல் மீண்டும் கோரப்பட்ட உருப்படிகளைப் பக்க ஏற்றத்தில் தானாக நிரப்ப முடியாது. பக்க ஏற்றத்தில் தானியங்கு நிரப்புதல் அணைக்கப்பட்டது.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "பக்க ஏற்றத்தில் தானியங்கு நிரப்புதல் இயல்புநிலை அமைப்பைப் பயன்படுத்த அமைக்கப்பட்டுள்ளது.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "இந்தப் புலத்தைத் திருத்த மாஸ்டர் கடவுச்சொல் மீண்டும் கோருதலை அணைக்கவும்",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "பக்க வழிசெலுத்தலை மாற்று"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "பாஸ்கி குளோன் செய்யப்பட்ட உருப்படிக்கு நகலெடுக்கப்படாது. இந்த உருப்படியைக் குளோன் செய்வதைத் தொடர விரும்புகிறீர்களா?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "தொடங்கும் தளம் சரிபார்க்கக் கோருகிறது. மாஸ்டர் கடவுச்சொல் இல்லாத கணக்குகளுக்கு இந்த அம்சம் இன்னும் செயல்படுத்தப்படவில்லை."
-  },
   "logInWithPasskeyQuestion": {
     "message": "பாஸ்கியுடன் உள்நுழைய வேண்டுமா?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "அசைவூட்டங்களை இயக்கு"
-  },
   "showAnimations": {
     "message": "அசைவூட்டங்களைக் காட்டு"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "பொருளின் இருப்பிடம்"
   },
-  "fileSend": {
-    "message": "கோப்பு அனுப்பு"
-  },
   "fileSends": {
     "message": "கோப்பு அனுப்புகள்"
   },
-  "textSend": {
-    "message": "உரை அனுப்பு"
-  },
   "textSends": {
     "message": "உரை அனுப்புகள்"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "குறைந்தபட்ச தனிப்பயன் காலக்கெடு 1 நிமிடம் ஆகும்."
   },
-  "additionalContentAvailable": {
-    "message": "கூடுதல் உள்ளடக்கம் உள்ளது"
-  },
   "fileSavedToDevice": {
     "message": "கோப்பு சாதனத்தில் சேமிக்கப்பட்டது. உங்கள் சாதன பதிவிறக்கங்களிலிருந்து நிர்வகிக்கவும்."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "உங்கள் சேமிப்பு பெட்டகத்திற்கு நல்வரவு!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "தற்போதைய பக்கத்திற்கான தானாக நிரப்பு பொருள்கள்"
   },
@@ -5584,6 +5657,12 @@
     "message": "உங்கள் உள்நுழைவுகளைப் பாதுகாப்பாக வைத்திருக்க கடவுச்சொல்லை உருவாக்கு பொத்தானை கிளிக் செய்வதன் மூலம் வலுவான மற்றும் தனித்துவமான கடவுச்சொற்களை எளிதாக உருவாக்கலாம்.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "இந்த பக்கத்தைக் காண உங்களுக்கு அனுமதிகள் இல்லை. வேறு கணக்குடன் உள்நுழைய முயற்சிக்கவும்."
   },
diff --git a/apps/browser/src/_locales/te/messages.json b/apps/browser/src/_locales/te/messages.json
index be0400906cc..dcd86eb4337 100644
--- a/apps/browser/src/_locales/te/messages.json
+++ b/apps/browser/src/_locales/te/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "Edit"
   },
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Password history"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/th/messages.json b/apps/browser/src/_locales/th/messages.json
index d2351c8d943..064b70c26ec 100644
--- a/apps/browser/src/_locales/th/messages.json
+++ b/apps/browser/src/_locales/th/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Reset search"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "แก้ไข"
   },
@@ -701,6 +733,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": "ระยะเวลาล็อกตู้เซฟ"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery Code"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "You can turn off autofill on page load for individual login items from the item's Edit view."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Autofill on page load (if set up in Options)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Use default setting"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Clicking outside the popup window to check your email for your verification code will cause this popup to close. Do you want to open this popup in a new window so that it does not close?"
   },
-  "popupU2fCloseMessage": {
-    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Show badge counter"
-  },
-  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "Cardholder Name"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "View $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "ประวัติของรหัสผ่าน"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Your organization policies have turned on autofill on page load."
   },
-  "howToAutofill": {
-    "message": "How to autofill"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias domain"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Verification required by the initiating site. This feature is not yet implemented for accounts without master password."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Log in with passkey?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Enable animations"
-  },
   "showAnimations": {
     "message": "Show animations"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Item Location"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum custom timeout is 1 minute."
   },
-  "additionalContentAvailable": {
-    "message": "Additional content is available"
-  },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
diff --git a/apps/browser/src/_locales/tr/messages.json b/apps/browser/src/_locales/tr/messages.json
index f8fd3f08945..470589c286d 100644
--- a/apps/browser/src/_locales/tr/messages.json
+++ b/apps/browser/src/_locales/tr/messages.json
@@ -362,7 +362,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,6 +550,38 @@
   "resetSearch": {
     "message": "Aramayı sıfırla"
   },
+  "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"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Arşivlenmiş kayıtlar burada görünecek ve genel arama sonuçlarından ile otomatik doldurma önerilerinden hariç tutulacaktır."
+  },
+  "itemSentToArchive": {
+    "message": "Kayıt arşive gönderildi"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Kayıt arşivden çıkarıldı"
+  },
+  "archiveItem": {
+    "message": "Kaydı arşivle"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Arşivlenmiş kayıtlar genel arama sonuçları ve otomatik doldurma önerilerinden hariç tutulur. Bu kaydı arşivlemek istediğine emin misin?"
+  },
   "edit": {
     "message": "Düzenle"
   },
@@ -701,6 +733,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ı"
   },
@@ -848,13 +889,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"
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "İki aşamalı giriş yöntemini seçin"
   },
-  "recoveryCodeDesc": {
-    "message": "İki aşamalı doğrulama sağlayıcılarınıza ulaşamıyor musunuz? Kurtarma kodunuzu kullanarak hesabınızdaki tüm iki aşamalı giriş sağlayıcılarını devre dışı bırakabilirsiniz."
-  },
   "recoveryCodeTitle": {
     "message": "Kurtarma kodu"
   },
@@ -1568,7 +1606,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."
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "\"Sayfa yüklenince otomatik doldur\"u her hesabın \"Düzenle\" görünümünden ayrı ayrı kapatabilirsiniz."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Sayfa yüklenince otomatik doldur (Seçeneklerde ayarlanmışsa)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Varsayılan ayarı kullan"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Doğrulama kodunuzu alacağınız e-postayı kontrol etmek için bu pencerenin dışında bir yere tıklarsanız bu pencere kapanacaktır. Bu pencerenin kapanmaması için yeni bir pencerede açmak ister misiniz?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Bu tarayıcı bu açılır pencerede U2F isteklerini işleyemiyor. U2F kullanarak giriş yapmak için bu açılır pencereyi yeni bir pencerede açmak ister misiniz?"
-  },
-  "enableFavicon": {
-    "message": "Web sitesi simgelerini göster"
-  },
-  "faviconDesc": {
-    "message": "Hesapların yanında tanıdık görseller göster."
-  },
-  "faviconDescAlt": {
-    "message": "Her hesabın yanında tanınabilir bir resim göster. Oturum açmış tüm hesaplar için geçerlidir."
-  },
-  "enableBadgeCounter": {
-    "message": "Rozet sayacını göster"
-  },
-  "badgeCounterDesc": {
-    "message": "Geçerli web sayfasına ait kaç tane hesabınız olduğunu gösterir."
+  "showIconsChangePasswordUrls": {
+    "message": "Web sitesi simgelerini göster ve parola değiştirme URL'lerini al"
   },
   "cardholderName": {
     "message": "Kart sahibinin adı"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Not"
   },
-  "newItemHeader": {
-    "message": "Yeni $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Yeni hesap",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ düzenle",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Yeni kart",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "$TYPE$ bilgileri",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Yeni kimlik",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Yeni not",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Yeni SSH anahtarı",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Yeni Send metni",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Yeni Send dosyası",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Hesabı düzenle",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Kartı düzenle",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Kimliği düzenle",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Notu düzenle",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "SSH anahtarını düzenle",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Send metnini düzenle",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Send dosyasını düzenle",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Hesabı göster",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Kartı göster",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Kimliği göster",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Notu göster",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "SSH anahtarını göster",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Parola geçmişi"
@@ -2503,7 +2572,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."
@@ -2634,14 +2703,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": {
@@ -3138,6 +3207,24 @@
       }
     }
   },
+  "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"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Kuruluş ilkeleriniz, sayfa yüklenince otomatik doldurmayı etkinleştirdi."
   },
-  "howToAutofill": {
-    "message": "Otomatik doldurma nasıl yapılır?"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Bu ekrandan bir öğe seçin, $COMMAND$ kısayolunu kullanın veya ayarlardaki diğer seçenekleri keşfedin.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Alias alan adı"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Ana parolayı yeniden isteyen kayıtlar sayfa yüklenince otomatik olarak doldurulamaz. Sayfa yüklenince otomatik doldurma kapatıldı.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Bu alanı düzenlemek için ana parolayı yeniden istemeyi kapatın",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Kenar menüsünü aç/kapat"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Geçiş anahtarı klonlanan öğeye kopyalanmayacaktır. Bu öğeyi klonlamaya devam etmek istiyor musunuz?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Site kimlik doğrulaması gerektiriyor. Bu özellik henüz ana parolası olmayan hesaplarda kullanılamaz."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Geçiş anahtarı ile giriş yapılsın mı?"
   },
@@ -4382,11 +4455,11 @@
     "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": "\"Düzenli ifadeler\" gelişmiş bir seçenektir ve kimlik bilgilerini açığa çıkarma riski taşır.",
     "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": "\"İle başla\" gelişmiş bir seçenektir ve kimlik bilgilerini açığa çıkarma riski taşır.",
     "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
   },
   "uriMatchWarningDialogLink": {
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Animasyonları etkinleştir"
-  },
   "showAnimations": {
     "message": "Animasyonları göster"
   },
@@ -4989,7 +5059,7 @@
     }
   },
   "reorderToggleButton": {
-    "message": "Reorder $LABEL$. Use arrow key to move item up or down.",
+    "message": "$LABEL$'i yeniden sıralayın. Kayıtı yukarı veya aşağı taşımak için ok tuşunu kullanın.",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4998,10 +5068,10 @@
     }
   },
   "reorderWebsiteUriButton": {
-    "message": "Reorder website URI. Use arrow key to move item up or down."
+    "message": "Web sitesi URI'sini yeniden sıralayın. Kayıtı yukarı veya aşağı taşımak için ok tuşunu kullanın."
   },
   "reorderFieldUp": {
-    "message": "$LABEL$ moved up, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ yukarı taşındı, konum: $LENGTH$'in $INDEX$'i",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -5079,7 +5149,7 @@
     }
   },
   "reorderFieldDown": {
-    "message": "$LABEL$ moved down, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ aşağı taşındı, konum: $LENGTH$'in $INDEX$'i",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Kayıt konumu"
   },
-  "fileSend": {
-    "message": "Dosya Send'i"
-  },
   "fileSends": {
     "message": "Dosya Send'leri"
   },
-  "textSend": {
-    "message": "Metin Send'i"
-  },
   "textSends": {
     "message": "Metin Send'leri"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Minimum özel zaman aşımı 1 dakikadır."
   },
-  "additionalContentAvailable": {
-    "message": "Ek içerikler mevcut"
-  },
   "fileSavedToDevice": {
     "message": "Dosya cihaza kaydedildi. Cihazınızın indirilenler klasöründen yönetebilirsiniz."
   },
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Kasanıza hoş geldiniz!"
   },
+  "phishingPageTitle": {
+    "message": "Dolandırıcılık web sitesi"
+  },
+  "phishingPageCloseTab": {
+    "message": "Sekmeyi kapat"
+  },
+  "phishingPageContinue": {
+    "message": "Devam et"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Bunu neden görüyorsunuz?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Geçerli sayfada kayıtları otomatik doldurun"
   },
@@ -5584,6 +5657,12 @@
     "message": "Güvenli oturumlar açmaya yardımcı olmak için Parola Oluştur düğmesine tıklayarak güçlü ve benzersiz parolalar oluşturun.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Bu ayar hakkında"
+  },
+  "permitCipherDetailsDescription": {
+    "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."
   },
@@ -5601,7 +5680,7 @@
     "message": "İleri"
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "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."
   },
   "confirmKeyConnectorDomain": {
diff --git a/apps/browser/src/_locales/uk/messages.json b/apps/browser/src/_locales/uk/messages.json
index 7da89bc0f6a..fb64a91330d 100644
--- a/apps/browser/src/_locales/uk/messages.json
+++ b/apps/browser/src/_locales/uk/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Скинути пошук"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Видобути"
+  },
+  "itemsInArchive": {
+    "message": "Записи в архіві"
+  },
+  "noItemsInArchive": {
+    "message": "Немає записів у архіві"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Архівовані записи з'являтимуться тут і будуть виключені з результатів звичайного пошуку та пропозицій автозаповнення."
+  },
+  "itemSentToArchive": {
+    "message": "Запис переміщено до архіву"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Запис вилучено з архіву"
+  },
+  "archiveItem": {
+    "message": "Архівувати запис"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Архівовані записи виключаються з результатів звичайного пошуку та пропозицій автозаповнення. Ви дійсно хочете архівувати цей запис?"
+  },
   "edit": {
     "message": "Змінити"
   },
@@ -557,7 +589,7 @@
     "message": "Переглянути"
   },
   "viewLogin": {
-    "message": "View login"
+    "message": "Переглянути запис"
   },
   "noItemsInList": {
     "message": "Немає записів."
@@ -701,6 +733,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": "Час очікування сховища"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Виберіть спосіб двоетапної перевірки"
   },
-  "recoveryCodeDesc": {
-    "message": "Втратили доступ до всіх провайдерів двоетапної перевірки? Скористайтеся кодом відновлення, щоб вимкнути двоетапну перевірку для свого облікового запису."
-  },
   "recoveryCodeTitle": {
     "message": "Код відновлення"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Ви можете вимкнути цю функцію для окремих записів входу в меню запису \"Змінити\"."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Автозаповнення на сторінці (якщо увімкнено в налаштуваннях)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Типове налаштування"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Натискання поза межами спливаючого вікна для перевірки коду підтвердження в пошті спричинить його закриття. Хочете відкрити його в новому вікні, щоб воно не закрилося?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Цей браузер не може обробити U2F запити в цьому виринаючому вікні. Хочете відкрити його у новому вікні, щоб ви змогли увійти з використанням U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Показувати лічильник"
-  },
-  "badgeCounterDesc": {
-    "message": "Показувати індикатор кількості записів для поточної вебсторінки."
+  "showIconsChangePasswordUrls": {
+    "message": "Показувати піктограми вебсайтів та отримувати адреси для зміни паролів"
   },
   "cardholderName": {
     "message": "Ім'я власника картки"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Нотатка"
   },
-  "newItemHeader": {
-    "message": "Новий $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Новий запис",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Редагувати $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Нова картка",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Переглянути $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Нове посвідчення",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Нова нотатка",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Новий ключ SSH",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Нове текстове відправлення",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Нове файлове відправлення",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Редагувати запис",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Редагувати картку",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Редагувати посвідчення",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Редагувати нотатку",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Редагувати ключ SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Редагувати текстове відправлення",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Редагувати файлове відправлення",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Перегляд запису",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Перегляд картки",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Перегляд посвідчення",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Перегляд нотатки",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Перегляд ключа SSH",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Історія паролів"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Помилка"
   },
@@ -3206,7 +3293,7 @@
     "message": "Адреса е-пошти Catch-all"
   },
   "catchallEmailDesc": {
-    "message": "Використовуйте свою скриньку вхідних Catch-All власного домену."
+    "message": "Використовуйте можливості Catch-All власного домену."
   },
   "random": {
     "message": "Випадково"
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Політикою вашої організації було увімкнено автозаповнення на сторінці."
   },
-  "howToAutofill": {
-    "message": "Як працює автозаповнення"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Виберіть об'єкт із цього екрану, скористайтеся комбінацією клавіш $COMMAND$, або дізнайтеся про інші можливості в налаштуваннях.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Псевдонім домену"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Записи з повторним запитом головного пароля не можна автоматично заповнювати під час завантаження сторінки. Автозаповнення на сторінці вимкнено.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "Автозаповнення на сторінці налаштовано з типовими параметрами.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Вимкніть повторний запит головного пароля, щоб редагувати це поле",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Перемкнути бічну навігацію"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Ключ доступу не буде скопійовано до клонованого запису. Хочете продовжити клонування цього запису?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Сайт ініціює обов'язкову верифікацію. Ця функція ще не реалізована для облікових записів без головного пароля."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Увійти з ключем доступу?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Увімкнути анімацію"
-  },
   "showAnimations": {
     "message": "Показати анімації"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Розташування запису"
   },
-  "fileSend": {
-    "message": "Відправлення файлу"
-  },
   "fileSends": {
     "message": "Відправлення файлів"
   },
-  "textSend": {
-    "message": "Відправлення тексту"
-  },
   "textSends": {
     "message": "Відправлення тексту"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Мінімальний власний час очікування – 1 хвилина."
   },
-  "additionalContentAvailable": {
-    "message": "Доступний додатковий вміст"
-  },
   "fileSavedToDevice": {
     "message": "Файл збережено на пристрої. Ви можете його знайти у теці завантажень."
   },
@@ -5456,10 +5517,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": "Параметри сховища"
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Вітаємо у вашому сховищі!"
   },
+  "phishingPageTitle": {
+    "message": "Шахрайський вебсайт"
+  },
+  "phishingPageCloseTab": {
+    "message": "Закрити вкладку"
+  },
+  "phishingPageContinue": {
+    "message": "Продовжити"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Чому ви це бачите?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Автозаповнення записів для поточної сторінки"
   },
@@ -5584,6 +5657,12 @@
     "message": "Легко створюйте надійні та унікальні паролі, натиснувши кнопку Генерувати пароль, щоб зберегти свої записи в безпеці.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Про ці налаштування"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden використовуватиме збережені URI-адреси записів для визначення піктограм вебсайтів або URL-адрес для зміни паролів, щоб вдосконалити вашу роботу. Під час використання цієї послуги ваша інформація не збирається і не зберігається."
+  },
   "noPermissionsViewPage": {
     "message": "У вас немає дозволу переглядати цю сторінку. Спробуйте ввійти з іншим обліковим записом."
   },
@@ -5605,6 +5684,6 @@
     "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"
   }
 }
diff --git a/apps/browser/src/_locales/vi/messages.json b/apps/browser/src/_locales/vi/messages.json
index e5121753adc..8b69fdc2512 100644
--- a/apps/browser/src/_locales/vi/messages.json
+++ b/apps/browser/src/_locales/vi/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "Đặt lại tìm kiếm"
   },
+  "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ữ"
+  },
+  "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ữ"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Mục đã được gỡ khỏi kho 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?"
+  },
   "edit": {
     "message": "Sửa"
   },
@@ -557,7 +589,7 @@
     "message": "Xem"
   },
   "viewLogin": {
-    "message": "View login"
+    "message": "Xem đăng nhập"
   },
   "noItemsInList": {
     "message": "Không có mục nào để liệt kê."
@@ -701,6 +733,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"
   },
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Chọn phương pháp đăng nhập hai bước"
   },
-  "recoveryCodeDesc": {
-    "message": "Bạn đã mất quyền truy cập vào tất cả các dịch vụ xác thực 2 lớp? Sử dụng mã khôi phục để tắt tất cả các phương pháp xác thực hai lớp trong tài khoản của bạn."
-  },
   "recoveryCodeTitle": {
     "message": "Mã khôi phục"
   },
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Bạn có thể tắt tự động điền khi tải trang cho mục đăng nhập riêng lẻ từ chế độ xem Chỉnh sửa mục."
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "Tự động điền khi tải trang (nếu được thiết lập trong Tùy chọn)"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "Sử dụng thiết lập mặc định"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "Nhấp bên ngoài popup để xem mã xác thực trong email của bạn sẽ làm cho popup này đóng lại. Bạn có muốn mở popup này trong một cửa sổ mới để nó không bị đóng?"
   },
-  "popupU2fCloseMessage": {
-    "message": "Trình duyệt này không thể xử lý các yêu cầu U2F trong cửa sổ popup này. Bạn có muốn mở popup này trong cửa sổ mới để bạn có thể đăng nhập thông qua U2F?"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "Hiển thị biểu tượng bộ đếm"
-  },
-  "badgeCounterDesc": {
-    "message": "Cho biết bạn có bao nhiêu thông tin đăng nhập cho trang web hiện tại."
+  "showIconsChangePasswordUrls": {
+    "message": "Hiển thị biểu tượng trang web và truy xuất các URL đổi mật khẩu"
   },
   "cardholderName": {
     "message": "Tên chủ thẻ"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Ghi chú"
   },
-  "newItemHeader": {
-    "message": "$TYPE$ mới",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Đăng nhập mới",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Chỉnh sửa $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Thẻ mới",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "Xem $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Danh tính mới",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Ghi chú mới",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Khóa SSH mới",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Send văn bản mới",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Send tập tin mới",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Chỉnh sửa đăng nhập",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Chỉnh sửa thẻ",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Chỉnh sửa danh tính",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Chỉnh sửa ghi chú",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Sửa khóa SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Sửa Send văn bản",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Sửa Send tập tin",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Xem đăng nhập",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Xem thẻ",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Xem danh tính",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Xem ghi chú",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Xem khóa SSH",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "Lịch sử mật khẩu"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "Lỗi"
   },
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "Chính sách của tổ chức bạn đã kích hoạt tính năng tự động điền khi tải trang."
   },
-  "howToAutofill": {
-    "message": "Cách tự đồng điền"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "Chọn một mục từ màn hình này, sử dụng phím tắt $COMMAND$, hoặc khám phá các tùy chọn khác trong cài đặt.",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "Tên miền thay thế"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Các mục yêu cầu nhập lại mật khẩu chính không thể được tự động điền khi tải trang. Tự động điền khi tải trang đã bị tắt.",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "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."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "Tắt yêu cầu nhập lại mật khẩu chính để chỉnh sửa trường này",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "Ẩn/hiện thanh điều hướng bên"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "Bản sao sẽ không bao gồm mã khoá. Bạn có muốn tiếp tục tạo bản sao cho mục này?"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "Trang web yêu cầu xác minh. Tính năng này hiện chưa được hỗ trợ cho tài khoản không có mật khẩu chính."
-  },
   "logInWithPasskeyQuestion": {
     "message": "Đăng nhập bằng mã khóa?"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "Bật hiệu ứng động"
-  },
   "showAnimations": {
     "message": "Hiện hiệu ứng động"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "Vị trí mục"
   },
-  "fileSend": {
-    "message": "Gửi tệp"
-  },
   "fileSends": {
     "message": "Gửi tệp"
   },
-  "textSend": {
-    "message": "Gửi văn bản"
-  },
   "textSends": {
     "message": "Gửi văn bản"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "Thời gian đóng kho tùy chỉnh tối thiểu là 1 phút."
   },
-  "additionalContentAvailable": {
-    "message": "Nội dung bổ sung có sẵn"
-  },
   "fileSavedToDevice": {
     "message": "Tệp đã được lưu vào thiết bị. Quản lý từ phần Tải về trên thiết bị của bạn."
   },
@@ -5456,10 +5517,10 @@
     "message": "Thay đổi mật khẩu có rủi ro"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Thông tin đăng nhập này có rủi ro và thiếu một trang web. Hãy thêm trang web và đổi mật khẩu để tăng cường bảo mật."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Thiếu trang web"
   },
   "settingsVaultOptions": {
     "message": "Tùy chọn kho"
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Chào mừng đến với kho lưu trữ của bạn!"
   },
+  "phishingPageTitle": {
+    "message": "Trang web lừa đảo"
+  },
+  "phishingPageCloseTab": {
+    "message": "Đóng tab"
+  },
+  "phishingPageContinue": {
+    "message": "Tiếp tục"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Tại sao bạn thấy điều này?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Tự động điền các mục cho trang hiện tại"
   },
@@ -5584,6 +5657,12 @@
     "message": "Dễ dàng tạo mật khẩu mạnh và duy nhất bằng cách nhấp vào Trình tạo mật khẩu để giúp bạn bảo vệ tài khoản đăng nhập của mình.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "Về cài đặt này"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden sẽ sử dụng URI đăng nhập đã lưu để xác định biểu tượng hoặc URL đổi mật khẩu nào cần dùng nhằm cải thiện trải nghiệm của bạn. Không có thông tin nào được thu thập hay lưu lại khi bạn sử dụng dịch vụ này."
+  },
   "noPermissionsViewPage": {
     "message": "Bạn không có quyền truy cập vào trang này. Hãy thử đăng nhập bằng tài khoản khác."
   },
diff --git a/apps/browser/src/_locales/zh_CN/messages.json b/apps/browser/src/_locales/zh_CN/messages.json
index 23d20abd4f9..9ced7b1efd7 100644
--- a/apps/browser/src/_locales/zh_CN/messages.json
+++ b/apps/browser/src/_locales/zh_CN/messages.json
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "重置搜索"
   },
+  "archiveNoun": {
+    "message": "归档",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "归档",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "取消归档"
+  },
+  "itemsInArchive": {
+    "message": "归档中的项目"
+  },
+  "noItemsInArchive": {
+    "message": "归档中没有项目"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "已归档的项目将显示在此处，并将被排除在一般搜索结果和自动填充建议之外。"
+  },
+  "itemSentToArchive": {
+    "message": "项目已归档"
+  },
+  "itemRemovedFromArchive": {
+    "message": "项目已取消归档"
+  },
+  "archiveItem": {
+    "message": "归档项目"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "已归档的项目将被排除在一般搜索结果和自动填充建议之外。确定要归档此项目吗？"
+  },
   "edit": {
     "message": "编辑"
   },
@@ -701,6 +733,15 @@
   "invalidMasterPassword": {
     "message": "无效的主密码"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "无效的主密码。请确认您的电子邮箱正确无误，以及您的账户是在 $HOST$ 上创建的。",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "密码库超时时间"
   },
@@ -814,7 +855,7 @@
     "message": "您可以关闭此窗口"
   },
   "masterPassSent": {
-    "message": "我们已经为您发送了包含主密码提示的电子邮件。"
+    "message": "我们已经向您发送了一封包含主密码提示的电子邮件。"
   },
   "verificationCodeRequired": {
     "message": "必须填写验证码。"
@@ -1107,7 +1148,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": {
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "选择两步登录方式"
   },
-  "recoveryCodeDesc": {
-    "message": "无法访问您所有的双重身份提供程序吗？请使用您的恢复代码来停用您账户中所有的双重身份提供程序。"
-  },
   "recoveryCodeTitle": {
     "message": "恢复代码"
   },
@@ -1615,10 +1653,10 @@
     "message": "轻松找到自动填充建议"
   },
   "autofillSpotlightDesc": {
-    "message": "关闭浏览器的自动填充设置，以免与 Bitwarden 产生冲突。"
+    "message": "停用您浏览器的自动填充设置，以免与 Bitwarden 产生冲突。"
   },
   "turnOffBrowserAutofill": {
-    "message": "关闭 $BROWSER$ 的自动填充",
+    "message": "停用 $BROWSER$ 自动填充",
     "placeholders": {
       "browser": {
         "content": "$1",
@@ -1627,7 +1665,7 @@
     }
   },
   "turnOffAutofill": {
-    "message": "关闭自动填充"
+    "message": "停用自动填充"
   },
   "showInlineMenuLabel": {
     "message": "在表单字段中显示自动填充建议"
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "您可以从项目编辑视图中为单个登录项目停用页面加载时自动填充。"
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "页面加载时自动填充（如果选项中已设置）"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "使用默认设置"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "如果您点击弹窗外的区域以检查您的验证码电子邮件，将导致弹窗关闭。您想在新窗口中打开此弹窗，以便它不会关闭吗？"
   },
-  "popupU2fCloseMessage": {
-    "message": "此浏览器无法处理此弹出窗口中的 U2F 请求。您想要在新窗口中打开此弹出窗口吗？"
-  },
-  "enableFavicon": {
-    "message": "显示网站图标"
-  },
-  "faviconDesc": {
-    "message": "在每个登录项目旁边显示一个可识别的图像。"
-  },
-  "faviconDescAlt": {
-    "message": "在每个登录的旁边显示一个可识别的图像。适用于所有已登录的账户。"
-  },
-  "enableBadgeCounter": {
-    "message": "显示角标计数器"
-  },
-  "badgeCounterDesc": {
-    "message": "指示可用于当前网页的登录项目的数量。"
+  "showIconsChangePasswordUrls": {
+    "message": "显示网站图标并获取更改密码的 URL"
   },
   "cardholderName": {
     "message": "持卡人姓名"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "笔记"
   },
-  "newItemHeader": {
-    "message": "新增 $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "新增登录",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "编辑 $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "新增支付卡",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "查看 $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "新增身份",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "新增笔记",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "新增 SSH 密钥",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "新增文本 Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "新增文件 Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "编辑登录",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "编辑支付卡",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "编辑身份",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "编辑笔记",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "编辑 SSH 密钥",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "编辑文本 Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "编辑文件 Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "查看登录",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "查看支付卡",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "查看身份",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "查看笔记",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "查看 SSH 密钥",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "密码历史记录"
@@ -3138,6 +3207,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "仅会导出与 $ORGANIZATION$ 关联的组织密码库。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "仅会导出与 $ORGANIZATION$ 关联的组织密码库，不包括我的项目集合。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "错误"
   },
@@ -3377,10 +3464,10 @@
     "message": "需要高级版订阅"
   },
   "organizationIsDisabled": {
-    "message": "组织已停用。"
+    "message": "组织已暂停。"
   },
   "disabledOrganizationFilterError": {
-    "message": "无法访问已停用组织中的项目。请联系您的组织所有者寻求帮助。"
+    "message": "无法访问已暂停组织中的项目。请联系您的组织所有者寻求帮助。"
   },
   "loggingInTo": {
     "message": "正在登录到 $DOMAIN$",
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "您的组织策略已启用页面加载时自动填充。"
   },
-  "howToAutofill": {
-    "message": "如何自动填充"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "从此界面选择一个项目，使用快捷键 $COMMAND$，或探索设置中的其他选项。",
     "placeholders": {
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "别名域"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "具有主密码重新提示的项目无法在页面加载时自动填充。页面加载时的自动填充功能已停用。",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "页面加载时自动填充设置为使用默认设置。",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "停用主密码重新提示以编辑此字段",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "切换侧边导航"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "通行密钥将不会被复制到克隆的项目。要继续克隆这个项目吗？"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "启动站点需要验证。对于没有主密码的账户，此功能尚未实现。"
-  },
   "logInWithPasskeyQuestion": {
     "message": "使用通行密钥登录吗？"
   },
@@ -4362,7 +4435,7 @@
     "message": "仅此一次"
   },
   "alwaysForThisSite": {
-    "message": "总是为此站点"
+    "message": "始终适用于此站点"
   },
   "domainAddedToExcludedDomains": {
     "message": "$DOMAIN$ 已添加到排除域名列表。",
@@ -4581,7 +4654,7 @@
     }
   },
   "copyFieldCipherName": {
-    "message": "复制 $CIPHERNAME$ 的 $FIELD$",
+    "message": "复制 $CIPHERNAME$ 中的 $FIELD$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "启用动画"
-  },
   "showAnimations": {
     "message": "显示动画"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "项目位置"
   },
-  "fileSend": {
-    "message": "文件 Send"
-  },
   "fileSends": {
     "message": "文件 Send"
   },
-  "textSend": {
-    "message": "文本 Send"
-  },
   "textSends": {
     "message": "文本 Send"
   },
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "自定义超时时间最小为 1 分钟。"
   },
-  "additionalContentAvailable": {
-    "message": "更多内容可用"
-  },
   "fileSavedToDevice": {
     "message": "文件已保存到设备。可以在设备下载中进行管理。"
   },
@@ -5456,7 +5517,7 @@
     "message": "更改有风险的密码"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "此登录存在风险且缺少网站。请添加一个网站并更改密码以增强安全性。"
+    "message": "此登录存在风险且缺少网站。请添加网站并更改密码以增强安全性。"
   },
   "missingWebsite": {
     "message": "缺少网站"
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "欢迎来到您的密码库！"
   },
+  "phishingPageTitle": {
+    "message": "钓鱼网站"
+  },
+  "phishingPageCloseTab": {
+    "message": "关闭标签页"
+  },
+  "phishingPageContinue": {
+    "message": "继续"
+  },
+  "phishingPageLearnWhy": {
+    "message": "为什么您会看到这个？"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "为当前页面自动填充项目"
   },
@@ -5584,6 +5657,12 @@
     "message": "点击「生成密码」按钮，轻松创建强大且唯一的密码，帮助您保持登录安全。",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "关于此设置"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden 将使用已保存的登录 URI 来识别应使用哪个图标或更改密码的 URL 来改善您的体验。当您使用此服务时，不会收集或保存任何信息。"
+  },
   "noPermissionsViewPage": {
     "message": "您没有查看此页面的权限。请尝试使用其他账户登录。"
   },
diff --git a/apps/browser/src/_locales/zh_TW/messages.json b/apps/browser/src/_locales/zh_TW/messages.json
index dddc938b071..5f6defcfe24 100644
--- a/apps/browser/src/_locales/zh_TW/messages.json
+++ b/apps/browser/src/_locales/zh_TW/messages.json
@@ -471,10 +471,10 @@
     "message": "Passphrase generated"
   },
   "usernameGenerated": {
-    "message": "Username generated"
+    "message": "已產生使用者名稱"
   },
   "emailGenerated": {
-    "message": "Email generated"
+    "message": "已產生電子郵件"
   },
   "regeneratePassword": {
     "message": "重新產生密碼"
@@ -550,6 +550,38 @@
   "resetSearch": {
     "message": "重設搜尋"
   },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
+  },
   "edit": {
     "message": "編輯"
   },
@@ -701,6 +733,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": "密碼庫逾時時間"
   },
@@ -1049,10 +1090,10 @@
     "message": "於分頁頁面顯示身分以便於自動填入。"
   },
   "clickToAutofillOnVault": {
-    "message": "在密碼庫檢視中點擊項目來自動填入"
+    "message": "在密碼庫檢視中點選項目來自動填入"
   },
   "clickToAutofill": {
-    "message": "Click items in autofill suggestion to fill"
+    "message": "點選自動填入建議中的項目進行填入"
   },
   "clearClipboard": {
     "message": "清除剪貼簿",
@@ -1525,9 +1566,6 @@
   "selectTwoStepLoginMethod": {
     "message": "選擇兩步驟登入方法"
   },
-  "recoveryCodeDesc": {
-    "message": "無法使用任何雙因素提供程式嗎？請使用您的復原碼以停用您帳戶的所有雙因素提供程式。"
-  },
   "recoveryCodeTitle": {
     "message": "復原代碼"
   },
@@ -1565,16 +1603,16 @@
     "message": "輸入寄送到您電子郵件信箱的驗證碼。"
   },
   "selfHostedEnvironment": {
-    "message": "自我裝載環境"
+    "message": "自行部署環境"
   },
   "selfHostedBaseUrlHint": {
-    "message": "指定您自建的 Bitwarden 伺服器的網域 URL。例如：https://bitwarden.company.com"
+    "message": "指定您自架的 Bitwarden 伺服器的網域 URL。例如：https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
     "message": "適用於進階設定。您可以單獨指定各個服務的網域 URL。"
   },
   "selfHostedEnvFormInvalid": {
-    "message": "您必須新增伺服器網域 URL 或至少一個自定義環境。"
+    "message": "您必須新增伺服器網域 URL 或至少一個自訂環境。"
   },
   "customEnvironment": {
     "message": "自訂環境"
@@ -1583,7 +1621,7 @@
     "message": "伺服器 URL"
   },
   "selfHostBaseUrl": {
-    "message": "自建伺服器 URL",
+    "message": "自架伺服器 URL",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
@@ -1686,9 +1724,6 @@
   "defaultAutoFillOnPageLoadDesc": {
     "message": "您可以從項目的編輯檢視中為單個登入項目關閉頁面載入時自動填入。"
   },
-  "itemAutoFillOnPageLoad": {
-    "message": "頁面載入時自動填入（如果已在選項中設定）"
-  },
   "autoFillOnPageLoadUseDefault": {
     "message": "使用預設設定"
   },
@@ -1760,23 +1795,8 @@
   "popup2faCloseMessage": {
     "message": "如果您點選彈出式視窗外的任意區域，將導致彈出式視窗關閉。您想在新視窗中開啟此彈出式視窗，以讓它不關閉嗎？"
   },
-  "popupU2fCloseMessage": {
-    "message": "此瀏覽器不能在彈出式視窗中處理 U2F 要求。是否在新視窗開啟此對話方塊，以便您能夠使用 U2F 登入？"
-  },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
-  },
-  "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
-  },
-  "enableBadgeCounter": {
-    "message": "顯示圖示計數器"
-  },
-  "badgeCounterDesc": {
-    "message": "顯示可用於目前網頁的登入資料數量。"
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "cardholderName": {
     "message": "持卡人姓名"
@@ -1940,32 +1960,81 @@
   "typeNote": {
     "message": "Note"
   },
-  "newItemHeader": {
-    "message": "新增 $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "編輯 $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemHeader": {
-    "message": "檢視 $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "Login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
     "message": "密碼歷史記錄"
@@ -3138,6 +3207,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"
+      }
+    }
+  },
   "error": {
     "message": "錯誤"
   },
@@ -3486,7 +3573,7 @@
     "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"
@@ -3527,9 +3614,6 @@
   "autofillPageLoadPolicyActivated": {
     "message": "您的組織政策已啟用頁面載入時的自動填入功能。"
   },
-  "howToAutofill": {
-    "message": "如何使用自動填入功能"
-  },
   "autofillSelectInfoWithCommand": {
     "message": "從本畫面選擇一個項目，然後使用 $COMMAND$ 快速鍵，或是瞭解設定當中的其他選項。",
     "placeholders": {
@@ -3588,7 +3672,7 @@
     "message": "記住此裝置來讓未來的登入體驗更簡易"
   },
   "manageDevices": {
-    "message": "Manage devices"
+    "message": "管理裝置"
   },
   "currentSession": {
     "message": "Current session"
@@ -3631,7 +3715,7 @@
     "message": "Needs approval"
   },
   "devices": {
-    "message": "Devices"
+    "message": "裝置"
   },
   "accessAttemptBy": {
     "message": "Access attempt by $EMAIL$",
@@ -3652,7 +3736,7 @@
     "message": "Time"
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "裝置類型"
   },
   "loginRequest": {
     "message": "Login request"
@@ -3914,18 +3998,10 @@
   "aliasDomain": {
     "message": "別名網域"
   },
-  "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "使用主密碼重新提示的項目無法在頁面載入時使用自動填入功能。已關閉頁面載入時的自動填入功能。",
-    "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
-  },
   "autofillOnPageLoadSetToDefault": {
     "message": "將頁面載入時使用自動填入功能設定為預設。",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
-  "turnOffMasterPasswordPromptToEditField": {
-    "message": "關閉主密碼重新提示以編輯此欄位",
-    "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
-  },
   "toggleSideNavigation": {
     "message": "切換側邊欄"
   },
@@ -4195,9 +4271,6 @@
   "passkeyNotCopiedAlert": {
     "message": "不會將密碼金鑰複製到拓製的項目中。您想繼續拓製該項目嗎？"
   },
-  "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "發起站點需要驗證。沒有主密碼的帳戶尚未開通此功能。"
-  },
   "logInWithPasskeyQuestion": {
     "message": "使用密碼金鑰登入？"
   },
@@ -4883,9 +4956,6 @@
       }
     }
   },
-  "enableAnimations": {
-    "message": "啟用動畫"
-  },
   "showAnimations": {
     "message": "顯示動畫"
   },
@@ -5098,15 +5168,9 @@
   "itemLocation": {
     "message": "項目位置"
   },
-  "fileSend": {
-    "message": "檔案 Send"
-  },
   "fileSends": {
     "message": "檔案 Send"
   },
-  "textSend": {
-    "message": "文字 Send"
-  },
   "textSends": {
     "message": "文字 Sends"
   },
@@ -5129,7 +5193,7 @@
     }
   },
   "showQuickCopyActions": {
-    "message": "在密碼庫中顯示快速複製"
+    "message": "在密碼庫中顯示快速複製圖示"
   },
   "systemDefault": {
     "message": "系統預設值"
@@ -5167,9 +5231,6 @@
   "vaultCustomTimeoutMinimum": {
     "message": "自訂逾時時間最小為 1 分鐘。"
   },
-  "additionalContentAvailable": {
-    "message": "以及更多內容"
-  },
   "fileSavedToDevice": {
     "message": "檔案已儲存至裝置。在您的裝置中管理下載的檔案。"
   },
@@ -5405,10 +5466,10 @@
     "message": "擴充套件寬度"
   },
   "wide": {
-    "message": "寬度"
+    "message": "寬"
   },
   "extraWide": {
-    "message": "更寬"
+    "message": "超寬"
   },
   "sshKeyWrongPassword": {
     "message": "The password you entered is incorrect."
@@ -5509,6 +5570,18 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
+  "phishingPageTitle": {
+    "message": "Phishing website"
+  },
+  "phishingPageCloseTab": {
+    "message": "Close tab"
+  },
+  "phishingPageContinue": {
+    "message": "Continue"
+  },
+  "phishingPageLearnWhy": {
+    "message": "Why are you seeing this?"
+  },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
   },
@@ -5584,6 +5657,12 @@
     "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
     "description": "Aria label for the body content of the generator nudge"
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
   },
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/change-password/extension-change-password.service.spec.ts b/apps/browser/src/auth/popup/change-password/extension-change-password.service.spec.ts
index a6a6b905218..4dc12e57d25 100644
--- a/apps/browser/src/auth/popup/change-password/extension-change-password.service.spec.ts
+++ b/apps/browser/src/auth/popup/change-password/extension-change-password.service.spec.ts
@@ -1,12 +1,12 @@
 import { MockProxy, mock } from "jest-mock-extended";
 
 import { ChangePasswordService } from "@bitwarden/angular/auth/password-management/change-password";
+import BrowserPopupUtils from "@bitwarden/browser/platform/browser/browser-popup-utils";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { KeyService } from "@bitwarden/key-management";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 
 import { ExtensionChangePasswordService } from "./extension-change-password.service";
 
diff --git a/apps/browser/src/auth/popup/change-password/extension-change-password.service.ts b/apps/browser/src/auth/popup/change-password/extension-change-password.service.ts
index dd2ce48d27a..0838e841d3f 100644
--- a/apps/browser/src/auth/popup/change-password/extension-change-password.service.ts
+++ b/apps/browser/src/auth/popup/change-password/extension-change-password.service.ts
@@ -2,12 +2,12 @@ import {
   DefaultChangePasswordService,
   ChangePasswordService,
 } from "@bitwarden/angular/auth/password-management/change-password";
+import BrowserPopupUtils from "@bitwarden/browser/platform/browser/browser-popup-utils";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { KeyService } from "@bitwarden/key-management";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 
 export class ExtensionChangePasswordService
   extends DefaultChangePasswordService
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..44900acc065 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.html
+++ b/apps/browser/src/auth/popup/settings/account-security.component.html
@@ -102,7 +102,7 @@
       </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..2335c5c2e69 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,6 +1,7 @@
 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";
 
@@ -19,7 +20,6 @@ import {
   VaultTimeoutStringType,
   VaultTimeoutAction,
 } from "@bitwarden/common/key-management/vault-timeout";
-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";
@@ -67,6 +67,7 @@ describe("AccountSecurityComponent", () => {
       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 },
@@ -88,7 +89,6 @@ 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 },
       ],
     })
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..0c9b4634569 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.ts
@@ -31,7 +31,6 @@ import { getFirstPolicy } from "@bitwarden/common/admin-console/services/policy/
 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 { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import {
   VaultTimeout,
@@ -41,7 +40,6 @@ import {
   VaultTimeoutSettingsService,
   VaultTimeoutStringType,
 } from "@bitwarden/common/key-management/vault-timeout";
-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";
@@ -115,7 +113,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],
@@ -157,7 +154,6 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
     private biometricsService: BiometricsService,
     private vaultNudgesService: NudgesService,
     private validationService: ValidationService,
-    private configService: ConfigService,
     private logService: LogService,
   ) {}
 
@@ -239,10 +235,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 () => {
diff --git a/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts b/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts
index af850c9a7bc..a6661ea263c 100644
--- a/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts
+++ b/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts
@@ -43,17 +43,13 @@ describe("AuthPopoutWindow", () => {
         singleActionKey: AuthPopoutType.unlockExtension,
         senderWindowId: 1,
       });
-      expect(sendMessageDataSpy).toHaveBeenCalledWith(senderTab, "bgUnlockPopoutOpened", {
-        skipNotification: false,
-      });
+      expect(sendMessageDataSpy).toHaveBeenCalledWith(senderTab, "bgUnlockPopoutOpened", {});
     });
 
-    it("sends an indication that the presenting the notification bar for unlocking the extension should be skipped", async () => {
-      await openUnlockPopout(senderTab, true);
+    it("sends the bgUnlockPopoutOpened message", async () => {
+      await openUnlockPopout(senderTab);
 
-      expect(sendMessageDataSpy).toHaveBeenCalledWith(senderTab, "bgUnlockPopoutOpened", {
-        skipNotification: true,
-      });
+      expect(sendMessageDataSpy).toHaveBeenCalledWith(senderTab, "bgUnlockPopoutOpened", {});
     });
 
     it("closes any existing popup window types that are open to the unlock extension route", async () => {
diff --git a/apps/browser/src/auth/popup/utils/auth-popout-window.ts b/apps/browser/src/auth/popup/utils/auth-popout-window.ts
index 0611891b61e..15e1ceb3e7b 100644
--- a/apps/browser/src/auth/popup/utils/auth-popout-window.ts
+++ b/apps/browser/src/auth/popup/utils/auth-popout-window.ts
@@ -20,9 +20,8 @@ const extensionUnlockUrls = new Set([
  * Opens a window that facilitates unlocking / logging into the extension.
  *
  * @param senderTab - Used to determine the windowId of the sender.
- * @param skipNotification - Used to determine whether to show the unlock notification.
  */
-async function openUnlockPopout(senderTab: chrome.tabs.Tab, skipNotification = false) {
+async function openUnlockPopout(senderTab: chrome.tabs.Tab) {
   const existingPopoutWindowTabs = await BrowserApi.tabsQuery({ windowType: "popup" });
   existingPopoutWindowTabs.forEach((tab) => {
     if (extensionUnlockUrls.has(tab.url)) {
@@ -36,7 +35,7 @@ async function openUnlockPopout(senderTab: chrome.tabs.Tab, skipNotification = f
     singleActionKey: AuthPopoutType.unlockExtension,
     senderWindowId: senderTab.windowId,
   });
-  await BrowserApi.tabSendMessageData(senderTab, "bgUnlockPopoutOpened", { skipNotification });
+  await BrowserApi.tabSendMessageData(senderTab, "bgUnlockPopoutOpened", {});
 }
 
 /**
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/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 cc28ed0057e..52720b1f9f5 100644
--- a/apps/browser/src/autofill/background/abstractions/notification.background.ts
+++ b/apps/browser/src/autofill/background/abstractions/notification.background.ts
@@ -141,7 +141,6 @@ type NotificationBackgroundExtensionMessageHandlers = {
     sender,
   }: BackgroundOnMessageHandlerParams) => Promise<void>;
   bgNeverSave: ({ sender }: BackgroundSenderParam) => Promise<void>;
-  bgUnlockPopoutOpened: ({ message, sender }: BackgroundOnMessageHandlerParams) => Promise<void>;
   bgReopenUnlockPopout: ({ sender }: BackgroundSenderParam) => Promise<void>;
   checkNotificationQueue: ({ sender }: BackgroundSenderParam) => Promise<void>;
   collectPageDetailsResponse: ({ message }: BackgroundMessageParam) => Promise<void>;
diff --git a/apps/browser/src/autofill/background/abstractions/overlay-notifications.background.ts b/apps/browser/src/autofill/background/abstractions/overlay-notifications.background.ts
index 71452ec975a..a70ffe25310 100644
--- a/apps/browser/src/autofill/background/abstractions/overlay-notifications.background.ts
+++ b/apps/browser/src/autofill/background/abstractions/overlay-notifications.background.ts
@@ -19,7 +19,7 @@ export type LoginSecurityTaskInfo = {
 
 export type WebsiteOriginsWithFields = Map<chrome.tabs.Tab["id"], Set<string>>;
 
-export type ActiveFormSubmissionRequests = Set<chrome.webRequest.ResourceRequest["requestId"]>;
+export type ActiveFormSubmissionRequests = Set<chrome.webRequest.WebRequestDetails["requestId"]>;
 
 export type ModifyLoginCipherFormData = {
   uri: string;
diff --git a/apps/browser/src/autofill/background/abstractions/overlay.background.ts b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
index 75f2659c9df..6067d563db2 100644
--- a/apps/browser/src/autofill/background/abstractions/overlay.background.ts
+++ b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
@@ -48,6 +48,7 @@ export type FocusedFieldData = {
   frameId?: number;
   accountCreationFieldType?: string;
   showPasskeys?: boolean;
+  focusedFieldForm?: string;
 };
 
 export type InlineMenuElementPosition = {
diff --git a/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts b/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
index 373354b4c54..82a907a9e43 100644
--- a/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
+++ b/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
@@ -110,11 +110,11 @@ describe("AutoSubmitLoginBackground", () => {
   });
 
   describe("when the AutomaticAppLogIn policy is valid and active", () => {
-    let webRequestDetails: chrome.webRequest.WebRequestBodyDetails;
+    let webRequestDetails: chrome.webRequest.WebRequestDetails;
 
     describe("starting the auto-submit login workflow", () => {
       beforeEach(async () => {
-        webRequestDetails = mock<chrome.webRequest.WebRequestBodyDetails>({
+        webRequestDetails = mock<chrome.webRequest.WebRequestDetails>({
           initiator: validIpdUrl1,
           url: validAutoSubmitUrl,
           type: "main_frame",
@@ -196,7 +196,7 @@ describe("AutoSubmitLoginBackground", () => {
 
     describe("cancelling an active auto-submit login workflow", () => {
       beforeEach(async () => {
-        webRequestDetails = mock<chrome.webRequest.WebRequestBodyDetails>({
+        webRequestDetails = mock<chrome.webRequest.WebRequestDetails>({
           initiator: validIpdUrl1,
           url: validAutoSubmitUrl,
           type: "main_frame",
@@ -280,7 +280,7 @@ describe("AutoSubmitLoginBackground", () => {
       });
 
       describe("requests that occur within a sub-frame", () => {
-        const webRequestDetails = mock<chrome.webRequest.WebRequestBodyDetails>({
+        const webRequestDetails = mock<chrome.webRequest.WebRequestDetails>({
           url: validAutoSubmitUrl,
           frameId: 1,
         });
@@ -324,7 +324,7 @@ describe("AutoSubmitLoginBackground", () => {
         it("updates the most recent idp host when a tab is activated", async () => {
           jest.spyOn(BrowserApi, "getTab").mockResolvedValue(newTab);
 
-          triggerTabOnActivatedEvent(mock<chrome.tabs.TabActiveInfo>({ tabId: newTabId }));
+          triggerTabOnActivatedEvent(mock<chrome.tabs.OnActivatedInfo>({ tabId: newTabId }));
           await flushPromises();
 
           expect(autoSubmitLoginBackground["mostRecentIdpHost"]).toStrictEqual({
@@ -336,7 +336,7 @@ describe("AutoSubmitLoginBackground", () => {
         it("updates the most recent id host when a tab is updated", () => {
           triggerTabOnUpdatedEvent(
             newTabId,
-            mock<chrome.tabs.TabChangeInfo>({ url: validIpdUrl1 }),
+            mock<chrome.tabs.OnUpdatedInfo>({ url: validIpdUrl1 }),
             newTab,
           );
 
@@ -389,7 +389,7 @@ describe("AutoSubmitLoginBackground", () => {
               tabId: newTabId,
             };
 
-            triggerTabOnRemovedEvent(newTabId, mock<chrome.tabs.TabRemoveInfo>());
+            triggerTabOnRemovedEvent(newTabId, mock<chrome.tabs.OnRemovedInfo>());
 
             expect(autoSubmitLoginBackground["currentAutoSubmitHostData"]).toStrictEqual({});
           });
@@ -403,14 +403,14 @@ describe("AutoSubmitLoginBackground", () => {
           tabId: tabId,
         };
         triggerWebRequestOnBeforeRedirectEvent(
-          mock<chrome.webRequest.WebRedirectionResponseDetails>({
+          mock<chrome.webRequest.OnBeforeRedirectDetails>({
             url: validIpdUrl1,
             redirectUrl: validIpdUrl2,
             frameId: 0,
           }),
         );
         triggerWebRequestOnBeforeRedirectEvent(
-          mock<chrome.webRequest.WebRedirectionResponseDetails>({
+          mock<chrome.webRequest.OnBeforeRedirectDetails>({
             url: validIpdUrl2,
             redirectUrl: validAutoSubmitUrl,
             frameId: 0,
@@ -418,7 +418,7 @@ describe("AutoSubmitLoginBackground", () => {
         );
 
         triggerWebRequestOnBeforeRequestEvent(
-          mock<chrome.webRequest.WebRequestBodyDetails>({
+          mock<chrome.webRequest.WebRequestDetails>({
             tabId: tabId,
             url: `https://${validAutoSubmitHost}`,
             initiator: null,
diff --git a/apps/browser/src/autofill/background/auto-submit-login.background.ts b/apps/browser/src/autofill/background/auto-submit-login.background.ts
index dfdfa0f4d67..f593fab2516 100644
--- a/apps/browser/src/autofill/background/auto-submit-login.background.ts
+++ b/apps/browser/src/autofill/background/auto-submit-login.background.ts
@@ -161,7 +161,9 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    *
    * @param details - The details of the request.
    */
-  private handleOnBeforeRequest = (details: chrome.webRequest.WebRequestBodyDetails) => {
+  private handleOnBeforeRequest = (
+    details: chrome.webRequest.OnBeforeRequestDetails,
+  ): undefined => {
     const requestInitiator = this.getRequestInitiator(details);
     const isValidInitiator = this.isValidInitiator(requestInitiator);
 
@@ -191,7 +193,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    * @param isValidInitiator - A flag indicating if the initiator of the request is valid.
    */
   private postRequestEncounteredAfterSubmission = (
-    details: chrome.webRequest.WebRequestBodyDetails,
+    details: chrome.webRequest.OnBeforeRequestDetails,
     isValidInitiator: boolean,
   ) => {
     return details.method === "POST" && this.validAutoSubmitHosts.size > 0 && isValidInitiator;
@@ -205,7 +207,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    * @param isValidInitiator - A flag indicating if the initiator of the request is valid.
    */
   private requestRedirectsToInvalidHost = (
-    details: chrome.webRequest.WebRequestBodyDetails,
+    details: chrome.webRequest.OnBeforeRequestDetails,
     isValidInitiator: boolean,
   ) => {
     return (
@@ -221,7 +223,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    *
    * @param details - The details of the request.
    */
-  private setupAutoSubmitFlow = (details: chrome.webRequest.WebRequestBodyDetails) => {
+  private setupAutoSubmitFlow = (details: chrome.webRequest.OnBeforeRequestDetails) => {
     if (this.isRequestInMainFrame(details)) {
       this.currentAutoSubmitHostData = {
         url: details.url,
@@ -288,7 +290,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    * @param details - The details of the request.
    */
   private handleWebRequestOnBeforeRedirect = (
-    details: chrome.webRequest.WebRedirectionResponseDetails,
+    details: chrome.webRequest.OnBeforeRedirectDetails,
   ) => {
     if (this.isRequestInMainFrame(details) && this.urlContainsAutoSubmitHash(details.redirectUrl)) {
       this.validAutoSubmitHosts.add(this.getUrlHost(details.redirectUrl));
@@ -354,7 +356,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    */
   private disableAutoSubmitFlow = async (
     requestInitiator: string,
-    details: chrome.webRequest.WebRequestBodyDetails,
+    details: chrome.webRequest.OnBeforeRequestDetails,
   ) => {
     if (this.isValidAutoSubmitHost(requestInitiator)) {
       this.removeUrlFromAutoSubmitHosts(requestInitiator);
@@ -390,7 +392,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    * @param initiator - The initiator of the request.
    */
   private shouldRouteTriggerAutoSubmit = (
-    details: chrome.webRequest.ResourceRequest,
+    details: chrome.webRequest.OnBeforeRequestDetails,
     initiator: string,
   ) => {
     if (this.isRequestInMainFrame(details)) {
@@ -449,7 +451,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    *
    * @param details - The details of the request.
    */
-  private getRequestInitiator = (details: chrome.webRequest.ResourceRequest) => {
+  private getRequestInitiator = (details: chrome.webRequest.OnBeforeRequestDetails) => {
     if (!this.isSafariBrowser) {
       return details.initiator || (details as browser.webRequest._OnBeforeRequestDetails).originUrl;
     }
@@ -470,7 +472,12 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    *
    * @param details - The details of the request.
    */
-  private isRequestInMainFrame = (details: chrome.webRequest.ResourceRequest) => {
+  private isRequestInMainFrame = (
+    details: SetPartial<
+      chrome.webRequest.WebRequestDetails,
+      "documentId" | "documentLifecycle" | "frameType"
+    >,
+  ) => {
     if (this.isSafariBrowser) {
       return details.frameId === 0;
     }
@@ -545,7 +552,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    *
    * @param activeInfo - The active tab information.
    */
-  private handleSafariTabOnActivated = async (activeInfo: chrome.tabs.TabActiveInfo) => {
+  private handleSafariTabOnActivated = async (activeInfo: chrome.tabs.OnActivatedInfo) => {
     if (activeInfo.tabId < 0) {
       return;
     }
@@ -562,7 +569,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    * @param tabId - The tab ID associated with the URL.
    * @param changeInfo - The change information of the tab.
    */
-  private handleSafariTabOnUpdated = (tabId: number, changeInfo: chrome.tabs.TabChangeInfo) => {
+  private handleSafariTabOnUpdated = (tabId: number, changeInfo: chrome.tabs.OnUpdatedInfo) => {
     if (changeInfo) {
       this.setMostRecentIdpHost(changeInfo.url, tabId);
     }
diff --git a/apps/browser/src/autofill/background/notification.background.spec.ts b/apps/browser/src/autofill/background/notification.background.spec.ts
index 1c72b2af1d1..032baf2e32b 100644
--- a/apps/browser/src/autofill/background/notification.background.spec.ts
+++ b/apps/browser/src/autofill/background/notification.background.spec.ts
@@ -817,6 +817,7 @@ describe("NotificationBackground", () => {
             reprompt: CipherRepromptType.None,
           });
           getDecryptedCipherByIdSpy.mockResolvedValueOnce(cipherView);
+          taskService.tasksEnabled$.mockImplementation(() => of(false));
 
           sendMockExtensionMessage(message, sender);
           await flushPromises();
@@ -865,7 +866,7 @@ describe("NotificationBackground", () => {
             reprompt: CipherRepromptType.Password,
           });
           getDecryptedCipherByIdSpy.mockResolvedValueOnce(cipherView);
-
+          taskService.tasksEnabled$.mockImplementation(() => of(false));
           sendMockExtensionMessage(message, sender);
           await flushPromises();
 
@@ -913,9 +914,6 @@ describe("NotificationBackground", () => {
           taskService.pendingTasks$.mockImplementation(() =>
             of([mockSecurityTask, mockSecurityTask2]),
           );
-          jest
-            .spyOn(notificationBackground as any, "getNotificationFlag")
-            .mockResolvedValueOnce(true);
           jest.spyOn(notificationBackground as any, "getOrgData").mockResolvedValueOnce([
             {
               id: mockOrgId,
@@ -1372,74 +1370,6 @@ describe("NotificationBackground", () => {
       });
     });
 
-    describe("bgUnlockPopoutOpened message handler", () => {
-      let pushUnlockVaultToQueueSpy: jest.SpyInstance;
-
-      beforeEach(() => {
-        pushUnlockVaultToQueueSpy = jest.spyOn(
-          notificationBackground as any,
-          "pushUnlockVaultToQueue",
-        );
-      });
-
-      it("skips pushing the unlock vault message to the queue if the message indicates that the notification should be skipped", async () => {
-        const tabMock = createChromeTabMock();
-        const sender = mock<chrome.runtime.MessageSender>({ tab: tabMock });
-        const message: NotificationBackgroundExtensionMessage = {
-          command: "bgUnlockPopoutOpened",
-          data: { skipNotification: true },
-        };
-
-        sendMockExtensionMessage(message, sender);
-        await flushPromises();
-
-        expect(pushUnlockVaultToQueueSpy).not.toHaveBeenCalled();
-      });
-
-      it("skips pushing the unlock vault message to the queue if the auth status is not `Locked`", async () => {
-        const tabMock = createChromeTabMock();
-        const sender = mock<chrome.runtime.MessageSender>({ tab: tabMock });
-        const message: NotificationBackgroundExtensionMessage = {
-          command: "bgUnlockPopoutOpened",
-        };
-        activeAccountStatusMock$.next(AuthenticationStatus.LoggedOut);
-
-        sendMockExtensionMessage(message, sender);
-        await flushPromises();
-
-        expect(pushUnlockVaultToQueueSpy).not.toHaveBeenCalled();
-      });
-
-      it("skips pushing the unlock vault message to the queue if the notification queue already has an item", async () => {
-        const tabMock = createChromeTabMock();
-        const sender = mock<chrome.runtime.MessageSender>({ tab: tabMock });
-        const message: NotificationBackgroundExtensionMessage = {
-          command: "bgUnlockPopoutOpened",
-        };
-        activeAccountStatusMock$.next(AuthenticationStatus.Locked);
-        notificationBackground["notificationQueue"] = [mock<AddLoginQueueMessage>()];
-
-        sendMockExtensionMessage(message, sender);
-        await flushPromises();
-
-        expect(pushUnlockVaultToQueueSpy).not.toHaveBeenCalled();
-      });
-
-      it("sends an unlock vault message to the queue if the user has a locked vault", async () => {
-        const tabMock = createChromeTabMock({ url: "https://example.com" });
-        const sender = mock<chrome.runtime.MessageSender>({ tab: tabMock });
-        const message: NotificationBackgroundExtensionMessage = {
-          command: "bgUnlockPopoutOpened",
-        };
-        activeAccountStatusMock$.next(AuthenticationStatus.Locked);
-
-        sendMockExtensionMessage(message, sender);
-        await flushPromises();
-
-        expect(pushUnlockVaultToQueueSpy).toHaveBeenCalledWith("example.com", sender.tab);
-      });
-    });
-
     describe("checkNotificationQueue", () => {
       let doNotificationQueueCheckSpy: jest.SpyInstance;
       let getTabFromCurrentWindowSpy: jest.SpyInstance;
diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts
index e9eea552f37..d44bf2f1507 100644
--- a/apps/browser/src/autofill/background/notification.background.ts
+++ b/apps/browser/src/autofill/background/notification.background.ts
@@ -22,7 +22,6 @@ import {
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { UserNotificationSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/user-notification-settings.service";
 import { ProductTierType } from "@bitwarden/common/billing/enums/product-tier-type.enum";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { NeverDomains } from "@bitwarden/common/models/domain/domain-service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { ServerConfig } from "@bitwarden/common/platform/abstractions/config/server-config";
@@ -67,7 +66,6 @@ import { TemporaryNotificationChangeLoginService } from "../services/notificatio
 import {
   AddChangePasswordNotificationQueueMessage,
   AddLoginQueueMessage,
-  AddUnlockVaultQueueMessage,
   AddLoginMessageData,
   NotificationQueueMessageItem,
   LockedVaultPendingNotificationsData,
@@ -116,12 +114,10 @@ export default class NotificationBackground {
     bgSaveCipher: ({ message, sender }) => this.handleSaveCipherMessage(message, sender),
     bgHandleReprompt: ({ message, sender }: any) =>
       this.handleCipherUpdateRepromptResponse(message),
-    bgUnlockPopoutOpened: ({ message, sender }) => this.unlockVault(message, sender.tab),
     checkNotificationQueue: ({ sender }) => this.checkNotificationQueue(sender.tab),
     collectPageDetailsResponse: ({ message }) =>
       this.handleCollectPageDetailsResponseMessage(message),
     getWebVaultUrlForNotification: () => this.getWebVaultUrl(),
-    notificationRefreshFlagValue: () => this.getNotificationFlag(),
     unlockCompleted: ({ message, sender }) => this.handleUnlockCompleted(message, sender),
   };
 
@@ -351,15 +347,6 @@ export default class NotificationBackground {
     return await firstValueFrom(this.configService.serverConfig$);
   }
 
-  /**
-   * Gets the current value of the notification refresh feature flag
-   * @returns Promise<boolean> indicating if the feature is enabled
-   */
-  async getNotificationFlag(): Promise<boolean> {
-    const flagValue = await this.configService.getFeatureFlag(FeatureFlag.NotificationRefresh);
-    return flagValue;
-  }
-
   /**
    * Gets the current authentication status of the user.
    * @returns Promise<AuthenticationStatus> - The current authentication status of the user.
@@ -465,11 +452,6 @@ export default class NotificationBackground {
     data: ModifyLoginCipherFormData,
     tab: chrome.tabs.Tab,
   ): Promise<boolean> {
-    const flag = await this.getNotificationFlag();
-    if (!flag) {
-      return false;
-    }
-
     const activeUserId = await firstValueFrom(
       this.accountService.activeAccount$.pipe(getOptionalUserId),
     );
@@ -683,34 +665,6 @@ export default class NotificationBackground {
     });
   }
 
-  /**
-   * Sets up a notification to unlock the vault when the user
-   * attempts to autofill a cipher while the vault is locked.
-   *
-   * @param message - Extension message, determines if the notification should be skipped
-   * @param tab - The tab that the message was sent from
-   */
-  private async unlockVault(message: NotificationBackgroundExtensionMessage, tab: chrome.tabs.Tab) {
-    const notificationRefreshFlagEnabled = await this.getNotificationFlag();
-    if (message.data?.skipNotification) {
-      return;
-    }
-
-    if (notificationRefreshFlagEnabled) {
-      return;
-    }
-
-    const currentAuthStatus = await this.getAuthStatus();
-    if (currentAuthStatus !== AuthenticationStatus.Locked || this.notificationQueue.length) {
-      return;
-    }
-
-    const loginDomain = Utils.getDomain(tab.url);
-    if (loginDomain) {
-      await this.pushUnlockVaultToQueue(loginDomain, tab);
-    }
-  }
-
   private async pushChangePasswordToQueue(
     cipherId: string,
     loginDomain: string,
@@ -734,20 +688,6 @@ export default class NotificationBackground {
     await this.checkNotificationQueue(tab);
   }
 
-  private async pushUnlockVaultToQueue(loginDomain: string, tab: chrome.tabs.Tab) {
-    this.removeTabFromNotificationQueue(tab);
-    const launchTimestamp = new Date().getTime();
-    const message: AddUnlockVaultQueueMessage = {
-      type: NotificationType.UnlockVault,
-      domain: loginDomain,
-      tab: tab,
-      launchTimestamp,
-      expires: new Date(launchTimestamp + 0.5 * 60000), // 30 seconds
-      wasVaultLocked: true,
-    };
-    await this.sendNotificationQueueMessage(tab, message);
-  }
-
   /**
    * Saves a cipher based on the message sent from the notification bar. If the vault
    * is locked, the message will be added to the notification queue and the unlock
@@ -906,12 +846,11 @@ export default class NotificationBackground {
     }
     const cipher = await this.cipherService.encrypt(cipherView, userId);
 
-    const shouldGetTasks = await this.getNotificationFlag();
     try {
       if (!cipherView.edit) {
         throw new Error("You do not have permission to edit this cipher.");
       }
-      const tasks = shouldGetTasks ? await this.getSecurityTasks(userId) : [];
+      const tasks = await this.getSecurityTasks(userId);
       const updatedCipherTask = tasks.find((task) => task.cipherId === cipherView?.id);
       const cipherHasTask = !!updatedCipherTask?.id;
 
diff --git a/apps/browser/src/autofill/background/overlay-notifications.background.spec.ts b/apps/browser/src/autofill/background/overlay-notifications.background.spec.ts
index cf317de4fd2..c596a1ba774 100644
--- a/apps/browser/src/autofill/background/overlay-notifications.background.spec.ts
+++ b/apps/browser/src/autofill/background/overlay-notifications.background.spec.ts
@@ -385,7 +385,7 @@ describe("OverlayNotificationsBackground", () => {
 
       it("ignores requests that are not part of an active form submission", async () => {
         triggerWebRequestOnCompletedEvent(
-          mock<chrome.webRequest.WebResponseDetails>({
+          mock<chrome.webRequest.OnCompletedDetails>({
             url: sender.url,
             tabId: sender.tab.id,
             requestId: "123345",
@@ -409,7 +409,7 @@ describe("OverlayNotificationsBackground", () => {
         await flushPromises();
 
         triggerWebRequestOnCompletedEvent(
-          mock<chrome.webRequest.WebResponseDetails>({
+          mock<chrome.webRequest.OnCompletedDetails>({
             url: sender.url,
             tabId: sender.tab.id,
             requestId,
@@ -438,7 +438,7 @@ describe("OverlayNotificationsBackground", () => {
         await flushPromises();
 
         triggerWebRequestOnCompletedEvent(
-          mock<chrome.webRequest.WebResponseDetails>({
+          mock<chrome.webRequest.OnCompletedDetails>({
             url: sender.url,
             tabId: sender.tab.id,
             statusCode: 404,
@@ -492,7 +492,7 @@ describe("OverlayNotificationsBackground", () => {
           );
         });
         triggerWebRequestOnCompletedEvent(
-          mock<chrome.webRequest.WebResponseDetails>({
+          mock<chrome.webRequest.OnCompletedDetails>({
             url: sender.url,
             tabId: sender.tab.id,
             requestId,
@@ -541,7 +541,7 @@ describe("OverlayNotificationsBackground", () => {
         });
 
         triggerWebRequestOnCompletedEvent(
-          mock<chrome.webRequest.WebResponseDetails>({
+          mock<chrome.webRequest.OnCompletedDetails>({
             url: sender.url,
             tabId: sender.tab.id,
             requestId,
@@ -643,7 +643,7 @@ describe("OverlayNotificationsBackground", () => {
     });
 
     it("clears all associated data with a removed tab", () => {
-      triggerTabOnRemovedEvent(sender.tab.id, mock<chrome.tabs.TabRemoveInfo>());
+      triggerTabOnRemovedEvent(sender.tab.id, mock<chrome.tabs.OnRemovedInfo>());
 
       expect(overlayNotificationsBackground["websiteOriginsWithFields"].size).toBe(0);
     });
@@ -652,7 +652,7 @@ describe("OverlayNotificationsBackground", () => {
       it("skips clearing the website origins if the changeInfo does not contain a `loading` status", () => {
         triggerTabOnUpdatedEvent(
           sender.tab.id,
-          mock<chrome.tabs.TabChangeInfo>({ status: "complete" }),
+          mock<chrome.tabs.OnUpdatedInfo>({ status: "complete" }),
           mock<chrome.tabs.Tab>({ status: "complete" }),
         );
 
@@ -662,7 +662,7 @@ describe("OverlayNotificationsBackground", () => {
       it("skips clearing the website origins if the changeInfo does not contain a url", () => {
         triggerTabOnUpdatedEvent(
           sender.tab.id,
-          mock<chrome.tabs.TabChangeInfo>({ status: "loading", url: "" }),
+          mock<chrome.tabs.OnUpdatedInfo>({ status: "loading", url: "" }),
           mock<chrome.tabs.Tab>({ status: "loading" }),
         );
 
@@ -672,7 +672,7 @@ describe("OverlayNotificationsBackground", () => {
       it("skips clearing the website origins if the tab does not contain known website origins", () => {
         triggerTabOnUpdatedEvent(
           199,
-          mock<chrome.tabs.TabChangeInfo>({ status: "loading", url: "https://example.com" }),
+          mock<chrome.tabs.OnUpdatedInfo>({ status: "loading", url: "https://example.com" }),
           mock<chrome.tabs.Tab>({ status: "loading", id: 199 }),
         );
 
@@ -682,7 +682,7 @@ describe("OverlayNotificationsBackground", () => {
       it("skips clearing the website origins if the changeInfo's url is present as part of the know website origin match patterns", () => {
         triggerTabOnUpdatedEvent(
           sender.tab.id,
-          mock<chrome.tabs.TabChangeInfo>({
+          mock<chrome.tabs.OnUpdatedInfo>({
             status: "loading",
             url: "https://subdomain.example.com",
           }),
@@ -695,7 +695,7 @@ describe("OverlayNotificationsBackground", () => {
       it("clears all associated data with a tab that is entering a `loading` state", () => {
         triggerTabOnUpdatedEvent(
           sender.tab.id,
-          mock<chrome.tabs.TabChangeInfo>({ status: "loading" }),
+          mock<chrome.tabs.OnUpdatedInfo>({ status: "loading" }),
           mock<chrome.tabs.Tab>({ status: "loading" }),
         );
 
diff --git a/apps/browser/src/autofill/background/overlay-notifications.background.ts b/apps/browser/src/autofill/background/overlay-notifications.background.ts
index e7126a57e9f..4657dfb6d1f 100644
--- a/apps/browser/src/autofill/background/overlay-notifications.background.ts
+++ b/apps/browser/src/autofill/background/overlay-notifications.background.ts
@@ -228,7 +228,9 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
    *
    * @param details - The details of the web request
    */
-  private handleOnBeforeRequestEvent = (details: chrome.webRequest.WebRequestDetails) => {
+  private handleOnBeforeRequestEvent = (
+    details: chrome.webRequest.OnBeforeRequestDetails,
+  ): undefined => {
     if (this.isPostSubmissionFormRedirection(details)) {
       this.setupNotificationInitTrigger(
         details.tabId,
@@ -275,7 +277,7 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
    *
    * @param details - The details of the web request
    */
-  private isPostSubmissionFormRedirection = (details: chrome.webRequest.WebRequestDetails) => {
+  private isPostSubmissionFormRedirection = (details: chrome.webRequest.OnBeforeRequestDetails) => {
     return (
       details.method?.toUpperCase() === "GET" &&
       this.activeFormSubmissionRequests.has(details.requestId) &&
@@ -289,7 +291,7 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
    *
    * @param details - The details of the web request
    */
-  private isValidFormSubmissionRequest = (details: chrome.webRequest.WebRequestDetails) => {
+  private isValidFormSubmissionRequest = (details: chrome.webRequest.OnBeforeRequestDetails) => {
     return (
       !this.requestHostIsInvalid(details) &&
       this.formSubmissionRequestMethods.has(details.method?.toUpperCase())
@@ -325,7 +327,7 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
    *
    * @param details - The details of the web response
    */
-  private handleOnCompletedRequestEvent = async (details: chrome.webRequest.WebResponseDetails) => {
+  private handleOnCompletedRequestEvent = async (details: chrome.webRequest.OnCompletedDetails) => {
     if (
       this.requestHostIsInvalid(details) ||
       !this.activeFormSubmissionRequests.has(details.requestId)
@@ -382,8 +384,8 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
    * @param modifyLoginData - The modified login form data
    */
   private delayNotificationInitUntilTabIsComplete = async (
-    tabId: chrome.webRequest.ResourceRequest["tabId"],
-    requestId: chrome.webRequest.ResourceRequest["requestId"],
+    tabId: chrome.webRequest.WebRequestDetails["tabId"],
+    requestId: chrome.webRequest.WebRequestDetails["requestId"],
     modifyLoginData: ModifyLoginCipherFormData,
   ) => {
     const handleWebNavigationOnCompleted = async () => {
@@ -403,7 +405,7 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
    * @param tab - The tab details
    */
   private processNotifications = async (
-    requestId: chrome.webRequest.ResourceRequest["requestId"],
+    requestId: chrome.webRequest.WebRequestDetails["requestId"],
     modifyLoginData: ModifyLoginCipherFormData,
     tab: chrome.tabs.Tab,
     config: { skippable: NotificationType[] } = { skippable: [] },
@@ -477,7 +479,7 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
    * @param tab - The tab details
    */
   private clearCompletedWebRequest = (
-    requestId: chrome.webRequest.ResourceRequest["requestId"],
+    requestId: chrome.webRequest.WebRequestDetails["requestId"],
     tabId: chrome.tabs.Tab["id"],
   ) => {
     this.activeFormSubmissionRequests.delete(requestId);
@@ -492,7 +494,12 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
    *
    * @param details - The details of the web request
    */
-  private requestHostIsInvalid = (details: chrome.webRequest.ResourceRequest) => {
+  private requestHostIsInvalid = (
+    details: SetPartial<
+      chrome.webRequest.WebRequestDetails,
+      "documentId" | "documentLifecycle" | "frameType"
+    >,
+  ) => {
     return !details.url?.startsWith("http") || details.tabId < 0;
   };
 
@@ -553,7 +560,7 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
    * @param tabId - The id of the tab that was updated
    * @param changeInfo - The change info of the tab
    */
-  private handleTabUpdated = (tabId: number, changeInfo: chrome.tabs.TabChangeInfo) => {
+  private handleTabUpdated = (tabId: number, changeInfo: chrome.tabs.OnUpdatedInfo) => {
     if (changeInfo.status !== "loading" || !changeInfo.url) {
       return;
     }
diff --git a/apps/browser/src/autofill/background/overlay.background.spec.ts b/apps/browser/src/autofill/background/overlay.background.spec.ts
index 691ea1870d0..47a5e8fec4c 100644
--- a/apps/browser/src/autofill/background/overlay.background.spec.ts
+++ b/apps/browser/src/autofill/background/overlay.background.spec.ts
@@ -3371,7 +3371,7 @@ describe("OverlayBackground", () => {
             });
             await flushPromises();
             triggerWebRequestOnCompletedEvent(
-              mock<chrome.webRequest.WebResponseCacheDetails>({
+              mock<chrome.webRequest.OnCompletedDetails>({
                 statusCode: 401,
               }),
             );
@@ -3389,8 +3389,9 @@ describe("OverlayBackground", () => {
               usePasskey: true,
               portKey,
             });
+            await flushPromises();
             triggerWebRequestOnCompletedEvent(
-              mock<chrome.webRequest.WebResponseCacheDetails>({
+              mock<chrome.webRequest.OnCompletedDetails>({
                 statusCode: 200,
               }),
             );
diff --git a/apps/browser/src/autofill/background/overlay.background.ts b/apps/browser/src/autofill/background/overlay.background.ts
index 617275da060..35585d58863 100644
--- a/apps/browser/src/autofill/background/overlay.background.ts
+++ b/apps/browser/src/autofill/background/overlay.background.ts
@@ -1127,11 +1127,16 @@ export class OverlayBackground implements OverlayBackgroundInterface {
     { inlineMenuCipherId, usePasskey }: OverlayPortMessage,
     { sender }: chrome.runtime.Port,
   ) {
+    await BrowserApi.tabSendMessage(
+      sender.tab,
+      { command: "collectPageDetails" },
+      { frameId: this.focusedFieldData?.frameId },
+    );
+
     const pageDetailsForTab = this.pageDetailsForTab[sender.tab.id];
     if (!inlineMenuCipherId || !pageDetailsForTab?.size) {
       return;
     }
-
     const cipher = this.inlineMenuCiphers.get(inlineMenuCipherId);
     if (usePasskey && cipher.login?.hasFido2Credentials) {
       await this.authenticatePasskeyCredential(
@@ -1170,6 +1175,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
       pageDetails,
       fillNewPassword: true,
       allowTotpAutofill: true,
+      focusedFieldForm: this.focusedFieldData?.focusedFieldForm,
     });
 
     if (totpCode) {
@@ -1232,7 +1238,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
    * @param details - The web request details
    */
   private handlePasskeyAuthenticationOnCompleted = (
-    details: chrome.webRequest.WebResponseCacheDetails,
+    details: chrome.webRequest.OnCompletedDetails,
   ) => {
     chrome.webRequest.onCompleted.removeListener(this.handlePasskeyAuthenticationOnCompleted);
 
@@ -1854,6 +1860,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
       pageDetails,
       fillNewPassword: true,
       allowTotpAutofill: false,
+      focusedFieldForm: this.focusedFieldData?.focusedFieldForm,
     });
 
     globalThis.setTimeout(async () => {
@@ -2102,7 +2109,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
       "addToLockedVaultPendingNotifications",
       retryMessage,
     );
-    await this.openUnlockPopout(sender.tab, true);
+    await this.openUnlockPopout(sender.tab);
   }
 
   /**
diff --git a/apps/browser/src/autofill/background/tabs.background.ts b/apps/browser/src/autofill/background/tabs.background.ts
index cd2c1595d69..b76997c0ae9 100644
--- a/apps/browser/src/autofill/background/tabs.background.ts
+++ b/apps/browser/src/autofill/background/tabs.background.ts
@@ -81,7 +81,7 @@ export default class TabsBackground {
    */
   private handleTabOnUpdated = async (
     tabId: number,
-    changeInfo: chrome.tabs.TabChangeInfo,
+    changeInfo: chrome.tabs.OnUpdatedInfo,
     tab: chrome.tabs.Tab,
   ) => {
     if (this.focusedWindowId > 0 && tab.windowId !== this.focusedWindowId) {
diff --git a/apps/browser/src/autofill/background/web-request.background.ts b/apps/browser/src/autofill/background/web-request.background.ts
index 22e10a3dd0a..5c02f2df34d 100644
--- a/apps/browser/src/autofill/background/web-request.background.ts
+++ b/apps/browser/src/autofill/background/web-request.background.ts
@@ -26,7 +26,10 @@ export default class WebRequestBackground {
 
   startListening() {
     this.webRequest.onAuthRequired.addListener(
-      async (details, callback) => {
+      (async (
+        details: chrome.webRequest.OnAuthRequiredDetails,
+        callback: (response: chrome.webRequest.BlockingResponse) => void,
+      ) => {
         if (!details.url || this.pendingAuthRequests.has(details.requestId)) {
           if (callback) {
             callback(null);
@@ -42,7 +45,7 @@ export default class WebRequestBackground {
         } else {
           await this.resolveAuthCredentials(details.url, callback, callback);
         }
-      },
+      }) as any,
       { urls: ["http://*/*", "https://*/*"] },
       [this.isFirefox ? "blocking" : "asyncBlocking"],
     );
@@ -50,16 +53,17 @@ export default class WebRequestBackground {
     this.webRequest.onCompleted.addListener((details) => this.completeAuthRequest(details), {
       urls: ["http://*/*"],
     });
-    this.webRequest.onErrorOccurred.addListener(
-      (details: any) => this.completeAuthRequest(details),
-      {
-        urls: ["http://*/*"],
-      },
-    );
+    this.webRequest.onErrorOccurred.addListener((details) => this.completeAuthRequest(details), {
+      urls: ["http://*/*"],
+    });
   }
 
-  // eslint-disable-next-line
-  private async resolveAuthCredentials(domain: string, success: Function, error: Function) {
+  private async resolveAuthCredentials(
+    domain: string,
+    success: (response: chrome.webRequest.BlockingResponse) => void,
+    // eslint-disable-next-line
+    error: Function,
+  ) {
     const activeUserId = await firstValueFrom(
       this.accountService.activeAccount$.pipe(getOptionalUserId),
     );
@@ -97,7 +101,7 @@ export default class WebRequestBackground {
     }
   }
 
-  private completeAuthRequest(details: chrome.webRequest.WebResponseCacheDetails) {
+  private completeAuthRequest(details: chrome.webRequest.WebRequestDetails) {
     this.pendingAuthRequests.delete(details.requestId);
   }
 }
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 99d0d9031cf..fe023f344d6 100644
--- a/apps/browser/src/autofill/content/content-message-handler.spec.ts
+++ b/apps/browser/src/autofill/content/content-message-handler.spec.ts
@@ -100,10 +100,19 @@ describe("ContentMessageHandler", () => {
     });
 
     it("forwards the message to the extension background if it is present in the forwardCommands list", () => {
-      sendMockExtensionMessage({ command: "bgUnlockPopoutOpened" });
+      const forwardCommands = [
+        "addToLockedVaultPendingNotifications",
+        "unlockCompleted",
+        "addedCipher",
+      ];
 
-      expect(sendMessageSpy).toHaveBeenCalledTimes(1);
-      expect(sendMessageSpy).toHaveBeenCalledWith({ command: "bgUnlockPopoutOpened" });
+      forwardCommands.forEach((command) => {
+        sendMockExtensionMessage({ command });
+
+        expect(sendMessageSpy).toHaveBeenCalledWith({ command });
+      });
+
+      expect(sendMessageSpy).toHaveBeenCalledTimes(forwardCommands.length);
     });
   });
 
diff --git a/apps/browser/src/autofill/fido2/background/fido2.background.ts b/apps/browser/src/autofill/fido2/background/fido2.background.ts
index 788c98ca85b..22ee4a1822d 100644
--- a/apps/browser/src/autofill/fido2/background/fido2.background.ts
+++ b/apps/browser/src/autofill/fido2/background/fido2.background.ts
@@ -218,7 +218,10 @@ export class Fido2Background implements Fido2BackgroundInterface {
       tabId: tab.id,
       injectDetails: { frame: "all_frames", ...this.sharedInjectionDetails },
       mv2Details: { file: await this.getFido2PageScriptAppendFileName() },
-      mv3Details: { file: Fido2ContentScript.PageScript, world: "MAIN" },
+      mv3Details: {
+        file: Fido2ContentScript.PageScript,
+        world: chrome.scripting.ExecutionWorld.MAIN,
+      },
     });
 
     void this.scriptInjectorService.inject({
diff --git a/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts b/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts
index af7344beb66..f50e541f677 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts
@@ -75,7 +75,7 @@ describe("Fido2 Content Script", () => {
       data: mock<InsecureCreateCredentialParams>(),
     });
     const mockResult = { credentialId: "mock" } as CreateCredentialResult;
-    jest.spyOn(chrome.runtime, "sendMessage").mockResolvedValue(mockResult);
+    (jest.spyOn(chrome.runtime, "sendMessage") as jest.Mock).mockResolvedValue(mockResult);
 
     // FIXME: Remove when updating file. Eslint update
     // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -167,7 +167,9 @@ describe("Fido2 Content Script", () => {
       data: mock<InsecureCreateCredentialParams>(),
     });
     const abortController = new AbortController();
-    jest.spyOn(chrome.runtime, "sendMessage").mockResolvedValue({ error: errorMessage });
+    (jest.spyOn(chrome.runtime, "sendMessage") as jest.Mock).mockResolvedValue({
+      error: errorMessage,
+    });
 
     // FIXME: Remove when updating file. Eslint update
     // eslint-disable-next-line @typescript-eslint/no-require-imports
diff --git a/apps/browser/src/autofill/notification/bar.ts b/apps/browser/src/autofill/notification/bar.ts
index 6e20a07f81f..9ae6fcedc8f 100644
--- a/apps/browser/src/autofill/notification/bar.ts
+++ b/apps/browser/src/autofill/notification/bar.ts
@@ -1,10 +1,8 @@
 import { render } from "lit";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums";
-import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 import type { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
-import { AdjustNotificationBarMessageData } from "../background/abstractions/notification.background";
 import { NotificationCipherData } from "../content/components/cipher/types";
 import { CollectionView, I18n, OrgView } from "../content/components/common-types";
 import { AtRiskNotification } from "../content/components/notification/at-risk-password/container";
@@ -12,8 +10,6 @@ import { NotificationConfirmationContainer } from "../content/components/notific
 import { NotificationContainer } from "../content/components/notification/container";
 import { selectedFolder as selectedFolderSignal } from "../content/components/signals/selected-folder";
 import { selectedVault as selectedVaultSignal } from "../content/components/signals/selected-vault";
-import { buildSvgDomElement } from "../utils";
-import { circleCheckIcon } from "../utils/svg-icons";
 
 import {
   NotificationBarWindowMessageHandlers,
@@ -23,34 +19,18 @@ import {
   NotificationTypes,
 } from "./abstractions/notification-bar";
 
-const logService = new ConsoleLogService(false);
 let notificationBarIframeInitData: NotificationBarIframeInitData = {};
 let windowMessageOrigin: string;
-let useComponentBar = false;
 
 const notificationBarWindowMessageHandlers: NotificationBarWindowMessageHandlers = {
   initNotificationBar: ({ message }) => initNotificationBar(message),
-  saveCipherAttemptCompleted: ({ message }) =>
-    useComponentBar
-      ? handleSaveCipherConfirmation(message)
-      : handleSaveCipherAttemptCompletedMessage(message),
+  saveCipherAttemptCompleted: ({ message }) => handleSaveCipherConfirmation(message),
 };
 
 globalThis.addEventListener("load", load);
 
 function load() {
   setupWindowMessageListener();
-  sendPlatformMessage({ command: "notificationRefreshFlagValue" }, (flagValue) => {
-    useComponentBar = flagValue;
-    applyNotificationBarStyle();
-  });
-}
-
-function applyNotificationBarStyle() {
-  if (!useComponentBar) {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    require("./bar.scss");
-  }
   postMessageToParent({ command: "initNotificationBar" });
 }
 
@@ -99,25 +79,6 @@ function getI18n() {
   };
 }
 
-/**
- * Attempts to locate an element by ID within a template’s content and casts it to the specified type.
- *
- * @param templateElement - The template whose content will be searched for the element.
- * @param elementId - The ID of the element being searched for.
- * @returns The typed element if found, otherwise log error.
- *
- */
-const findElementById = <ElementType extends HTMLElement>(
-  templateElement: HTMLTemplateElement,
-  elementId: string,
-): ElementType => {
-  const element = templateElement.content.getElementById(elementId);
-  if (!element) {
-    throw new Error(`Element with ID "${elementId}" not found in template.`);
-  }
-  return element as ElementType;
-};
-
 /**
  * Returns the localized header message for the notification bar based on the notification type.
  *
@@ -204,25 +165,6 @@ export function getNotificationTestId(
   }[notificationType];
 }
 
-/**
- * Sets the text content of an element identified by ID within a template's content.
- *
- * @param template - The template whose content will be searched for the element.
- * @param elementId - The ID of the element whose text content is to be set.
- * @param text - The text content to set for the specified element.
- * @returns void
- *
- * This function attempts to locate an element by its ID within the content of a given HTML template.
- * If the element is found, it updates the element's text content with the provided text.
- * If the element is not found, the function does nothing, ensuring that the operation is safe and does not throw errors.
- */
-function setElementText(template: HTMLTemplateElement, elementId: string, text: string): void {
-  const element = template.content.getElementById(elementId);
-  if (element) {
-    element.textContent = text;
-  }
-}
-
 async function initNotificationBar(message: NotificationBarWindowMessage) {
   const { initData } = message;
   if (!initData) {
@@ -232,189 +174,119 @@ async function initNotificationBar(message: NotificationBarWindowMessage) {
   notificationBarIframeInitData = initData;
   const {
     isVaultLocked,
-    removeIndividualVault: personalVaultDisallowed, // renamed to avoid local method collision
+    removeIndividualVault: personalVaultDisallowed,
     theme,
   } = notificationBarIframeInitData;
   const i18n = getI18n();
   const resolvedTheme = getResolvedTheme(theme ?? ThemeTypes.Light);
 
-  if (useComponentBar) {
-    const resolvedType = resolveNotificationType(notificationBarIframeInitData);
-    const headerMessage = getNotificationHeaderMessage(i18n, resolvedType);
-    const notificationTestId = getNotificationTestId(resolvedType);
-    appendHeaderMessageToTitle(headerMessage);
+  const resolvedType = resolveNotificationType(notificationBarIframeInitData);
+  const headerMessage = getNotificationHeaderMessage(i18n, resolvedType);
+  const notificationTestId = getNotificationTestId(resolvedType);
+  appendHeaderMessageToTitle(headerMessage);
 
-    document.body.innerHTML = "";
-    // Current implementations utilize a require for scss files which creates the need to remove the node.
-    document.head.querySelectorAll('link[rel="stylesheet"]').forEach((node) => node.remove());
+  document.body.innerHTML = "";
 
-    if (isVaultLocked) {
-      const notificationConfig = {
+  if (isVaultLocked) {
+    const notificationConfig = {
+      ...notificationBarIframeInitData,
+      headerMessage,
+      type: resolvedType,
+      notificationTestId,
+      theme: resolvedTheme,
+      personalVaultIsAllowed: !personalVaultDisallowed,
+      handleCloseNotification,
+      handleEditOrUpdateAction,
+      i18n,
+    };
+
+    const handleSaveAction = () => {
+      sendSaveCipherMessage(true);
+
+      render(
+        NotificationContainer({
+          ...notificationConfig,
+          handleSaveAction: () => {},
+          isLoading: true,
+        }),
+        document.body,
+      );
+    };
+
+    const UnlockNotification = NotificationContainer({ ...notificationConfig, handleSaveAction });
+
+    return render(UnlockNotification, document.body);
+  }
+
+  // Handle AtRiskPasswordNotification render
+  if (notificationBarIframeInitData.type === NotificationTypes.AtRiskPassword) {
+    return render(
+      AtRiskNotification({
+        ...notificationBarIframeInitData,
+        type: notificationBarIframeInitData.type as NotificationType,
+        theme: resolvedTheme,
+        i18n,
+        notificationTestId,
+        params: initData.params,
+        handleCloseNotification,
+      }),
+      document.body,
+    );
+  }
+
+  // Default scenario: add or update password
+  const orgId = selectedVaultSignal.get();
+
+  await Promise.all([
+    new Promise<OrgView[]>((resolve) => sendPlatformMessage({ command: "bgGetOrgData" }, resolve)),
+    new Promise<FolderView[]>((resolve) =>
+      sendPlatformMessage({ command: "bgGetFolderData" }, resolve),
+    ),
+    new Promise<NotificationCipherData[]>((resolve) =>
+      sendPlatformMessage({ command: "bgGetDecryptedCiphers" }, resolve),
+    ),
+    new Promise<CollectionView[]>((resolve) =>
+      sendPlatformMessage({ command: "bgGetCollectionData", orgId }, resolve),
+    ),
+  ]).then(([organizations, folders, ciphers, collections]) => {
+    notificationBarIframeInitData = {
+      ...notificationBarIframeInitData,
+      organizations,
+      folders,
+      ciphers,
+      collections,
+    };
+
+    // @TODO use context to avoid prop drilling
+    return render(
+      NotificationContainer({
         ...notificationBarIframeInitData,
         headerMessage,
         type: resolvedType,
-        notificationTestId,
         theme: resolvedTheme,
+        notificationTestId,
         personalVaultIsAllowed: !personalVaultDisallowed,
         handleCloseNotification,
+        handleSaveAction,
         handleEditOrUpdateAction,
         i18n,
-      };
+      }),
+      document.body,
+    );
+  });
 
-      const handleSaveAction = () => {
-        sendSaveCipherMessage(true);
-
-        render(
-          NotificationContainer({
-            ...notificationConfig,
-            handleSaveAction: () => {},
-            isLoading: true,
-          }),
-          document.body,
-        );
-      };
-
-      const UnlockNotification = NotificationContainer({ ...notificationConfig, handleSaveAction });
-
-      return render(UnlockNotification, document.body);
-    }
-
-    // Handle AtRiskPasswordNotification render
-    if (notificationBarIframeInitData.type === NotificationTypes.AtRiskPassword) {
-      return render(
-        AtRiskNotification({
-          ...notificationBarIframeInitData,
-          type: notificationBarIframeInitData.type as NotificationType,
-          theme: resolvedTheme,
-          i18n,
-          notificationTestId,
-          params: initData.params,
-          handleCloseNotification,
-        }),
-        document.body,
-      );
-    }
-
-    // Default scenario: add or update password
-    const orgId = selectedVaultSignal.get();
-
-    await Promise.all([
-      new Promise<OrgView[]>((resolve) =>
-        sendPlatformMessage({ command: "bgGetOrgData" }, resolve),
-      ),
-      new Promise<FolderView[]>((resolve) =>
-        sendPlatformMessage({ command: "bgGetFolderData" }, resolve),
-      ),
-      new Promise<NotificationCipherData[]>((resolve) =>
-        sendPlatformMessage({ command: "bgGetDecryptedCiphers" }, resolve),
-      ),
-      new Promise<CollectionView[]>((resolve) =>
-        sendPlatformMessage({ command: "bgGetCollectionData", orgId }, resolve),
-      ),
-    ]).then(([organizations, folders, ciphers, collections]) => {
-      notificationBarIframeInitData = {
-        ...notificationBarIframeInitData,
-        organizations,
-        folders,
-        ciphers,
-        collections,
-      };
-
-      // @TODO use context to avoid prop drilling
-      return render(
-        NotificationContainer({
-          ...notificationBarIframeInitData,
-          headerMessage,
-          type: resolvedType,
-          theme: resolvedTheme,
-          notificationTestId,
-          personalVaultIsAllowed: !personalVaultDisallowed,
-          handleCloseNotification,
-          handleSaveAction,
-          handleEditOrUpdateAction,
-          i18n,
-        }),
-        document.body,
-      );
-    });
-  } else {
-    setNotificationBarTheme();
-
-    (document.getElementById("logo") as HTMLImageElement).src = isVaultLocked
-      ? chrome.runtime.getURL("images/icon38_locked.png")
-      : chrome.runtime.getURL("images/icon38.png");
-
-    setupLogoLink(i18n.appName);
-
-    // i18n for "Add" template
-    const addTemplate = document.getElementById("template-add") as HTMLTemplateElement;
-
-    const neverButton = findElementById<HTMLButtonElement>(addTemplate, "never-save");
-    neverButton.textContent = i18n.never;
-
-    const selectFolder = findElementById<HTMLSelectElement>(addTemplate, "select-folder");
-    selectFolder.hidden = isVaultLocked || removeIndividualVault();
-    selectFolder.setAttribute("aria-label", i18n.folder);
-
-    const addButton = findElementById<HTMLButtonElement>(addTemplate, "add-save");
-    addButton.textContent = i18n.notificationAddSave;
-
-    const addEditButton = findElementById<HTMLButtonElement>(addTemplate, "add-edit");
-    // If Remove Individual Vault policy applies, "Add" opens the edit tab, so we hide the Edit button
-    addEditButton.hidden = removeIndividualVault();
-    addEditButton.textContent = i18n.notificationEdit;
-
-    setElementText(addTemplate, "add-text", i18n.notificationAddDesc);
-
-    // i18n for "Change" (update password) template
-    const changeTemplate = document.getElementById("template-change") as HTMLTemplateElement;
-
-    const changeButton = findElementById<HTMLSelectElement>(changeTemplate, "change-save");
-    changeButton.textContent = i18n.notificationUpdate;
-
-    const changeEditButton = findElementById<HTMLButtonElement>(changeTemplate, "change-edit");
-    changeEditButton.textContent = i18n.notificationEdit;
-
-    setElementText(changeTemplate, "change-text", i18n.notificationChangeDesc);
-
-    // i18n for "Unlock" (unlock extension) template
-    const unlockTemplate = document.getElementById("template-unlock") as HTMLTemplateElement;
-
-    const unlockButton = findElementById<HTMLButtonElement>(unlockTemplate, "unlock-vault");
-    unlockButton.textContent = i18n.notificationUnlock;
-
-    setElementText(unlockTemplate, "unlock-text", i18n.notificationUnlockDesc);
-
-    // i18n for body content
-    const closeButton = document.getElementById("close-button");
-    if (closeButton) {
-      closeButton.title = i18n.close;
-    }
-
-    const notificationType = initData.type;
-    if (notificationType === "add") {
-      handleTypeAdd();
-    } else if (notificationType === "change") {
-      handleTypeChange();
-    } else if (notificationType === "unlock") {
-      handleTypeUnlock();
-    }
-
-    closeButton?.addEventListener("click", handleCloseNotification);
-
-    globalThis.addEventListener("resize", adjustHeight);
-    adjustHeight();
-  }
   function handleEditOrUpdateAction(e: Event) {
     const notificationType = initData?.type;
     e.preventDefault();
     notificationType === "add" ? sendSaveCipherMessage(true) : sendSaveCipherMessage(false);
   }
 }
+
 function handleCloseNotification(e: Event) {
   e.preventDefault();
   sendPlatformMessage({
     command: "bgCloseNotificationBar",
+    fadeOutNotification: true,
   });
 }
 
@@ -439,57 +311,6 @@ function handleSaveAction(e: Event) {
   }
 }
 
-function handleTypeAdd() {
-  setContent(document.getElementById("template-add") as HTMLTemplateElement);
-
-  const addButton = document.getElementById("add-save");
-  addButton?.addEventListener("click", (e) => {
-    e.preventDefault();
-
-    // If Remove Individual Vault policy applies, "Add" opens the edit tab
-    sendSaveCipherMessage(removeIndividualVault(), getSelectedFolder());
-  });
-
-  if (removeIndividualVault()) {
-    // Everything past this point is only required if user has an individual vault
-    return;
-  }
-
-  const editButton = document.getElementById("add-edit");
-  editButton?.addEventListener("click", (e) => {
-    e.preventDefault();
-
-    sendSaveCipherMessage(true, getSelectedFolder());
-  });
-
-  const neverButton = document.getElementById("never-save");
-  neverButton?.addEventListener("click", (e) => {
-    e.preventDefault();
-    sendPlatformMessage({
-      command: "bgNeverSave",
-    });
-  });
-
-  loadFolderSelector();
-}
-
-function handleTypeChange() {
-  setContent(document.getElementById("template-change") as HTMLTemplateElement);
-  const changeButton = document.getElementById("change-save");
-  changeButton?.addEventListener("click", (e) => {
-    e.preventDefault();
-
-    sendSaveCipherMessage(false);
-  });
-
-  const editButton = document.getElementById("change-edit");
-  editButton?.addEventListener("click", (e) => {
-    e.preventDefault();
-
-    sendSaveCipherMessage(true);
-  });
-}
-
 function sendSaveCipherMessage(edit: boolean, folder?: string) {
   sendPlatformMessage({
     command: "bgSaveCipher",
@@ -498,36 +319,6 @@ function sendSaveCipherMessage(edit: boolean, folder?: string) {
   });
 }
 
-function handleSaveCipherAttemptCompletedMessage(message: NotificationBarWindowMessage) {
-  const addSaveButtonContainers = document.querySelectorAll(".add-change-cipher-buttons");
-  const notificationBarOuterWrapper = document.getElementById("notification-bar-outer-wrapper");
-  if (message?.error) {
-    addSaveButtonContainers.forEach((element) => {
-      element.textContent = chrome.i18n.getMessage("saveCipherAttemptFailed");
-      element.classList.add("error-message");
-      notificationBarOuterWrapper?.classList.add("error-event");
-    });
-
-    adjustHeight();
-    logService.error(`Error encountered when saving credentials: ${message.error}`);
-    return;
-  }
-  const messageName =
-    notificationBarIframeInitData.type === "add" ? "passwordSaved" : "passwordUpdated";
-
-  addSaveButtonContainers.forEach((element) => {
-    element.textContent = chrome.i18n.getMessage(messageName);
-    element.prepend(buildSvgDomElement(circleCheckIcon));
-    element.classList.add("success-message");
-    notificationBarOuterWrapper?.classList.add("success-event");
-  });
-  adjustHeight();
-  globalThis.setTimeout(
-    () => sendPlatformMessage({ command: "bgCloseNotificationBar", fadeOutNotification: true }),
-    3000,
-  );
-}
-
 function openAddEditVaultItemPopout(
   e: Event,
   options: {
@@ -583,27 +374,6 @@ function handleSaveCipherConfirmation(message: NotificationBarWindowMessage) {
   );
 }
 
-function handleTypeUnlock() {
-  setContent(document.getElementById("template-unlock") as HTMLTemplateElement);
-
-  const unlockButton = document.getElementById("unlock-vault");
-  unlockButton?.addEventListener("click", (e) => {
-    sendPlatformMessage({
-      command: "bgReopenUnlockPopout",
-    });
-  });
-}
-
-function setContent(template: HTMLTemplateElement) {
-  const content = document.getElementById("content");
-  while (content?.firstChild) {
-    content?.removeChild(content.firstChild);
-  }
-
-  const newElement = template.content.cloneNode(true) as HTMLElement;
-  content?.appendChild(newElement);
-}
-
 function sendPlatformMessage(
   msg: Record<string, unknown>,
   responseCallback?: (response: any) => void,
@@ -615,51 +385,10 @@ function sendPlatformMessage(
   });
 }
 
-function loadFolderSelector() {
-  const populateFolderData = (folderData: FolderView[]) => {
-    const select = document.getElementById("select-folder");
-    if (!select) {
-      return;
-    }
-
-    if (!folderData?.length) {
-      select.appendChild(new Option(chrome.i18n.getMessage("noFoldersFound"), undefined, true));
-      select.setAttribute("disabled", "true");
-      return;
-    }
-
-    select.appendChild(new Option(chrome.i18n.getMessage("selectFolder"), undefined, true));
-    folderData.forEach((folder: FolderView) => {
-      // Select "No Folder" (id=null) folder by default
-      select.appendChild(new Option(folder.name, folder.id || "", false));
-    });
-  };
-
-  sendPlatformMessage({ command: "bgGetFolderData" }, populateFolderData);
-}
-
-function getSelectedFolder(): string {
-  return (document.getElementById("select-folder") as HTMLSelectElement).value;
-}
-
 function removeIndividualVault(): boolean {
   return Boolean(notificationBarIframeInitData?.removeIndividualVault);
 }
 
-function adjustHeight() {
-  const body = document.querySelector("body");
-  if (!body) {
-    return;
-  }
-  const data: AdjustNotificationBarMessageData = {
-    height: body.scrollHeight,
-  };
-  sendPlatformMessage({
-    command: "bgAdjustNotificationBar",
-    data,
-  });
-}
-
 function setupWindowMessageListener() {
   globalThis.addEventListener("message", handleWindowMessage);
 }
@@ -682,18 +411,6 @@ function handleWindowMessage(event: MessageEvent) {
   handler({ message });
 }
 
-function setupLogoLink(linkText: string) {
-  const logoLink = document.getElementById("logo-link") as HTMLAnchorElement;
-  logoLink.title = linkText;
-  const setWebVaultUrlLink = (webVaultURL: string) => {
-    const newVaultURL = webVaultURL && decodeURIComponent(webVaultURL);
-    if (newVaultURL && newVaultURL !== logoLink.href) {
-      logoLink.href = newVaultURL;
-    }
-  };
-  sendPlatformMessage({ command: "getWebVaultUrlForNotification" }, setWebVaultUrlLink);
-}
-
 function getTheme(globalThis: any, theme: NotificationBarIframeInitData["theme"]) {
   if (theme === ThemeTypes.System) {
     return globalThis.matchMedia("(prefers-color-scheme: dark)").matches
@@ -712,12 +429,6 @@ function getResolvedTheme(theme: Theme) {
   return resolvedTheme;
 }
 
-function setNotificationBarTheme() {
-  const theme = getTheme(globalThis, notificationBarIframeInitData.theme);
-
-  document.documentElement.classList.add(`theme_${theme}`);
-}
-
 function postMessageToParent(message: NotificationBarWindowMessage) {
   globalThis.parent.postMessage(message, windowMessageOrigin || "*");
 }
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 7bdde2560d0..e5bafe34b5f 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
@@ -3,7 +3,7 @@
 exports[`OverlayNotificationsContentService opening the notification bar creates the notification bar elements and appends them to the body 1`] = `
 <div
   id="bit-notification-bar"
-  style="height: 82px !important; width: 430px !important; max-width: calc(100% - 20px) !important; min-height: initial !important; top: 10px !important; right: 10px !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;"
+  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"
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 7339325bd93..9f344a92bfc 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
@@ -1,11 +1,11 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
 import AutofillInit from "../../../content/autofill-init";
+import { NotificationType } from "../../../enums/notification-type.enum";
 import { DomQueryService } from "../../../services/abstractions/dom-query.service";
 import DomElementVisibilityService from "../../../services/dom-element-visibility.service";
 import { flushPromises, sendMockExtensionMessage } from "../../../spec/testing-utils";
 import * as utils from "../../../utils";
-import { sendExtensionMessage } from "../../../utils";
 import { NotificationTypeData } from "../abstractions/overlay-notifications-content.service";
 
 import { OverlayNotificationsContentService } from "./overlay-notifications-content.service";
@@ -19,11 +19,7 @@ describe("OverlayNotificationsContentService", () => {
 
   beforeEach(() => {
     jest.useFakeTimers();
-    jest
-      .spyOn(utils, "sendExtensionMessage")
-      .mockImplementation((command: string) =>
-        Promise.resolve(command === "notificationRefreshFlagValue" ? false : true),
-      );
+    jest.spyOn(utils, "sendExtensionMessage").mockImplementation(jest.fn());
     domQueryService = mock<DomQueryService>();
     domElementVisibilityService = new DomElementVisibilityService();
     overlayNotificationsContentService = new OverlayNotificationsContentService();
@@ -51,37 +47,6 @@ describe("OverlayNotificationsContentService", () => {
       expect(bodyAppendChildSpy).not.toHaveBeenCalled();
     });
 
-    it("applies correct styles when notificationRefreshFlag is true", async () => {
-      (sendExtensionMessage as jest.Mock).mockResolvedValue(true);
-      sendMockExtensionMessage({
-        command: "openNotificationBar",
-        data: {
-          type: "change",
-          typeData: mock<NotificationTypeData>(),
-        },
-      });
-      await flushPromises();
-
-      const barElement = overlayNotificationsContentService["notificationBarElement"]!;
-      expect(barElement.style.height).toBe("400px");
-      expect(barElement.style.right).toBe("0px");
-    });
-
-    it("applies correct styles when notificationRefreshFlag is false", async () => {
-      sendMockExtensionMessage({
-        command: "openNotificationBar",
-        data: {
-          type: "change",
-          typeData: mock<NotificationTypeData>(),
-        },
-      });
-      await flushPromises();
-
-      const barElement = overlayNotificationsContentService["notificationBarElement"]!;
-      expect(barElement.style.height).toBe("82px");
-      expect(barElement.style.right).toBe("10px");
-    });
-
     it("closes the notification bar if the notification bar type has changed", async () => {
       overlayNotificationsContentService["currentNotificationBarType"] = "add";
       const closeNotificationBarSpy = jest.spyOn(
@@ -92,7 +57,7 @@ describe("OverlayNotificationsContentService", () => {
       sendMockExtensionMessage({
         command: "openNotificationBar",
         data: {
-          type: "change",
+          type: NotificationType.ChangePassword,
           typeData: mock<NotificationTypeData>(),
         },
       });
@@ -105,7 +70,7 @@ describe("OverlayNotificationsContentService", () => {
       sendMockExtensionMessage({
         command: "openNotificationBar",
         data: {
-          type: "change",
+          type: NotificationType.ChangePassword,
           typeData: mock<NotificationTypeData>(),
         },
       });
@@ -118,7 +83,7 @@ describe("OverlayNotificationsContentService", () => {
       sendMockExtensionMessage({
         command: "openNotificationBar",
         data: {
-          type: "change",
+          type: NotificationType.ChangePassword,
           typeData: mock<NotificationTypeData>({
             launchTimestamp: Date.now(),
           }),
@@ -135,7 +100,7 @@ describe("OverlayNotificationsContentService", () => {
       sendMockExtensionMessage({
         command: "openNotificationBar",
         data: {
-          type: "change",
+          type: NotificationType.ChangePassword,
           typeData: mock<NotificationTypeData>(),
         },
       });
@@ -154,7 +119,7 @@ describe("OverlayNotificationsContentService", () => {
       sendMockExtensionMessage({
         command: "openNotificationBar",
         data: {
-          type: "change",
+          type: NotificationType.ChangePassword,
           typeData: mock<NotificationTypeData>(),
         },
       });
@@ -211,8 +176,21 @@ describe("OverlayNotificationsContentService", () => {
       ).toBe("0");
 
       jest.advanceTimersByTime(150);
+    });
 
-      expect(sendExtensionMessage).toHaveBeenCalledWith("bgRemoveTabFromNotificationQueue");
+    it("triggers a fadeout of the notification bar and removes from the notification queue", () => {
+      sendMockExtensionMessage({
+        command: "closeNotificationBar",
+        data: { fadeOutNotification: true, type: NotificationType.ChangePassword },
+      });
+
+      expect(
+        overlayNotificationsContentService["notificationBarIframeElement"]?.style.opacity,
+      ).toBe("0");
+
+      jest.advanceTimersByTime(150);
+
+      expect(utils.sendExtensionMessage).toHaveBeenCalledWith("bgRemoveTabFromNotificationQueue");
     });
 
     it("closes the notification bar without a fadeout", () => {
@@ -232,7 +210,7 @@ describe("OverlayNotificationsContentService", () => {
       sendMockExtensionMessage({
         command: "openNotificationBar",
         data: {
-          type: "change",
+          type: NotificationType.ChangePassword,
           typeData: mock<NotificationTypeData>(),
         },
       });
@@ -256,7 +234,7 @@ describe("OverlayNotificationsContentService", () => {
       sendMockExtensionMessage({
         command: "openNotificationBar",
         data: {
-          type: "change",
+          type: NotificationType.ChangePassword,
           typeData: mock<NotificationTypeData>(),
         },
       });
@@ -286,7 +264,7 @@ describe("OverlayNotificationsContentService", () => {
       sendMockExtensionMessage({
         command: "openNotificationBar",
         data: {
-          type: "change",
+          type: NotificationType.ChangePassword,
           typeData: mock<NotificationTypeData>(),
         },
       });
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 c50b30b7f70..4e09c3186bb 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
@@ -20,33 +20,25 @@ export class OverlayNotificationsContentService
   private notificationBarElement: HTMLElement | null = null;
   private notificationBarIframeElement: HTMLIFrameElement | null = null;
   private currentNotificationBarType: NotificationType | null = null;
-  private notificationRefreshFlag: boolean = false;
-  private getNotificationBarStyles(): Partial<CSSStyleDeclaration> {
-    const styles: Partial<CSSStyleDeclaration> = {
-      height: "400px",
-      width: "430px",
-      maxWidth: "calc(100% - 20px)",
-      minHeight: "initial",
-      top: "10px",
-      right: "0px",
-      padding: "0",
-      position: "fixed",
-      zIndex: "2147483647",
-      visibility: "visible",
-      borderRadius: "4px",
-      border: "none",
-      backgroundColor: "transparent",
-      overflow: "hidden",
-      transition: "box-shadow 0.15s ease",
-      transitionDelay: "0.15s",
-    };
+  private notificationBarContainerStyles: Partial<CSSStyleDeclaration> = {
+    height: "400px",
+    width: "430px",
+    maxWidth: "calc(100% - 20px)",
+    minHeight: "initial",
+    top: "10px",
+    right: "0px",
+    padding: "0",
+    position: "fixed",
+    zIndex: "2147483647",
+    visibility: "visible",
+    borderRadius: "4px",
+    border: "none",
+    backgroundColor: "transparent",
+    overflow: "hidden",
+    transition: "box-shadow 0.15s ease",
+    transitionDelay: "0.15s",
+  };
 
-    if (!this.notificationRefreshFlag) {
-      styles.height = "82px";
-      styles.right = "10px";
-    }
-    return styles;
-  }
   private notificationBarIframeElementStyles: Partial<CSSStyleDeclaration> = {
     width: "100%",
     height: "100%",
@@ -57,6 +49,7 @@ export class OverlayNotificationsContentService
     borderRadius: "4px",
     colorScheme: "auto",
   };
+
   private readonly extensionMessageHandlers: OverlayNotificationsExtensionMessageHandlers = {
     openNotificationBar: ({ message }) => this.handleOpenNotificationBarMessage(message),
     closeNotificationBar: ({ message }) => this.handleCloseNotificationBarMessage(message),
@@ -91,6 +84,7 @@ export class OverlayNotificationsContentService
     if (this.currentNotificationBarType && type !== this.currentNotificationBarType) {
       this.closeNotificationBar();
     }
+
     const initData = {
       type: type as NotificationType,
       isVaultLocked: typeData.isVaultLocked,
@@ -101,10 +95,6 @@ export class OverlayNotificationsContentService
       params,
     };
 
-    await sendExtensionMessage("notificationRefreshFlagValue").then((notificationRefreshFlag) => {
-      this.notificationRefreshFlag = !!notificationRefreshFlag;
-    });
-
     if (globalThis.document.readyState === "loading") {
       document.addEventListener("DOMContentLoaded", () => this.openNotificationBar(initData));
       return;
@@ -215,14 +205,8 @@ export class OverlayNotificationsContentService
       { transform: "translateX(0)", opacity: "1" },
       true,
     );
-    if (!this.notificationRefreshFlag) {
-      setElementStyles(
-        this.notificationBarElement,
-        { boxShadow: "2px 4px 6px 0px #0000001A" },
-        true,
-      );
-    }
-    this.notificationBarIframeElement.removeEventListener(
+
+    this.notificationBarIframeElement?.removeEventListener(
       EVENTS.LOAD,
       this.handleNotificationBarIframeOnLoad,
     );
@@ -236,7 +220,7 @@ export class OverlayNotificationsContentService
       this.notificationBarElement = globalThis.document.createElement("div");
       this.notificationBarElement.id = "bit-notification-bar";
 
-      setElementStyles(this.notificationBarElement, this.getNotificationBarStyles(), true);
+      setElementStyles(this.notificationBarElement, this.notificationBarContainerStyles, true);
 
       this.notificationBarElement.appendChild(this.notificationBarIframeElement);
     }
diff --git a/apps/browser/src/autofill/popup/settings/autofill.component.html b/apps/browser/src/autofill/popup/settings/autofill.component.html
index 9ba27d87ece..40dd013bbf4 100644
--- a/apps/browser/src/autofill/popup/settings/autofill.component.html
+++ b/apps/browser/src/autofill/popup/settings/autofill.component.html
@@ -279,7 +279,7 @@
     <bit-section disableMargin>
       <bit-item>
         <a bit-item-content routerLink="/blocked-domains">{{ "blockedDomains" | i18n }}</a>
-        <i slot="end" class="bwi bwi-angle-right bwi-lg row-sub-icon" aria-hidden="true"></i>
+        <i slot="end" class="bwi bwi-angle-right bwi-lg" aria-hidden="true"></i>
       </bit-item>
     </bit-section>
   </div>
diff --git a/apps/browser/src/autofill/popup/settings/notifications.component.html b/apps/browser/src/autofill/popup/settings/notifications.component.html
index 385db8c059b..f7306cb672b 100644
--- a/apps/browser/src/autofill/popup/settings/notifications.component.html
+++ b/apps/browser/src/autofill/popup/settings/notifications.component.html
@@ -50,7 +50,7 @@
     <bit-section disableMargin>
       <bit-item>
         <a bit-item-content routerLink="/excluded-domains">{{ "excludedDomains" | i18n }}</a>
-        <i slot="end" class="bwi bwi-angle-right row-sub-icon" aria-hidden="true"></i>
+        <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
       </bit-item>
     </bit-section>
   </div>
diff --git a/apps/browser/src/autofill/services/abstractions/autofill.service.ts b/apps/browser/src/autofill/services/abstractions/autofill.service.ts
index daafd871789..09e22e278be 100644
--- a/apps/browser/src/autofill/services/abstractions/autofill.service.ts
+++ b/apps/browser/src/autofill/services/abstractions/autofill.service.ts
@@ -25,12 +25,12 @@ export interface AutoFillOptions {
   tab: chrome.tabs.Tab;
   skipUsernameOnlyFill?: boolean;
   onlyEmptyFields?: boolean;
-  onlyVisibleFields?: boolean;
   fillNewPassword?: boolean;
   skipLastUsed?: boolean;
   allowUntrustedIframe?: boolean;
   allowTotpAutofill?: boolean;
   autoSubmitLogin?: boolean;
+  focusedFieldForm?: string;
 }
 
 export interface FormData {
@@ -43,7 +43,6 @@ export interface FormData {
 export interface GenerateFillScriptOptions {
   skipUsernameOnlyFill: boolean;
   onlyEmptyFields: boolean;
-  onlyVisibleFields: boolean;
   fillNewPassword: boolean;
   allowTotpAutofill: boolean;
   autoSubmitLogin: boolean;
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-overlay-content.service.ts b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
index 51b7c8c603c..656516d1119 100644
--- a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
+++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
@@ -83,8 +83,8 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
     unsetMostRecentlyFocusedField: () => this.unsetMostRecentlyFocusedField(),
     checkIsMostRecentlyFocusedFieldWithinViewport: () =>
       this.checkIsMostRecentlyFocusedFieldWithinViewport(),
-    bgUnlockPopoutOpened: () => this.blurMostRecentlyFocusedField(true),
     bgVaultItemRepromptPopoutOpened: () => this.blurMostRecentlyFocusedField(true),
+    bgUnlockPopoutOpened: () => this.blurMostRecentlyFocusedField(true),
     redirectAutofillInlineMenuFocusOut: ({ message }) =>
       this.redirectInlineMenuFocusOut(message?.data?.direction),
     getSubFrameOffsets: ({ message }) => this.getSubFrameOffsets(message),
@@ -974,6 +974,7 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
       inlineMenuFillType: autofillFieldData?.inlineMenuFillType,
       showPasskeys: !!autofillFieldData?.showPasskeys,
       accountCreationFieldType: autofillFieldData?.accountCreationFieldType,
+      focusedFieldForm: autofillFieldData?.form,
     };
 
     const allFields = this.formFieldElements;
diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts
index 663ae2ea569..f0ae8856ecd 100644
--- a/apps/browser/src/autofill/services/autofill.service.spec.ts
+++ b/apps/browser/src/autofill/services/autofill.service.spec.ts
@@ -741,7 +741,6 @@ describe("AutofillService", () => {
         {
           skipUsernameOnlyFill: autofillOptions.skipUsernameOnlyFill || false,
           onlyEmptyFields: autofillOptions.onlyEmptyFields || false,
-          onlyVisibleFields: autofillOptions.onlyVisibleFields || false,
           fillNewPassword: autofillOptions.fillNewPassword || false,
           allowTotpAutofill: autofillOptions.allowTotpAutofill || false,
           autoSubmitLogin: autofillOptions.allowTotpAutofill || false,
@@ -1070,7 +1069,6 @@ describe("AutofillService", () => {
           skipLastUsed: !fromCommand,
           skipUsernameOnlyFill: !fromCommand,
           onlyEmptyFields: !fromCommand,
-          onlyVisibleFields: !fromCommand,
           fillNewPassword: fromCommand,
           allowUntrustedIframe: fromCommand,
           allowTotpAutofill: fromCommand,
@@ -1100,7 +1098,6 @@ describe("AutofillService", () => {
           skipLastUsed: !fromCommand,
           skipUsernameOnlyFill: !fromCommand,
           onlyEmptyFields: !fromCommand,
-          onlyVisibleFields: !fromCommand,
           fillNewPassword: fromCommand,
           allowUntrustedIframe: fromCommand,
           allowTotpAutofill: fromCommand,
@@ -1127,7 +1124,6 @@ describe("AutofillService", () => {
           skipLastUsed: !fromCommand,
           skipUsernameOnlyFill: !fromCommand,
           onlyEmptyFields: !fromCommand,
-          onlyVisibleFields: !fromCommand,
           fillNewPassword: fromCommand,
           allowUntrustedIframe: fromCommand,
           allowTotpAutofill: fromCommand,
@@ -1306,7 +1302,6 @@ describe("AutofillService", () => {
         skipLastUsed: false,
         skipUsernameOnlyFill: false,
         onlyEmptyFields: false,
-        onlyVisibleFields: false,
         fillNewPassword: false,
         allowUntrustedIframe: true,
         allowTotpAutofill: false,
@@ -1353,7 +1348,6 @@ describe("AutofillService", () => {
         skipLastUsed: false,
         skipUsernameOnlyFill: false,
         onlyEmptyFields: false,
-        onlyVisibleFields: false,
         fillNewPassword: false,
         allowUntrustedIframe: true,
         allowTotpAutofill: false,
@@ -1903,23 +1897,14 @@ describe("AutofillService", () => {
           options,
         );
 
-        expect(AutofillService.loadPasswordFields).toHaveBeenCalledTimes(2);
-        expect(AutofillService.loadPasswordFields).toHaveBeenNthCalledWith(
-          1,
+        expect(AutofillService.loadPasswordFields).toHaveBeenCalledTimes(1);
+        expect(AutofillService.loadPasswordFields).toHaveBeenCalledWith(
           pageDetails,
           false,
           false,
           options.onlyEmptyFields,
           options.fillNewPassword,
         );
-        expect(AutofillService.loadPasswordFields).toHaveBeenNthCalledWith(
-          2,
-          pageDetails,
-          true,
-          true,
-          options.onlyEmptyFields,
-          options.fillNewPassword,
-        );
       });
 
       describe("given a valid list of forms within the passed page details", () => {
@@ -1932,36 +1917,7 @@ describe("AutofillService", () => {
           jest.spyOn(autofillService as any, "findTotpField");
         });
 
-        it("will attempt to find a username field from hidden fields if no visible username fields are found", async () => {
-          await autofillService["generateLoginFillScript"](
-            fillScript,
-            pageDetails,
-            filledFields,
-            options,
-          );
-
-          expect(autofillService["findUsernameField"]).toHaveBeenCalledTimes(2);
-          expect(autofillService["findUsernameField"]).toHaveBeenNthCalledWith(
-            1,
-            pageDetails,
-            passwordField,
-            false,
-            false,
-            false,
-          );
-          expect(autofillService["findUsernameField"]).toHaveBeenNthCalledWith(
-            2,
-            pageDetails,
-            passwordField,
-            true,
-            true,
-            false,
-          );
-        });
-
-        it("will not attempt to find a username field from hidden fields if the passed options indicate only visible fields should be referenced", async () => {
-          options.onlyVisibleFields = true;
-
+        it("will attempt to find a username field from visible fields", async () => {
           await autofillService["generateLoginFillScript"](
             fillScript,
             pageDetails,
@@ -1970,25 +1926,16 @@ describe("AutofillService", () => {
           );
 
           expect(autofillService["findUsernameField"]).toHaveBeenCalledTimes(1);
-          expect(autofillService["findUsernameField"]).toHaveBeenNthCalledWith(
-            1,
+          expect(autofillService["findUsernameField"]).toHaveBeenCalledWith(
             pageDetails,
             passwordField,
             false,
             false,
             false,
           );
-          expect(autofillService["findUsernameField"]).not.toHaveBeenNthCalledWith(
-            2,
-            pageDetails,
-            passwordField,
-            true,
-            true,
-            false,
-          );
         });
 
-        it("will attempt to find a totp field from hidden fields if no visible totp fields are found", async () => {
+        it("will attempt to find a totp field from visible fields", async () => {
           options.allowTotpAutofill = true;
           await autofillService["generateLoginFillScript"](
             fillScript,
@@ -1997,53 +1944,14 @@ describe("AutofillService", () => {
             options,
           );
 
-          expect(autofillService["findTotpField"]).toHaveBeenCalledTimes(2);
-          expect(autofillService["findTotpField"]).toHaveBeenNthCalledWith(
-            1,
-            pageDetails,
-            passwordField,
-            false,
-            false,
-            false,
-          );
-          expect(autofillService["findTotpField"]).toHaveBeenNthCalledWith(
-            2,
-            pageDetails,
-            passwordField,
-            true,
-            true,
-            false,
-          );
-        });
-
-        it("will not attempt to find a totp field from hidden fields if the passed options indicate only visible fields should be referenced", async () => {
-          options.allowTotpAutofill = true;
-          options.onlyVisibleFields = true;
-
-          await autofillService["generateLoginFillScript"](
-            fillScript,
-            pageDetails,
-            filledFields,
-            options,
-          );
-
           expect(autofillService["findTotpField"]).toHaveBeenCalledTimes(1);
-          expect(autofillService["findTotpField"]).toHaveBeenNthCalledWith(
-            1,
+          expect(autofillService["findTotpField"]).toHaveBeenCalledWith(
             pageDetails,
             passwordField,
             false,
             false,
             false,
           );
-          expect(autofillService["findTotpField"]).not.toHaveBeenNthCalledWith(
-            2,
-            pageDetails,
-            passwordField,
-            true,
-            true,
-            false,
-          );
         });
 
         it("will not attempt to find a totp field from hidden fields if the passed options do not allow for TOTP values to be filled", async () => {
@@ -2085,7 +1993,7 @@ describe("AutofillService", () => {
           );
         });
 
-        it("will attempt to match a password field that does not contain a form to a username field that is not visible", async () => {
+        it("will not attempt to match a password field that does not contain a form to a username field that is not visible", async () => {
           usernameField.viewable = false;
           usernameField.readonly = true;
 
@@ -2096,54 +2004,14 @@ describe("AutofillService", () => {
             options,
           );
 
-          expect(autofillService["findUsernameField"]).toHaveBeenCalledTimes(2);
-          expect(autofillService["findUsernameField"]).toHaveBeenNthCalledWith(
-            1,
-            pageDetails,
-            passwordField,
-            false,
-            false,
-            true,
-          );
-          expect(autofillService["findUsernameField"]).toHaveBeenNthCalledWith(
-            2,
-            pageDetails,
-            passwordField,
-            true,
-            true,
-            true,
-          );
-        });
-
-        it("will not attempt to match a password field that does not contain a form to a username field that is not visible if the passed options indicate only visible fields", async () => {
-          usernameField.viewable = false;
-          usernameField.readonly = true;
-          options.onlyVisibleFields = true;
-
-          await autofillService["generateLoginFillScript"](
-            fillScript,
-            pageDetails,
-            filledFields,
-            options,
-          );
-
           expect(autofillService["findUsernameField"]).toHaveBeenCalledTimes(1);
-          expect(autofillService["findUsernameField"]).toHaveBeenNthCalledWith(
-            1,
+          expect(autofillService["findUsernameField"]).toHaveBeenCalledWith(
             pageDetails,
             passwordField,
             false,
             false,
             true,
           );
-          expect(autofillService["findUsernameField"]).not.toHaveBeenNthCalledWith(
-            2,
-            pageDetails,
-            passwordField,
-            true,
-            true,
-            true,
-          );
         });
 
         it("will attempt to match a password field that does not contain a form to a TOTP field", async () => {
@@ -2166,8 +2034,7 @@ describe("AutofillService", () => {
           );
         });
 
-        it("will attempt to match a password field that does not contain a form to a TOTP field that is not visible", async () => {
-          options.onlyVisibleFields = false;
+        it("will not attempt to match a password field that does not contain a form to a TOTP field that is not visible", async () => {
           options.allowTotpAutofill = true;
           totpField.viewable = false;
           totpField.readonly = true;
@@ -2179,7 +2046,7 @@ describe("AutofillService", () => {
             options,
           );
 
-          expect(autofillService["findTotpField"]).toHaveBeenCalledTimes(2);
+          expect(autofillService["findTotpField"]).toHaveBeenCalledTimes(1);
           expect(autofillService["findTotpField"]).toHaveBeenNthCalledWith(
             1,
             pageDetails,
@@ -2188,14 +2055,6 @@ describe("AutofillService", () => {
             false,
             true,
           );
-          expect(autofillService["findTotpField"]).toHaveBeenNthCalledWith(
-            2,
-            pageDetails,
-            passwordField,
-            true,
-            true,
-            true,
-          );
         });
       });
 
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index 2b15d8fd587..0e238d14d23 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -434,10 +434,17 @@ export default class AutofillService implements AutofillServiceInterface {
           return;
         }
 
-        const fillScript = await this.generateFillScript(pd.details, {
+        // If we have a focused form, filter the page details to only include fields from that form
+        const details = options.focusedFieldForm
+          ? {
+              ...pd.details,
+              fields: pd.details.fields.filter((f) => f.form === options.focusedFieldForm),
+            }
+          : pd.details;
+
+        const fillScript = await this.generateFillScript(details, {
           skipUsernameOnlyFill: options.skipUsernameOnlyFill || false,
           onlyEmptyFields: options.onlyEmptyFields || false,
-          onlyVisibleFields: options.onlyVisibleFields || false,
           fillNewPassword: options.fillNewPassword || false,
           allowTotpAutofill: options.allowTotpAutofill || false,
           autoSubmitLogin: options.autoSubmitLogin || false,
@@ -571,7 +578,6 @@ export default class AutofillService implements AutofillServiceInterface {
       skipLastUsed: !fromCommand,
       skipUsernameOnlyFill: !fromCommand,
       onlyEmptyFields: !fromCommand,
-      onlyVisibleFields: !fromCommand,
       fillNewPassword: fromCommand,
       allowUntrustedIframe: fromCommand,
       allowTotpAutofill: fromCommand,
@@ -676,7 +682,6 @@ export default class AutofillService implements AutofillServiceInterface {
       skipLastUsed: !fromCommand,
       skipUsernameOnlyFill: !fromCommand,
       onlyEmptyFields: !fromCommand,
-      onlyVisibleFields: !fromCommand,
       fillNewPassword: false,
       allowUntrustedIframe: fromCommand,
       allowTotpAutofill: false,
@@ -843,23 +848,13 @@ export default class AutofillService implements AutofillServiceInterface {
 
     fillScript.untrustedIframe = await this.inUntrustedIframe(pageDetails.url, options);
 
-    let passwordFields = AutofillService.loadPasswordFields(
+    const passwordFields = AutofillService.loadPasswordFields(
       pageDetails,
       false,
       false,
       options.onlyEmptyFields,
       options.fillNewPassword,
     );
-    if (!passwordFields.length && !options.onlyVisibleFields) {
-      // not able to find any viewable password fields. maybe there are some "hidden" ones?
-      passwordFields = AutofillService.loadPasswordFields(
-        pageDetails,
-        true,
-        true,
-        options.onlyEmptyFields,
-        options.fillNewPassword,
-      );
-    }
 
     for (const formKey in pageDetails.forms) {
       // eslint-disable-next-line
@@ -874,11 +869,6 @@ export default class AutofillService implements AutofillServiceInterface {
         if (login.username) {
           username = this.findUsernameField(pageDetails, pf, false, false, false);
 
-          if (!username && !options.onlyVisibleFields) {
-            // not able to find any viewable username fields. maybe there are some "hidden" ones?
-            username = this.findUsernameField(pageDetails, pf, true, true, false);
-          }
-
           if (username) {
             usernames.push(username);
           }
@@ -887,11 +877,6 @@ export default class AutofillService implements AutofillServiceInterface {
         if (options.allowTotpAutofill && login.totp) {
           totp = this.findTotpField(pageDetails, pf, false, false, false);
 
-          if (!totp && !options.onlyVisibleFields) {
-            // not able to find any viewable totp fields. maybe there are some "hidden" ones?
-            totp = this.findTotpField(pageDetails, pf, true, true, false);
-          }
-
           if (totp) {
             totps.push(totp);
           }
@@ -909,11 +894,6 @@ export default class AutofillService implements AutofillServiceInterface {
       if (login.username && pf.elementNumber > 0) {
         username = this.findUsernameField(pageDetails, pf, false, false, true);
 
-        if (!username && !options.onlyVisibleFields) {
-          // not able to find any viewable username fields. maybe there are some "hidden" ones?
-          username = this.findUsernameField(pageDetails, pf, true, true, true);
-        }
-
         if (username) {
           usernames.push(username);
         }
@@ -922,11 +902,6 @@ export default class AutofillService implements AutofillServiceInterface {
       if (options.allowTotpAutofill && login.totp && pf.elementNumber > 0) {
         totp = this.findTotpField(pageDetails, pf, false, false, true);
 
-        if (!totp && !options.onlyVisibleFields) {
-          // not able to find any viewable username fields. maybe there are some "hidden" ones?
-          totp = this.findTotpField(pageDetails, pf, true, true, true);
-        }
-
         if (totp) {
           totps.push(totp);
         }
@@ -997,7 +972,7 @@ export default class AutofillService implements AutofillServiceInterface {
       fillScript.autosubmit = Array.from(formElementsSet);
     }
 
-    if (options.allowTotpAutofill) {
+    if (options.allowTotpAutofill && login?.totp) {
       await Promise.all(
         totps.map(async (t, i) => {
           if (Object.prototype.hasOwnProperty.call(filledFields, t.opid)) {
@@ -1005,10 +980,10 @@ export default class AutofillService implements AutofillServiceInterface {
           }
 
           filledFields[t.opid] = t;
-          const totpResponse = await firstValueFrom(
-            this.totpService.getCode$(options.cipher.login.totp),
-          );
+
+          const totpResponse = await firstValueFrom(this.totpService.getCode$(login.totp));
           let totpValue = totpResponse.code;
+
           if (totpValue.length == totps.length) {
             totpValue = totpValue.charAt(i);
           }
@@ -2546,6 +2521,7 @@ export default class AutofillService implements AutofillServiceInterface {
       "label-tag",
       "placeholder",
       "label-left",
+      "label-right",
       "label-top",
       "label-aria",
       "dataSetValues",
@@ -2642,7 +2618,7 @@ export default class AutofillService implements AutofillServiceInterface {
   }
 
   /**
-   * Updates a fill script to place the `cilck_on_opid`, `focus_on_opid`, and `fill_by_opid`
+   * Updates a fill script to place the `click_on_opid`, `focus_on_opid`, and `fill_by_opid`
    * fill script actions associated with the provided field.
    * @param {AutofillScript} fillScript
    * @param {AutofillField} field
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 1e6c38bdce1..9ee329fa150 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
@@ -578,7 +578,7 @@ describe("CollectAutofillContentService", () => {
       const autofillFieldsData = await Promise.resolve(autofillFieldsPromise);
 
       expect(collectAutofillContentService["getAutofillFieldElements"]).toHaveBeenCalledWith(
-        100,
+        200,
         formFieldElements,
       );
       expect(collectAutofillContentService["buildAutofillFieldItem"]).toHaveBeenCalledTimes(2);
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 0629621fad4..47b1c9ea6df 100644
--- a/apps/browser/src/autofill/services/collect-autofill-content.service.ts
+++ b/apps/browser/src/autofill/services/collect-autofill-content.service.ts
@@ -278,7 +278,12 @@ export class CollectAutofillContentService implements CollectAutofillContentServ
   private async buildAutofillFieldsData(
     formFieldElements: FormFieldElement[],
   ): Promise<AutofillField[]> {
-    const autofillFieldElements = this.getAutofillFieldElements(100, formFieldElements);
+    // Maximum number of form fields to process for autofill to prevent performance issues on pages with excessive fields
+    const autofillFieldsLimit = 200;
+    const autofillFieldElements = this.getAutofillFieldElements(
+      autofillFieldsLimit,
+      formFieldElements,
+    );
     const autofillFieldDataPromises = autofillFieldElements.map(this.buildAutofillFieldItem);
 
     return Promise.all(autofillFieldDataPromises);
@@ -428,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
@@ -439,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);
   }
 
@@ -1191,7 +1192,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>)
@@ -1201,7 +1202,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/inline-menu-field-qualification.service.spec.ts b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.spec.ts
index 6bedb939c30..6298cfaf7c1 100644
--- a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.spec.ts
+++ b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.spec.ts
@@ -221,7 +221,7 @@ describe("InlineMenuFieldQualificationService", () => {
 
             expect(
               inlineMenuFieldQualificationService.isFieldForLoginForm(field, pageDetails),
-            ).toBe(false);
+            ).toBe(true);
           });
         });
 
@@ -509,7 +509,7 @@ describe("InlineMenuFieldQualificationService", () => {
 
             expect(
               inlineMenuFieldQualificationService.isFieldForLoginForm(field, pageDetails),
-            ).toBe(false);
+            ).toBe(true);
           });
 
           it("is structured on a page with no password fields but has other types of fields in the form", () => {
@@ -568,7 +568,7 @@ describe("InlineMenuFieldQualificationService", () => {
             ).toBe(false);
           });
 
-          it("contains a disabled autocomplete type when multiple password fields are on the page", () => {
+          it("will not exclude a field by autocomplete type when it is the only viewable password field on the page", () => {
             const field = mock<AutofillField>({
               type: "text",
               autoCompleteType: "off",
@@ -599,7 +599,7 @@ describe("InlineMenuFieldQualificationService", () => {
 
             expect(
               inlineMenuFieldQualificationService.isFieldForLoginForm(field, pageDetails),
-            ).toBe(false);
+            ).toBe(true);
           });
         });
       });
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 497c8ce2b35..ed8e41df8ba 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
@@ -37,7 +37,6 @@ export class InlineMenuFieldQualificationService
   private newPasswordAutoCompleteValue = "new-password";
   private autofillFieldKeywordsMap: AutofillKeywordsMap = new WeakMap();
   private submitButtonKeywordsMap: SubmitButtonKeywordsMap = new WeakMap();
-  private autocompleteDisabledValues = new Set(["off", "false"]);
   private accountCreationFieldKeywords = [
     "register",
     "registration",
@@ -419,10 +418,8 @@ export class InlineMenuFieldQualificationService
       }
 
       // If a single username field or less is present on the page, then we can assume that the
-      // provided field is for a login form. This will only be the case if the field does not
-      // explicitly have its autocomplete attribute set to "off" or "false".
-
-      return !this.fieldContainsAutocompleteValues(field, this.autocompleteDisabledValues);
+      // provided field is for a login form.
+      return true;
     }
 
     // If the field has a form parent and there are multiple visible password fields
@@ -442,9 +439,8 @@ export class InlineMenuFieldQualificationService
       return true;
     }
 
-    // If the field has a form parent and no username field exists and the field has an
-    // autocomplete attribute set to "off" or "false", this is not a password field
-    return !this.fieldContainsAutocompleteValues(field, this.autocompleteDisabledValues);
+    // If the field has a form parent and a username field exists this is a password field
+    return true;
   }
 
   /**
@@ -512,20 +508,12 @@ export class InlineMenuFieldQualificationService
       }
 
       // If the page does not contain any password fields, it might be part of a multistep login form.
-      // That will only be the case if the field does not explicitly have its autocomplete attribute
-      // set to "off" or "false".
-      return !this.fieldContainsAutocompleteValues(field, this.autocompleteDisabledValues);
+      return true;
     }
 
     // If the field is structured within a form, but no password fields are present in the form,
     // we need to consider whether the field is part of a multistep login form.
     if (passwordFieldsInPageDetails.length === 0) {
-      // If the field's autocomplete is set to a disabled value, we should assume that the field is
-      // not part of a login form.
-      if (this.fieldContainsAutocompleteValues(field, this.autocompleteDisabledValues)) {
-        return false;
-      }
-
       // If the form that contains a single field, we should assume that it is part
       // of a multistep login form.
       const fieldsWithinForm = pageDetails.fields.filter(
@@ -561,8 +549,7 @@ export class InlineMenuFieldQualificationService
     }
 
     // If no visible password fields are found, this field might be part of a multipart form.
-    // Check for an invalid autocompleteType to determine if the field is part of a login form.
-    return !this.fieldContainsAutocompleteValues(field, this.autocompleteDisabledValues);
+    return true;
   }
 
   /**
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 e36d6811ecb..9edcdbb3a95 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
@@ -153,7 +153,9 @@ describe("InsertAutofillContentService", () => {
 
     it("returns early if the script is filling within a sand boxed iframe", async () => {
       Object.defineProperty(globalThis, "frameElement", {
-        value: { hasAttribute: jest.fn(() => true) },
+        value: {
+          getAttribute: jest.fn(() => ""),
+        },
         writable: true,
       });
       jest.spyOn(insertAutofillContentService as any, "userCancelledInsecureUrlAutofill");
diff --git a/apps/browser/src/autofill/spec/autofill-mocks.ts b/apps/browser/src/autofill/spec/autofill-mocks.ts
index 8279c98c5b4..d1e127227c6 100644
--- a/apps/browser/src/autofill/spec/autofill-mocks.ts
+++ b/apps/browser/src/autofill/spec/autofill-mocks.ts
@@ -114,7 +114,6 @@ export function createGenerateFillScriptOptionsMock(customFields = {}): Generate
   return {
     skipUsernameOnlyFill: false,
     onlyEmptyFields: false,
-    onlyVisibleFields: false,
     fillNewPassword: false,
     allowTotpAutofill: false,
     autoSubmitLogin: false,
diff --git a/apps/browser/src/autofill/spec/testing-utils.ts b/apps/browser/src/autofill/spec/testing-utils.ts
index 1a3f3a52234..0082f022fb6 100644
--- a/apps/browser/src/autofill/spec/testing-utils.ts
+++ b/apps/browser/src/autofill/spec/testing-utils.ts
@@ -80,7 +80,7 @@ export function triggerWindowOnFocusedChangedEvent(windowId: number) {
   );
 }
 
-export function triggerTabOnActivatedEvent(activeInfo: chrome.tabs.TabActiveInfo) {
+export function triggerTabOnActivatedEvent(activeInfo: chrome.tabs.OnActivatedInfo) {
   (chrome.tabs.onActivated.addListener as unknown as jest.SpyInstance).mock.calls.forEach(
     (call) => {
       const callback = call[0];
@@ -98,7 +98,7 @@ export function triggerTabOnReplacedEvent(addedTabId: number, removedTabId: numb
 
 export function triggerTabOnUpdatedEvent(
   tabId: number,
-  changeInfo: chrome.tabs.TabChangeInfo,
+  changeInfo: chrome.tabs.OnUpdatedInfo,
   tab: chrome.tabs.Tab,
 ) {
   (chrome.tabs.onUpdated.addListener as unknown as jest.SpyInstance).mock.calls.forEach((call) => {
@@ -107,7 +107,7 @@ export function triggerTabOnUpdatedEvent(
   });
 }
 
-export function triggerTabOnRemovedEvent(tabId: number, removeInfo: chrome.tabs.TabRemoveInfo) {
+export function triggerTabOnRemovedEvent(tabId: number, removeInfo: chrome.tabs.OnRemovedInfo) {
   (chrome.tabs.onRemoved.addListener as unknown as jest.SpyInstance).mock.calls.forEach((call) => {
     const callback = call[0];
     callback(tabId, removeInfo);
@@ -165,7 +165,7 @@ export function triggerWebRequestOnBeforeRedirectEvent(
   });
 }
 
-export function triggerWebRequestOnCompletedEvent(details: chrome.webRequest.WebResponseDetails) {
+export function triggerWebRequestOnCompletedEvent(details: chrome.webRequest.OnCompletedDetails) {
   (chrome.webRequest.onCompleted.addListener as unknown as jest.SpyInstance).mock.calls.forEach(
     (call) => {
       const callback = call[0];
diff --git a/apps/browser/src/autofill/utils/index.ts b/apps/browser/src/autofill/utils/index.ts
index 0e102dcfd99..a3d61c7f0b2 100644
--- a/apps/browser/src/autofill/utils/index.ts
+++ b/apps/browser/src/autofill/utils/index.ts
@@ -499,11 +499,24 @@ export function isInvalidResponseStatusCode(statusCode: number) {
  * Determines if the current context is within a sandboxed iframe.
  */
 export function currentlyInSandboxedIframe(): boolean {
-  return (
-    String(self.origin).toLowerCase() === "null" ||
-    globalThis.frameElement?.hasAttribute("sandbox") ||
-    globalThis.location.hostname === ""
-  );
+  if (String(self.origin).toLowerCase() === "null" || globalThis.location.hostname === "") {
+    return true;
+  }
+
+  const sandbox = globalThis.frameElement?.getAttribute?.("sandbox");
+
+  // No frameElement or sandbox attribute means not sandboxed
+  if (sandbox === null || sandbox === undefined) {
+    return false;
+  }
+
+  // An empty string means fully sandboxed
+  if (sandbox === "") {
+    return true;
+  }
+
+  const tokens = new Set(sandbox.toLowerCase().split(" "));
+  return !["allow-scripts", "allow-same-origin"].every((token) => tokens.has(token));
 }
 
 /**
diff --git a/apps/browser/src/background/idle.background.ts b/apps/browser/src/background/idle.background.ts
index 81a869917a6..2de4b48a9c0 100644
--- a/apps/browser/src/background/idle.background.ts
+++ b/apps/browser/src/background/idle.background.ts
@@ -46,7 +46,7 @@ export default class IdleBackground {
 
     if (this.idle.onStateChanged) {
       this.idle.onStateChanged.addListener(
-        async (newState: chrome.idle.IdleState | browser.idle.IdleState) => {
+        async (newState: `${chrome.idle.IdleState}` | browser.idle.IdleState) => {
           if (newState === "locked") {
             // Need to check if any of the current users have their timeout set to `onLocked`
             const allUsers = await firstValueFrom(this.accountService.accounts$);
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 37bd85a9be8..fef0181352c 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -81,6 +81,7 @@ import {
 import { isUrlInList } from "@bitwarden/common/autofill/utils";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/billing/services/account/billing-account-profile-state.service";
+import { HibpApiService } from "@bitwarden/common/dirt/services/hibp-api.service";
 import { ClientType } from "@bitwarden/common/enums";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
 import {
@@ -256,6 +257,8 @@ import {
   IndividualVaultExportServiceAbstraction,
   OrganizationVaultExportService,
   OrganizationVaultExportServiceAbstraction,
+  DefaultVaultExportApiService,
+  VaultExportApiService,
   VaultExportService,
   VaultExportServiceAbstraction,
 } from "@bitwarden/vault-export-core";
@@ -284,6 +287,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 { 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";
 import { BrowserActionsService } from "../platform/actions/browser-actions.service";
@@ -344,6 +348,7 @@ export default class MainBackground {
   tokenService: TokenServiceAbstraction;
   appIdService: AppIdServiceAbstraction;
   apiService: ApiServiceAbstraction;
+  hibpApiService: HibpApiService;
   environmentService: BrowserEnvironmentService;
   cipherService: CipherServiceAbstraction;
   folderService: InternalFolderServiceAbstraction;
@@ -362,6 +367,7 @@ export default class MainBackground {
   loginEmailService: LoginEmailServiceAbstraction;
   importApiService: ImportApiServiceAbstraction;
   importService: ImportServiceAbstraction;
+  exportApiService: VaultExportApiService;
   exportService: VaultExportServiceAbstraction;
   searchService: SearchServiceAbstraction;
   serverNotificationsService: ServerNotificationsService;
@@ -760,6 +766,7 @@ export default class MainBackground {
       { createRequest: (url, request) => new Request(url, request) },
     );
 
+    this.hibpApiService = new HibpApiService(this.apiService);
     this.fileUploadService = new FileUploadService(this.logService, this.apiService);
     this.cipherFileUploadService = new CipherFileUploadService(
       this.apiService,
@@ -881,7 +888,6 @@ export default class MainBackground {
     );
 
     this.restrictedItemTypesService = new RestrictedItemTypesService(
-      this.configService,
       this.accountService,
       this.organizationService,
       this.policyService,
@@ -894,7 +900,11 @@ export default class MainBackground {
       this.restrictedItemTypesService,
     );
 
-    this.ssoLoginService = new SsoLoginService(this.stateProvider, this.logService);
+    this.ssoLoginService = new SsoLoginService(
+      this.stateProvider,
+      this.logService,
+      this.policyService,
+    );
 
     this.userVerificationApiService = new UserVerificationApiService(this.apiService);
 
@@ -1061,7 +1071,11 @@ export default class MainBackground {
       this.userNotificationSettingsService,
       messageListener,
     );
-    this.auditService = new AuditService(this.cryptoFunctionService, this.apiService);
+    this.auditService = new AuditService(
+      this.cryptoFunctionService,
+      this.apiService,
+      this.hibpApiService,
+    );
 
     this.importApiService = new ImportApiService(this.apiService);
 
@@ -1095,27 +1109,28 @@ export default class MainBackground {
       this.encryptService,
       this.cryptoFunctionService,
       this.kdfConfigService,
-      this.accountService,
       this.apiService,
       this.restrictedItemTypesService,
     );
 
+    this.exportApiService = new DefaultVaultExportApiService(this.apiService);
+
     this.organizationVaultExportService = new OrganizationVaultExportService(
       this.cipherService,
-      this.apiService,
+      this.exportApiService,
       this.pinService,
       this.keyService,
       this.encryptService,
       this.cryptoFunctionService,
       this.collectionService,
       this.kdfConfigService,
-      this.accountService,
       this.restrictedItemTypesService,
     );
 
     this.exportService = new VaultExportService(
       this.individualVaultExportService,
       this.organizationVaultExportService,
+      this.accountService,
     );
 
     this.browserInitialInstallService = new BrowserInitialInstallService(this.stateProvider);
@@ -1399,6 +1414,17 @@ export default class MainBackground {
 
     this.inlineMenuFieldQualificationService = new InlineMenuFieldQualificationService();
 
+    PhishingDetectionService.initialize(
+      this.accountService,
+      this.auditService,
+      this.billingAccountProfileStateService,
+      this.configService,
+      this.eventCollectionService,
+      this.logService,
+      this.storageService,
+      this.taskSchedulerService,
+    );
+
     this.ipcContentScriptManagerService = new IpcContentScriptManagerService(this.configService);
     this.ipcService = new IpcBackgroundService(this.platformUtilsService, this.logService);
 
@@ -1411,7 +1437,6 @@ export default class MainBackground {
     );
 
     this.badgeService = new BadgeService(
-      this.stateProvider,
       new DefaultBadgeBrowserApi(this.platformUtilsService),
       this.logService,
     );
@@ -1640,6 +1665,7 @@ 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),
@@ -1900,7 +1926,6 @@ export default class MainBackground {
       this.badgeService,
       this.accountService,
       this.cipherService,
-      this.logService,
       this.taskService,
     );
 
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
new file mode 100644
index 00000000000..5ea79c3f840
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/pages/learn-more-component.html
@@ -0,0 +1,4 @@
+<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
new file mode 100644
index 00000000000..1a1e6059204
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/pages/learn-more-component.ts
@@ -0,0 +1,16 @@
+// 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
new file mode 100644
index 00000000000..f6e3baf8766
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.html
@@ -0,0 +1,13 @@
+<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
new file mode 100644
index 00000000000..dc6ab2d329e
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.ts
@@ -0,0 +1,58 @@
+// 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/services/phishing-detection.service.spec.ts b/apps/browser/src/dirt/phishing-detection/services/phishing-detection.service.spec.ts
new file mode 100644
index 00000000000..d6aca6abea0
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/services/phishing-detection.service.spec.ts
@@ -0,0 +1,127 @@
+import { 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 { PhishingDetectionService } from "./phishing-detection.service";
+
+describe("PhishingDetectionService", () => {
+  let accountService: AccountService;
+  let auditService: AuditService;
+  let billingAccountProfileStateService: BillingAccountProfileStateService;
+  let configService: ConfigService;
+  let eventCollectionService: EventCollectionService;
+  let logService: LogService;
+  let storageService: AbstractStorageService;
+  let taskSchedulerService: TaskSchedulerService;
+
+  beforeEach(() => {
+    accountService = { getAccount$: jest.fn(() => of(null)) } as any;
+    auditService = { getKnownPhishingDomains: jest.fn() } 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;
+    storageService = { get: jest.fn(), save: jest.fn() } as any;
+    taskSchedulerService = { registerTaskHandler: jest.fn(), setInterval: jest.fn() } as any;
+  });
+
+  it("should initialize without errors", () => {
+    expect(() => {
+      PhishingDetectionService.initialize(
+        accountService,
+        auditService,
+        billingAccountProfileStateService,
+        configService,
+        eventCollectionService,
+        logService,
+        storageService,
+        taskSchedulerService,
+      );
+    }).not.toThrow();
+  });
+
+  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;
+
+    // Patch _setup to call done
+    const setupSpy = jest
+      .spyOn(PhishingDetectionService as any, "_setup")
+      .mockImplementation(async () => {
+        expect(setupSpy).toHaveBeenCalled();
+        done();
+      });
+
+    // Run the initialization
+    PhishingDetectionService.initialize(
+      accountService,
+      auditService,
+      billingAccountProfileStateService,
+      configService,
+      eventCollectionService,
+      logService,
+      storageService,
+      taskSchedulerService,
+    );
+  });
+
+  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;
+
+    // Patch _setup to fail if called
+    // [FIXME] This test needs to check if the setupSpy fails or is called
+    // Refactor initialize in PhishingDetectionService to return a Promise or Observable that resolves/completes when initialization is done
+    // So that spy setups can be properly verified after initialization
+    // const setupSpy = jest
+    //   .spyOn(PhishingDetectionService as any, "_setup")
+    //   .mockImplementation(async () => {
+    //     throw new Error("Should not call _setup");
+    //   });
+
+    // Patch _cleanup to call done
+    const cleanupSpy = jest
+      .spyOn(PhishingDetectionService as any, "_cleanup")
+      .mockImplementation(() => {
+        expect(cleanupSpy).toHaveBeenCalled();
+        done();
+      });
+
+    // Run the initialization
+    PhishingDetectionService.initialize(
+      accountService,
+      auditService,
+      billingAccountProfileStateService,
+      configService,
+      eventCollectionService,
+      logService,
+      storageService,
+      taskSchedulerService,
+    );
+  });
+
+  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);
+  });
+
+  // Add more tests for other methods as needed
+});
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
new file mode 100644
index 00000000000..54245ae17b4
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/services/phishing-detection.service.ts
@@ -0,0 +1,709 @@
+import {
+  combineLatest,
+  concatMap,
+  delay,
+  EMPTY,
+  map,
+  Subject,
+  Subscription,
+  switchMap,
+} 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 { BrowserApi } from "../../../platform/browser/browser-api";
+
+import {
+  CaughtPhishingDomain,
+  isPhishingDetectionMessage,
+  PhishingDetectionMessage,
+  PhishingDetectionNavigationEvent,
+  PhishingDetectionTabId,
+} from "./phishing-detection.types";
+
+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;
+
+  static initialize(
+    accountService: AccountService,
+    auditService: AuditService,
+    billingAccountProfileStateService: BillingAccountProfileStateService,
+    configService: ConfigService,
+    eventCollectionService: EventCollectionService,
+    logService: LogService,
+    storageService: AbstractStorageService,
+    taskSchedulerService: TaskSchedulerService,
+  ): void {
+    this._auditService = auditService;
+    this._logService = logService;
+    this._storageService = storageService;
+    this._taskSchedulerService = taskSchedulerService;
+
+    logService.info("[PhishingDetectionService] Initialize called. Checking prerequisites...");
+
+    combineLatest([
+      accountService.activeAccount$,
+      configService.getFeatureFlag$(FeatureFlag.PhishingDetection),
+    ])
+      .pipe(
+        switchMap(([account, featureEnabled]) => {
+          if (!account) {
+            logService.info("[PhishingDetectionService] No active account.");
+            this._cleanup();
+            return EMPTY;
+          }
+          return billingAccountProfileStateService
+            .hasPremiumFromAnySource$(account.id)
+            .pipe(map((hasPremium) => ({ hasPremium, featureEnabled })));
+        }),
+        concatMap(async ({ hasPremium, featureEnabled }) => {
+          if (!hasPremium || !featureEnabled) {
+            logService.info(
+              "[PhishingDetectionService] User does not have access to phishing detection service.",
+            );
+            this._cleanup();
+          } else {
+            logService.info("[PhishingDetectionService] Enabling phishing detection service");
+            await this._setup();
+          }
+        }),
+      )
+      .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;
+  }
+
+  /**
+   * 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,
+      );
+      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(
+    tabId: number,
+    changeInfo: chrome.tabs.OnUpdatedInfo,
+    tab: chrome.tabs.Tab,
+  ): boolean {
+    this._navigationEventsSubject.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,
+    );
+  }
+}
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
new file mode 100644
index 00000000000..21793616241
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/services/phishing-detection.types.ts
@@ -0,0 +1,35 @@
+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/key-connector/remove-password.component.html b/apps/browser/src/key-management/key-connector/remove-password.component.html
index 56baf0de2a0..427065e83f3 100644
--- a/apps/browser/src/key-management/key-connector/remove-password.component.html
+++ b/apps/browser/src/key-management/key-connector/remove-password.component.html
@@ -1,53 +1,51 @@
-<header>
-  <div class="left"></div>
-  <div class="center">
-    <span class="title">{{ "removeMasterPassword" | i18n }}</span>
-  </div>
-  <div class="right"></div>
-</header>
+<popup-page>
+  <popup-header slot="header" pageTitle="{{ 'removeMasterPassword' | i18n }}">
+    <ng-container slot="end">
+      <app-pop-out></app-pop-out>
+    </ng-container>
+  </popup-header>
 
-<main tabindex="-1">
-  <div class="box">
-    <div class="box-content" *ngIf="loading">
-      <div class="box-content-row">
-        <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
-      </div>
+  @if (loading) {
+    <div class="tw-text-center">
+      <i
+        class="bwi bwi-spinner bwi-spin bwi-2x tw-text-muted"
+        title="{{ 'loading' | i18n }}"
+        aria-hidden="true"
+      ></i>
+      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
     </div>
-    <div class="box-content" *ngIf="!loading">
-      <div class="box-content-row" appBoxRow>
-        <p>{{ "removeMasterPasswordForOrganizationUserKeyConnector" | i18n }}</p>
-        <p class="tw-mb-0">{{ "organizationName" | i18n }}:</p>
-        <p class="tw-text-muted tw-mb-6">{{ organization.name }}</p>
-        <p class="tw-mb-0">{{ "keyConnectorDomain" | i18n }}:</p>
-        <p class="tw-text-muted tw-mb-6">{{ organization.keyConnectorUrl }}</p>
-      </div>
-      <div class="box-content-row">
-        <button type="button" class="btn block primary" (click)="convert()" [disabled]="action">
-          <i
-            class="bwi bwi-spinner bwi-spin"
-            title="{{ 'loading' | i18n }}"
-            aria-hidden="true"
-            *ngIf="continuing"
-          ></i>
-          {{ "removeMasterPassword" | i18n }}
-        </button>
-      </div>
-      <div class="box-content-row">
-        <button
-          type="button"
-          class="btn btn-outline-secondary block"
-          (click)="leave()"
-          [disabled]="action"
-        >
-          <i
-            class="bwi bwi-spinner bwi-spin"
-            title="{{ 'loading' | i18n }}"
-            aria-hidden="true"
-            *ngIf="leaving"
-          ></i>
-          {{ "leaveOrganization" | i18n }}
-        </button>
-      </div>
-    </div>
-  </div>
-</main>
+  } @else {
+    <p>{{ "removeMasterPasswordForOrganizationUserKeyConnector" | i18n }}</p>
+    <p class="tw-mb-0">{{ "organizationName" | i18n }}:</p>
+    <p class="tw-text-muted tw-mb-6">{{ organization.name }}</p>
+    <p class="tw-mb-0">{{ "keyConnectorDomain" | i18n }}:</p>
+    <p class="tw-text-muted tw-mb-6">{{ organization.keyConnectorUrl }}</p>
+    <button
+      type="button"
+      bitButton
+      buttonType="primary"
+      block
+      (click)="convert()"
+      [disabled]="action"
+      class="tw-mb-2"
+    >
+      <i
+        class="bwi bwi-spinner bwi-spin"
+        title="{{ 'loading' | i18n }}"
+        aria-hidden="true"
+        *ngIf="continuing"
+      ></i>
+      {{ "removeMasterPassword" | i18n }}
+    </button>
+
+    <button type="button" bitButton block (click)="leave()" [disabled]="action">
+      <i
+        class="bwi bwi-spinner bwi-spin"
+        title="{{ 'loading' | i18n }}"
+        aria-hidden="true"
+        *ngIf="leaving"
+      ></i>
+      {{ "leaveOrganization" | i18n }}
+    </button>
+  }
+</popup-page>
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.register-content-scripts-polyfill.ts b/apps/browser/src/platform/browser/browser-api.register-content-scripts-polyfill.ts
index 0b0dd21824b..a8e7b7eeb37 100644
--- a/apps/browser/src/platform/browser/browser-api.register-content-scripts-polyfill.ts
+++ b/apps/browser/src/platform/browser/browser-api.register-content-scripts-polyfill.ts
@@ -141,8 +141,24 @@ function buildRegisterContentScriptsPolyfill() {
     return [possibleArray];
   }
 
-  function arrayOrUndefined(value?: number) {
-    return value === undefined ? undefined : [value];
+  function createTarget(
+    tabId: number,
+    frameId: number | undefined,
+    allFrames: boolean,
+  ): chrome.scripting.InjectionTarget {
+    if (frameId === undefined) {
+      return {
+        tabId,
+        frameIds: undefined,
+        allFrames: allFrames,
+      };
+    } else {
+      return {
+        tabId,
+        frameIds: [frameId],
+        allFrames: undefined,
+      };
+    }
   }
 
   async function insertCSS(
@@ -170,15 +186,17 @@ function buildRegisterContentScriptsPolyfill() {
         }
 
         if (gotScripting) {
-          return chrome.scripting.insertCSS({
-            target: {
-              tabId,
-              frameIds: arrayOrUndefined(frameId),
-              allFrames: frameId === undefined ? allFrames : undefined,
-            },
-            files: "file" in content ? [content.file] : undefined,
-            css: "code" in content ? content.code : undefined,
-          });
+          if ("file" in content) {
+            return chrome.scripting.insertCSS({
+              target: createTarget(tabId, frameId, allFrames),
+              files: [content.file],
+            });
+          } else {
+            return chrome.scripting.insertCSS({
+              target: createTarget(tabId, frameId, allFrames),
+              css: content.code,
+            });
+          }
         }
 
         return chromeProxy.tabs.insertCSS(tabId, {
@@ -226,11 +244,7 @@ function buildRegisterContentScriptsPolyfill() {
     if (gotScripting) {
       assertNoCode(normalizedFiles);
       const injection = chrome.scripting.executeScript({
-        target: {
-          tabId,
-          frameIds: arrayOrUndefined(frameId),
-          allFrames: frameId === undefined ? allFrames : undefined,
-        },
+        target: createTarget(tabId, frameId, allFrames),
         files: normalizedFiles.map(({ file }: { file: string }) => file),
       });
 
@@ -397,7 +411,7 @@ function buildRegisterContentScriptsPolyfill() {
     };
     const tabListener = async (
       tabId: number,
-      { status }: chrome.tabs.TabChangeInfo,
+      { status }: chrome.tabs.OnUpdatedInfo,
       { url }: chrome.tabs.Tab,
     ) => {
       if (status === "loading" && url) {
diff --git a/apps/browser/src/platform/browser/browser-api.spec.ts b/apps/browser/src/platform/browser/browser-api.spec.ts
index 49d3e8e1cec..f7561b2b50b 100644
--- a/apps/browser/src/platform/browser/browser-api.spec.ts
+++ b/apps/browser/src/platform/browser/browser-api.spec.ts
@@ -375,7 +375,7 @@ describe("BrowserApi", () => {
   describe("executeScriptInTab", () => {
     it("calls to the extension api to execute a script within the give tabId", async () => {
       const tabId = 1;
-      const injectDetails = mock<chrome.tabs.InjectDetails>();
+      const injectDetails = mock<chrome.extensionTypes.InjectDetails>();
       jest.spyOn(BrowserApi, "manifestVersion", "get").mockReturnValue(2);
       (chrome.tabs.executeScript as jest.Mock).mockImplementation(
         (tabId, injectDetails, callback) => callback(executeScriptResult),
@@ -393,7 +393,7 @@ describe("BrowserApi", () => {
 
     it("calls the manifest v3 scripting API if the extension manifest is for v3", async () => {
       const tabId = 1;
-      const injectDetails = mock<chrome.tabs.InjectDetails>({
+      const injectDetails = mock<chrome.extensionTypes.InjectDetails>({
         file: "file.js",
         allFrames: true,
         runAt: "document_start",
@@ -419,7 +419,7 @@ describe("BrowserApi", () => {
     it("injects the script into a specified frameId when the extension is built for manifest v3", async () => {
       const tabId = 1;
       const frameId = 2;
-      const injectDetails = mock<chrome.tabs.InjectDetails>({
+      const injectDetails = mock<chrome.extensionTypes.InjectDetails>({
         file: "file.js",
         allFrames: true,
         runAt: "document_start",
@@ -443,7 +443,7 @@ describe("BrowserApi", () => {
 
     it("injects the script into the MAIN world context when injecting a script for manifest v3", async () => {
       const tabId = 1;
-      const injectDetails = mock<chrome.tabs.InjectDetails>({
+      const injectDetails = mock<chrome.extensionTypes.InjectDetails>({
         file: null,
         allFrames: true,
         runAt: "document_start",
diff --git a/apps/browser/src/platform/browser/browser-api.ts b/apps/browser/src/platform/browser/browser-api.ts
index 60a42078cfc..8a3dbafc5ce 100644
--- a/apps/browser/src/platform/browser/browser-api.ts
+++ b/apps/browser/src/platform/browser/browser-api.ts
@@ -212,6 +212,47 @@ export class BrowserApi {
     );
   }
 
+  /**
+   * Closes a browser tab with the given id
+   *
+   * @param tabId The id of the tab to close
+   */
+  static async closeTab(tabId: number): Promise<void> {
+    if (tabId) {
+      if (BrowserApi.isWebExtensionsApi) {
+        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) => {
+          throw new Error("[BrowserApi] Failed to remove current tab: " + error.message);
+        });
+      }
+    }
+  }
+
+  /**
+   * Navigates a browser tab to the given URL
+   *
+   * @param tabId The id of the tab to navigate
+   * @param url The URL to navigate to
+   */
+  static async navigateTabToUrl(tabId: number, url: URL): Promise<void> {
+    if (tabId) {
+      if (BrowserApi.isWebExtensionsApi) {
+        browser.tabs.update(tabId, { url: url.href }).catch((error) => {
+          throw new Error("Failed to navigate tab to URL: " + error.message);
+        });
+      } else if (BrowserApi.isChromeApi) {
+        chrome.tabs.update(tabId, { url: url.href }, () => {
+          if (chrome.runtime.lastError) {
+            throw new Error("Failed to navigate tab to URL: " + chrome.runtime.lastError.message);
+          }
+        });
+      }
+    }
+  }
+
   static async tabsQuery(options: chrome.tabs.QueryInfo): Promise<chrome.tabs.Tab[]> {
     return new Promise((resolve) => {
       chrome.tabs.query(options, (tabs) => {
@@ -233,7 +274,7 @@ export class BrowserApi {
    * Drop-in replacement for {@link BrowserApi.tabsQueryFirst}.
    *
    * Safari sometimes returns >1 tabs unexpectedly even when
-   * specificing a `windowId` or `currentWindow: true` query option.
+   * specifying a `windowId` or `currentWindow: true` query option.
    *
    * For all of these calls,
    * ```
@@ -320,6 +361,14 @@ export class BrowserApi {
     chrome.tabs.sendMessage<TabMessage, T>(tabId, message, options, responseCallback);
   }
 
+  static getRuntimeURL(path: string): string {
+    if (BrowserApi.isWebExtensionsApi) {
+      return browser.runtime.getURL(path);
+    } else if (BrowserApi.isChromeApi) {
+      return chrome.runtime.getURL(path);
+    }
+  }
+
   static async onWindowCreated(callback: (win: chrome.windows.Window) => any) {
     // FIXME: Make sure that is does not cause a memory leak in Safari or use BrowserApi.AddListener
     // and test that it doesn't break.
@@ -636,29 +685,27 @@ export class BrowserApi {
    */
   static executeScriptInTab(
     tabId: number,
-    details: chrome.tabs.InjectDetails,
+    details: chrome.extensionTypes.InjectDetails,
     scriptingApiDetails?: {
       world: chrome.scripting.ExecutionWorld;
     },
   ): Promise<unknown> {
     if (BrowserApi.isManifestVersion(3)) {
-      const target: chrome.scripting.InjectionTarget = {
-        tabId,
-      };
+      let target: chrome.scripting.InjectionTarget;
 
       if (typeof details.frameId === "number") {
-        target.frameIds = [details.frameId];
-      }
-
-      if (!target.frameIds?.length && details.allFrames) {
-        target.allFrames = details.allFrames;
+        target = { tabId, frameIds: [details.frameId] };
+      } else if (details.allFrames) {
+        target = { tabId, allFrames: true };
+      } else {
+        target = { tabId };
       }
 
       return chrome.scripting.executeScript({
         target,
         files: details.file ? [details.file] : null,
         injectImmediately: details.runAt === "document_start",
-        world: scriptingApiDetails?.world || "ISOLATED",
+        world: scriptingApiDetails?.world || chrome.scripting.ExecutionWorld.ISOLATED,
       });
     }
 
diff --git a/apps/browser/src/platform/browser/browser-popup-utils.ts b/apps/browser/src/platform/browser/browser-popup-utils.ts
index e9fe3dd1ea3..aebb3e92113 100644
--- a/apps/browser/src/platform/browser/browser-popup-utils.ts
+++ b/apps/browser/src/platform/browser/browser-popup-utils.ts
@@ -17,7 +17,7 @@ export const PopupWidthOptions = Object.freeze({
 type PopupWidthOptions = typeof PopupWidthOptions;
 export type PopupWidthOption = keyof PopupWidthOptions;
 
-class BrowserPopupUtils {
+export default class BrowserPopupUtils {
   /**
    * Identifies if the popup is within the sidebar.
    *
@@ -288,5 +288,3 @@ class BrowserPopupUtils {
     return parsedUrl.toString();
   }
 }
-
-export default BrowserPopupUtils;
diff --git a/apps/browser/src/platform/popup/header.component.html b/apps/browser/src/platform/popup/header.component.html
deleted file mode 100644
index 6b3677aacc7..00000000000
--- a/apps/browser/src/platform/popup/header.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<header [ngClass]="{ 'no-theme': noTheme }">
-  <div class="header-content">
-    <ng-content select=".sr-only"></ng-content>
-    <ng-content select=".left"></ng-content>
-    <ng-content select=".center"></ng-content>
-    <div class="right">
-      <ng-content select=".right"></ng-content>
-      <ng-container *ngIf="(authedAccounts$ | async) && !hideAccountSwitcher">
-        <app-current-account></app-current-account>
-      </ng-container>
-    </div>
-  </div>
-</header>
diff --git a/apps/browser/src/platform/popup/header.component.ts b/apps/browser/src/platform/popup/header.component.ts
deleted file mode 100644
index 0e6e39ee051..00000000000
--- a/apps/browser/src/platform/popup/header.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { CommonModule } from "@angular/common";
-import { Component, Input } from "@angular/core";
-import { Observable, map, of, switchMap } from "rxjs";
-
-import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-
-import { CurrentAccountComponent } from "../../auth/popup/account-switching/current-account.component";
-import { enableAccountSwitching } from "../flags";
-
-@Component({
-  selector: "app-header",
-  templateUrl: "header.component.html",
-  imports: [CommonModule, CurrentAccountComponent],
-})
-export class HeaderComponent {
-  @Input() noTheme = false;
-  @Input() hideAccountSwitcher = false;
-  authedAccounts$: Observable<boolean>;
-  constructor(authService: AuthService) {
-    this.authedAccounts$ = authService.authStatuses$.pipe(
-      map((record) => Object.values(record)),
-      switchMap((statuses) => {
-        if (!enableAccountSwitching()) {
-          return of(false);
-        }
-
-        return of(statuses.some((status) => status !== AuthenticationStatus.LoggedOut));
-      }),
-    );
-  }
-}
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 b666e49c964..b545618c0ce 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
@@ -105,6 +105,11 @@ export class PopupRouterCacheService {
    * Navigate back in history
    */
   async back() {
+    if (!BrowserPopupUtils.inPopup(window)) {
+      this.location.back();
+      return;
+    }
+
     const history = await this.state.update((prevState) =>
       prevState ? prevState.slice(0, -1) : [],
     );
diff --git a/apps/browser/src/platform/services/abstractions/chrome-storage-api.service.spec.ts b/apps/browser/src/platform/services/abstractions/chrome-storage-api.service.spec.ts
index ac8a01375fa..c1d0aa235fb 100644
--- a/apps/browser/src/platform/services/abstractions/chrome-storage-api.service.spec.ts
+++ b/apps/browser/src/platform/services/abstractions/chrome-storage-api.service.spec.ts
@@ -52,7 +52,7 @@ describe("ChromeStorageApiService", () => {
     });
 
     afterEach(() => {
-      chrome.runtime.lastError = undefined;
+      (chrome.runtime.lastError as any) = undefined;
     });
 
     it("uses `objToStore` to prepare a value for set", async () => {
@@ -80,7 +80,7 @@ describe("ChromeStorageApiService", () => {
 
     it("translates chrome.runtime.lastError to promise rejection", async () => {
       setMock.mockImplementation((data, callback) => {
-        chrome.runtime.lastError = new Error("Test Error");
+        (chrome.runtime.lastError as any) = new Error("Test Error");
         callback();
       });
 
@@ -101,7 +101,7 @@ describe("ChromeStorageApiService", () => {
     });
 
     afterEach(() => {
-      chrome.runtime.lastError = undefined;
+      (chrome.runtime.lastError as any) = undefined;
     });
 
     it("returns a stored value when it is serialized", async () => {
@@ -132,9 +132,9 @@ describe("ChromeStorageApiService", () => {
 
     it("translates chrome.runtime.lastError to promise rejection", async () => {
       getMock.mockImplementation((key, callback) => {
-        chrome.runtime.lastError = new Error("Test Error");
+        (chrome.runtime.lastError as any) = new Error("Test Error");
         callback();
-        chrome.runtime.lastError = undefined;
+        (chrome.runtime.lastError as any) = undefined;
       });
 
       await expect(async () => await service.get("test")).rejects.toThrow("Test Error");
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 21f6debc02f..e4abea1d719 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
@@ -41,7 +41,10 @@ describe("ScriptInjectorService", () => {
   const mv2SpecificFile = "content/autofill-init-mv2.js";
   const mv2Details = { file: mv2SpecificFile };
   const mv3SpecificFile = "content/autofill-init-mv3.js";
-  const mv3Details: Mv3ScriptInjectionDetails = { file: mv3SpecificFile, world: "MAIN" };
+  const mv3Details: Mv3ScriptInjectionDetails = {
+    file: mv3SpecificFile,
+    world: chrome.scripting.ExecutionWorld.MAIN,
+  };
   const sharedInjectDetails: CommonScriptInjectionDetails = {
     runAt: "document_start",
   };
diff --git a/apps/browser/src/platform/services/browser-script-injector.service.ts b/apps/browser/src/platform/services/browser-script-injector.service.ts
index a617f2215c0..575e9ccf70b 100644
--- a/apps/browser/src/platform/services/browser-script-injector.service.ts
+++ b/apps/browser/src/platform/services/browser-script-injector.service.ts
@@ -63,7 +63,7 @@ export class BrowserScriptInjectorService extends ScriptInjectorService {
     if (BrowserApi.isManifestVersion(3)) {
       try {
         await BrowserApi.executeScriptInTab(tabId, injectionDetails, {
-          world: mv3Details?.world ?? "ISOLATED",
+          world: mv3Details?.world ?? chrome.scripting.ExecutionWorld.ISOLATED,
         });
       } catch (error) {
         // Swallow errors for host permissions, since this is believed to be a Manifest V3 Chrome bug
@@ -112,9 +112,9 @@ export class BrowserScriptInjectorService extends ScriptInjectorService {
   private buildInjectionDetails(
     injectDetails: CommonScriptInjectionDetails,
     file: string,
-  ): chrome.tabs.InjectDetails {
+  ): chrome.extensionTypes.InjectDetails {
     const { frame, runAt } = injectDetails;
-    const injectionDetails: chrome.tabs.InjectDetails = { file };
+    const injectionDetails: chrome.extensionTypes.InjectDetails = { file };
 
     if (runAt) {
       injectionDetails.runAt = runAt;
diff --git a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.spec.ts b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.spec.ts
index f9a4221b3ef..61e56f08e16 100644
--- a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.spec.ts
+++ b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.spec.ts
@@ -167,7 +167,7 @@ describe("Browser Utils Service", () => {
 
     it("returns false if special error is sent", async () => {
       chrome.runtime.sendMessage = jest.fn().mockImplementation((message, callback) => {
-        chrome.runtime.lastError = new Error(
+        (chrome.runtime.lastError as any) = new Error(
           "Could not establish connection. Receiving end does not exist.",
         );
         callback(undefined);
@@ -177,7 +177,7 @@ describe("Browser Utils Service", () => {
 
       expect(isViewOpen).toBe(false);
 
-      chrome.runtime.lastError = null;
+      (chrome.runtime.lastError as any) = null;
     });
   });
 
@@ -356,6 +356,33 @@ describe("Browser Utils Service", () => {
       expect(result).toBe("");
     });
   });
+
+  describe("isChromium", () => {
+    const chromiumDevices: DeviceType[] = [
+      DeviceType.ChromeExtension,
+      DeviceType.EdgeExtension,
+      DeviceType.OperaExtension,
+      DeviceType.VivaldiExtension,
+    ];
+
+    const nonChromiumDevices: DeviceType[] = [
+      DeviceType.FirefoxExtension,
+      DeviceType.SafariExtension,
+    ];
+    afterEach(() => {
+      jest.restoreAllMocks();
+    });
+
+    test.each(chromiumDevices)("returns true when getDevice() is %s", (deviceType) => {
+      jest.spyOn(browserPlatformUtilsService, "getDevice").mockReturnValue(deviceType);
+      expect(browserPlatformUtilsService.isChromium()).toBe(true);
+    });
+
+    test.each(nonChromiumDevices)("returns false when getDevice() is %s", (deviceType) => {
+      jest.spyOn(browserPlatformUtilsService, "getDevice").mockReturnValue(deviceType);
+      expect(browserPlatformUtilsService.isChromium()).toBe(false);
+    });
+  });
 });
 
 describe("Safari Height Fix", () => {
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 4c5869054b2..5a933d9715e 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
@@ -123,6 +123,10 @@ export abstract class BrowserPlatformUtilsService implements PlatformUtilsServic
     return this.getDevice() === DeviceType.SafariExtension;
   }
 
+  isChromium(): boolean {
+    return this.isChrome() || this.isEdge() || this.isOpera() || this.isVivaldi();
+  }
+
   /**
    * Safari previous to version 16.1 had a bug which caused artifacts on hover in large extension popups.
    * https://bugs.webkit.org/show_bug.cgi?id=218704
diff --git a/apps/browser/src/platform/sync/sync-service.listener.spec.ts b/apps/browser/src/platform/sync/sync-service.listener.spec.ts
index 383586c0cd0..ed0af15415b 100644
--- a/apps/browser/src/platform/sync/sync-service.listener.spec.ts
+++ b/apps/browser/src/platform/sync/sync-service.listener.spec.ts
@@ -4,7 +4,7 @@ import { Subject, firstValueFrom } from "rxjs";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessageListener, MessageSender } from "@bitwarden/common/platform/messaging";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { tagAsExternal } from "@bitwarden/messaging-internal";
+import { tagAsExternal } from "@bitwarden/messaging";
 
 import { FullSyncMessage } from "./foreground-sync.service";
 import { FULL_SYNC_FINISHED, SyncServiceListener } from "./sync-service.listener";
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 0eb4739ea92..b835c711853 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
@@ -46,7 +46,7 @@ export class BrowserSystemNotificationService implements SystemNotificationsServ
     return new Promise<string>((resolve) => {
       const deviceType: DeviceType = this.platformUtilsService.getDevice();
 
-      const options: chrome.notifications.NotificationOptions<true> = {
+      const options: chrome.notifications.NotificationCreateOptions = {
         iconUrl: chrome.runtime.getURL("images/icon128.png"),
         message: createInfo.body,
         type: "basic",
@@ -70,6 +70,7 @@ 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);
   }
 
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 8d190e4555c..b69d7b73672 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -14,22 +14,22 @@ import {
 } from "@bitwarden/angular/auth/guards";
 import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-management/change-password";
 import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.component";
-import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import {
   DevicesIcon,
-  RegistrationLockAltIcon,
   RegistrationUserAddIcon,
   TwoFactorTimeoutIcon,
-  DeviceVerificationIcon,
+  TwoFactorAuthEmailIcon,
   UserLockIcon,
   VaultIcon,
   LockIcon,
+  DeactivatedOrg,
 } from "@bitwarden/assets/svg";
 import {
   LoginComponent,
   LoginDecryptionOptionsComponent,
   LoginSecondaryContentComponent,
   LoginViaAuthRequestComponent,
+  NewDeviceVerificationComponent,
   PasswordHintComponent,
   RegistrationFinishComponent,
   RegistrationStartComponent,
@@ -38,10 +38,8 @@ import {
   SsoComponent,
   TwoFactorAuthComponent,
   TwoFactorAuthGuard,
-  NewDeviceVerificationComponent,
 } from "@bitwarden/auth/angular";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { AnonLayoutWrapperData } from "@bitwarden/components";
+import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/components";
 import { LockComponent, ConfirmKeyConnectorDomainComponent } from "@bitwarden/key-management-ui";
 
 import { AccountSwitcherComponent } from "../auth/popup/account-switching/account-switcher.component";
@@ -54,6 +52,8 @@ 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 { 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";
@@ -78,6 +78,7 @@ import { canAccessAtRiskPasswords } from "../vault/popup/guards/at-risk-password
 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";
+import { ArchiveComponent } from "../vault/popup/settings/archive.component";
 import { DownloadBitwardenComponent } from "../vault/popup/settings/download-bitwarden.component";
 import { FoldersV2Component } from "../vault/popup/settings/folders-v2.component";
 import { MoreFromBitwardenPageV2Component } from "../vault/popup/settings/more-from-bitwarden-page-v2.component";
@@ -165,7 +166,7 @@ const routes: Routes = [
     canActivate: [unauthGuardFn(), activeAuthGuard()],
     children: [{ path: "", component: NewDeviceVerificationComponent }],
     data: {
-      pageIcon: DeviceVerificationIcon,
+      pageIcon: TwoFactorAuthEmailIcon,
       pageTitle: {
         key: "verifyYourIdentity",
       },
@@ -259,7 +260,7 @@ const routes: Routes = [
   {
     path: "device-management",
     component: ExtensionDeviceManagementComponent,
-    canActivate: [canAccessFeature(FeatureFlag.PM14938_BrowserExtensionLoginApproval), authGuard],
+    canActivate: [authGuard],
     data: { elevation: 1 } satisfies RouteDataProperties,
   },
   {
@@ -362,7 +363,7 @@ const routes: Routes = [
         path: "finish-signup",
         canActivate: [unauthGuardFn()],
         data: {
-          pageIcon: RegistrationLockAltIcon,
+          pageIcon: LockIcon,
           elevation: 1,
           showBackButton: true,
         } satisfies RouteDataProperties & ExtensionAnonLayoutWrapperData,
@@ -673,6 +674,38 @@ const routes: Routes = [
     canActivate: [authGuard],
     data: { elevation: 2 } satisfies RouteDataProperties,
   },
+  {
+    path: "archive",
+    component: ArchiveComponent,
+    canActivate: [authGuard],
+    data: { elevation: 2 } satisfies RouteDataProperties,
+  },
+  {
+    path: "security",
+    component: AnonLayoutWrapperComponent,
+    children: [
+      {
+        path: "phishing-warning",
+        children: [
+          {
+            path: "",
+            component: PhishingWarning,
+          },
+          {
+            path: "",
+            component: LearnMoreComponent,
+            outlet: "secondary",
+          },
+        ],
+        data: {
+          pageIcon: DeactivatedOrg,
+          pageTitle: "Bitwarden blocked it!",
+          pageSubtitle: "Bitwarden blocked a known phishing site from loading.",
+          showReadonlyHostname: true,
+        } satisfies AnonLayoutWrapperData,
+      },
+    ],
+  },
 ];
 
 @Injectable()
diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index 39f82622b68..998531488d3 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -42,9 +42,7 @@ 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";
@@ -82,7 +80,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 +115,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 +123,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 +132,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 +159,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 +229,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;
             }
diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts
index 2aacd3d3632..d34bef4674c 100644
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -30,7 +30,6 @@ import { AutofillComponent } from "../autofill/popup/settings/autofill.component
 import { NotificationsSettingsComponent } from "../autofill/popup/settings/notifications.component";
 import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
 import { PopOutComponent } from "../platform/popup/components/pop-out.component";
-import { HeaderComponent } from "../platform/popup/header.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";
@@ -80,7 +79,6 @@ import "../platform/popup/locales";
     PopupTabNavigationComponent,
     PopupFooterComponent,
     PopupHeaderComponent,
-    HeaderComponent,
     UserVerificationDialogComponent,
     CurrentAccountComponent,
     FormFieldModule,
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 4c394317d14..d389fd8d783 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
@@ -5,12 +5,9 @@
     [showBackButton]="showBackButton"
     [pageTitle]="''"
   >
-    <bit-icon
-      *ngIf="showLogo"
-      class="tw-inline-flex"
-      [icon]="logo"
-      [ariaLabel]="'appLogoLabel' | i18n"
-    ></bit-icon>
+    <div class="tw-w-32">
+      <bit-icon *ngIf="showLogo" [icon]="logo" [ariaLabel]="'appLogoLabel' | i18n"></bit-icon>
+    </div>
 
     <ng-container slot="end">
       <app-pop-out></app-pop-out>
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 3b84eac2217..c1694d80668 100644
--- a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
+++ b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
@@ -5,7 +5,7 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute, Data, NavigationEnd, Router, RouterModule } from "@angular/router";
 import { Subject, filter, switchMap, takeUntil, tap } from "rxjs";
 
-import { ExtensionBitwardenLogo, Icon } from "@bitwarden/assets/svg";
+import { BitwardenLogo, Icon } from "@bitwarden/assets/svg";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import {
   IconModule,
@@ -62,7 +62,7 @@ export class ExtensionAnonLayoutWrapperComponent implements OnInit, OnDestroy {
   protected hideCardWrapper: boolean = false;
 
   protected theme: string;
-  protected logo = ExtensionBitwardenLogo;
+  protected logo = BitwardenLogo;
 
   constructor(
     private router: Router,
diff --git a/apps/browser/src/popup/scss/base.scss b/apps/browser/src/popup/scss/base.scss
index 0565de1712c..b3d14e65061 100644
--- a/apps/browser/src/popup/scss/base.scss
+++ b/apps/browser/src/popup/scss/base.scss
@@ -151,6 +151,7 @@ textarea {
 
 app-root > div {
   height: 100%;
+  width: 100%;
 }
 
 main::-webkit-scrollbar,
@@ -372,10 +373,10 @@ header:not(bit-callout header, bit-dialog header, popup-page header) {
 }
 
 app-root {
-  position: absolute;
   width: 100%;
-  height: 100%;
-  z-index: 980;
+  height: 100vh;
+  display: flex;
+
   @include themify($themes) {
     background-color: themed("backgroundColor");
   }
diff --git a/apps/browser/src/popup/scss/box.scss b/apps/browser/src/popup/scss/box.scss
index 1e053f6b9da..763f73a15cb 100644
--- a/apps/browser/src/popup/scss/box.scss
+++ b/apps/browser/src/popup/scss/box.scss
@@ -526,13 +526,6 @@
     width: calc(100% - 25px);
   }
 
-  .row-sub-icon,
-  .row-sub-label + i.bwi {
-    @include themify($themes) {
-      color: themed("disabledIconColor");
-    }
-  }
-
   .icon {
     display: flex;
     justify-content: center;
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/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
index 8da94acdd7a..7a10dc2343f 100644
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -29,6 +29,7 @@ import {
   TwoFactorAuthDuoComponentService,
   TwoFactorAuthWebAuthnComponentService,
   SsoComponentService,
+  NewDeviceVerificationComponentService,
 } from "@bitwarden/auth/angular";
 import {
   LockService,
@@ -36,6 +37,7 @@ import {
   SsoUrlService,
   LogoutService,
 } 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";
@@ -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 {
@@ -703,6 +707,16 @@ const safeProviders: SafeProvider[] = [
     useClass: ExtensionDeviceManagementComponentService,
     deps: [],
   }),
+  safeProvider({
+    provide: CipherArchiveService,
+    useClass: DefaultCipherArchiveService,
+    deps: [CipherService, ApiService, BillingAccountProfileStateService, ConfigService],
+  }),
+  safeProvider({
+    provide: NewDeviceVerificationComponentService,
+    useClass: ExtensionNewDeviceVerificationComponentService,
+    deps: [],
+  }),
 ];
 
 @NgModule({
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 b6957248d75..5911b3b6d89 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
@@ -188,14 +188,11 @@ export class SendAddEditComponent {
    * @returns The header text.
    */
   private getHeaderText(mode: SendFormMode, type: SendType) {
-    const headerKey =
-      mode === "edit" || mode === "partial-edit" ? "editItemHeader" : "newItemHeader";
-
-    switch (type) {
-      case SendType.Text:
-        return this.i18nService.t(headerKey, this.i18nService.t("textSend"));
-      case SendType.File:
-        return this.i18nService.t(headerKey, this.i18nService.t("fileSend"));
-    }
+    const isEditMode = mode === "edit" || mode === "partial-edit";
+    const translation = {
+      [SendType.Text]: isEditMode ? "editItemHeaderTextSend" : "newItemHeaderTextSend",
+      [SendType.File]: isEditMode ? "editItemHeaderFileSend" : "newItemHeaderFileSend",
+    };
+    return this.i18nService.t(translation[type]);
   }
 }
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 af3abbf5427..f0d66bd49ed 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
@@ -14,7 +14,9 @@
     <div
       class="tw-flex tw-bg-background-alt tw-flex-col tw-justify-center tw-items-center tw-gap-2 tw-h-full tw-px-5"
     >
-      <bit-icon [icon]="sendCreatedIcon"></bit-icon>
+      <div class="tw-size-[95px] tw-content-center">
+        <bit-icon [icon]="sendCreatedIcon"></bit-icon>
+      </div>
       <h3 tabindex="0" appAutofocus class="tw-font-semibold">
         {{ "createdSendSuccessfully" | i18n }}
       </h3>
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 bb61769de90..a37c038d822 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
@@ -5,11 +5,13 @@ import { combineLatest, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NoResults, NoSendsIcon } from "@bitwarden/assets/svg";
+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 { SendType } from "@bitwarden/common/tools/send/enums/send-type";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import {
   ButtonModule,
   CalloutModule,
@@ -39,6 +41,12 @@ export enum SendState {
 
 @Component({
   templateUrl: "send-v2.component.html",
+  providers: [
+    {
+      provide: PremiumUpgradePromptService,
+      useClass: BrowserPremiumUpgradePromptService,
+    },
+  ],
   imports: [
     CalloutModule,
     PopupPageComponent,
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..6c2bc3f77a0 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,5 +1,4 @@
 <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")
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 3985fc85a54..463819b96e4 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
@@ -17,6 +17,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherId, CollectionId, OrganizationId, UserId } 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 { CipherType, toCipherType } 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";
@@ -50,6 +51,7 @@ import { PopupPageComponent } from "../../../../../platform/popup/layout/popup-p
 import { PopupRouterCacheService } from "../../../../../platform/popup/view-cache/popup-router-cache.service";
 import { PopupCloseWarningService } from "../../../../../popup/services/popup-close-warning.service";
 import { BrowserCipherFormGenerationService } from "../../../services/browser-cipher-form-generation.service";
+import { BrowserPremiumUpgradePromptService } from "../../../services/browser-premium-upgrade-prompt.service";
 import { BrowserTotpCaptureService } from "../../../services/browser-totp-capture.service";
 import {
   fido2PopoutSessionData$,
@@ -136,6 +138,7 @@ export type AddEditQueryParams = Partial<Record<keyof QueryParams, string>>;
     { provide: CipherFormConfigService, useClass: DefaultCipherFormConfigService },
     { provide: TotpCaptureService, useClass: BrowserTotpCaptureService },
     { provide: CipherFormGenerationService, useClass: BrowserCipherFormGenerationService },
+    { provide: PremiumUpgradePromptService, useClass: BrowserPremiumUpgradePromptService },
   ],
   imports: [
     CommonModule,
@@ -368,20 +371,15 @@ export class AddEditV2Component implements OnInit {
   }
 
   setHeader(mode: CipherFormMode, type: CipherType) {
-    const partOne = mode === "edit" || mode === "partial-edit" ? "editItemHeader" : "newItemHeader";
-
-    switch (type) {
-      case CipherType.Login:
-        return this.i18nService.t(partOne, this.i18nService.t("typeLogin"));
-      case CipherType.Card:
-        return this.i18nService.t(partOne, this.i18nService.t("typeCard"));
-      case CipherType.Identity:
-        return this.i18nService.t(partOne, this.i18nService.t("typeIdentity"));
-      case CipherType.SecureNote:
-        return this.i18nService.t(partOne, this.i18nService.t("note"));
-      case CipherType.SshKey:
-        return this.i18nService.t(partOne, this.i18nService.t("typeSshKey"));
-    }
+    const isEditMode = mode === "edit" || mode === "partial-edit";
+    const translation = {
+      [CipherType.Login]: isEditMode ? "editItemHeaderLogin" : "newItemHeaderLogin",
+      [CipherType.Card]: isEditMode ? "editItemHeaderCard" : "newItemHeaderCard",
+      [CipherType.Identity]: isEditMode ? "editItemHeaderIdentity" : "newItemHeaderIdentity",
+      [CipherType.SecureNote]: isEditMode ? "editItemHeaderNote" : "newItemHeaderNote",
+      [CipherType.SshKey]: isEditMode ? "editItemHeaderSshKey" : "newItemHeaderSshKey",
+    };
+    return this.i18nService.t(translation[type]);
   }
 
   delete = async () => {
diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.html b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.html
index 2650345e94b..0fbe1c55b0a 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.html
@@ -5,10 +5,10 @@
     (click)="openAttachments()"
     [disabled]="parentFormDisabled"
   >
-    {{ "attachments" | i18n }}
-    <span *ngIf="!canAccessAttachments" bitBadge variant="success" slot="default-trailing">
-      {{ "premium" | i18n }}
-    </span>
+    <div class="tw-flex tw-items-center tw-gap-2">
+      {{ "attachments" | i18n }}
+      <app-premium-badge></app-premium-badge>
+    </div>
     <ng-container slot="end">
       <i class="bwi bwi-popout" aria-hidden="true" *ngIf="openAttachmentsInPopout"></i>
       <i class="bwi bwi-angle-right" aria-hidden="true" *ngIf="!openAttachmentsInPopout"></i>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts
index 8f1729f0ab6..a2045736ce2 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
@@ -13,6 +13,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherId, OrganizationId, UserId } 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 { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { ToastService } from "@bitwarden/components";
@@ -108,6 +109,12 @@ describe("OpenAttachmentsComponent", () => {
           provide: AccountService,
           useValue: accountService,
         },
+        {
+          provide: PremiumUpgradePromptService,
+          useValue: {
+            promptForPremium: jest.fn().mockResolvedValue(null),
+          },
+        },
       ],
     }).compileComponents();
   });
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 493d632dd64..26410a46187 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
@@ -6,6 +6,7 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { Router } from "@angular/router";
 import { firstValueFrom, map, switchMap } from "rxjs";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import {
   getOrganizationById,
@@ -27,7 +28,14 @@ import { FilePopoutUtilsService } from "../../../../../../tools/popup/services/f
 @Component({
   selector: "app-open-attachments",
   templateUrl: "./open-attachments.component.html",
-  imports: [BadgeModule, CommonModule, ItemModule, JslibModule, TypographyModule],
+  imports: [
+    BadgeModule,
+    CommonModule,
+    ItemModule,
+    JslibModule,
+    TypographyModule,
+    PremiumBadgeComponent,
+  ],
 })
 export class OpenAttachmentsComponent implements OnInit {
   /** Cipher `id` */
diff --git a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.html b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.html
index ff7bf25b86b..5f19092d6b0 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.html
@@ -1,28 +1,36 @@
 <vault-carousel [label]="'introCarouselLabel' | i18n">
   <vault-carousel-slide [label]="'securityPrioritized' | i18n" [disablePadding]="true">
     <div class="tw-flex tw-flex-col tw-items-center tw-justify-around">
-      <bit-icon [icon]="securityHandshake"></bit-icon>
+      <div class="tw-size-32 tw-content-center tw-my-4">
+        <bit-icon [icon]="itemTypes"></bit-icon>
+      </div>
       <h2 bitTypography="h2" class="tw-text-center">{{ "securityPrioritized" | i18n }}</h2>
       <p bitTypography="body1" class="tw-text-center">{{ "securityPrioritizedBody" | i18n }}</p>
     </div>
   </vault-carousel-slide>
   <vault-carousel-slide [label]="'quickLogin' | i18n" [disablePadding]="true">
     <div class="tw-flex tw-flex-col tw-items-center tw-justify-around">
-      <bit-icon [icon]="loginCards"></bit-icon>
+      <div class="tw-size-32 tw-content-center tw-my-4">
+        <bit-icon [icon]="loginCards"></bit-icon>
+      </div>
       <h2 bitTypography="h2" class="tw-text-center">{{ "quickLogin" | i18n }}</h2>
       <p bitTypography="body1" class="tw-text-center">{{ "quickLoginBody" | i18n }}</p>
     </div>
   </vault-carousel-slide>
   <vault-carousel-slide [label]="'secureUser' | i18n" [disablePadding]="true">
     <div class="tw-flex tw-flex-col tw-items-center tw-justify-around">
-      <bit-icon [icon]="secureUser"></bit-icon>
+      <div class="tw-size-32 tw-content-center tw-my-4">
+        <bit-icon [icon]="noCredentials"></bit-icon>
+      </div>
       <h2 bitTypography="h2" class="tw-text-center">{{ "secureUser" | i18n }}</h2>
       <p bitTypography="body1" class="tw-text-center">{{ "secureUserBody" | i18n }}</p>
     </div>
   </vault-carousel-slide>
   <vault-carousel-slide [label]="'secureDevices' | i18n" [disablePadding]="true">
     <div class="tw-flex tw-flex-col tw-items-center tw-justify-around">
-      <bit-icon [icon]="secureDevices"></bit-icon>
+      <div class="tw-size-32 tw-content-center tw-my-4">
+        <bit-icon [icon]="secureDevices"></bit-icon>
+      </div>
       <h2 bitTypography="h2" class="tw-text-center">{{ "secureDevices" | i18n }}</h2>
       <p bitTypography="body1" class="tw-text-center">{{ "secureDevicesBody" | i18n }}</p>
     </div>
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 22149f9dc86..94996a054e6 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts
@@ -2,7 +2,7 @@ import { Component } from "@angular/core";
 import { Router } from "@angular/router";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { SecurityHandshake, LoginCards, SecureUser, SecureDevices } from "@bitwarden/assets/svg";
+import { ItemTypes, LoginCards, NoCredentialsIcon, DevicesIcon } from "@bitwarden/assets/svg";
 import { ButtonModule, DialogModule, IconModule, TypographyModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 import { VaultCarouselModule } from "@bitwarden/vault";
@@ -23,10 +23,10 @@ import { IntroCarouselService } from "../../../services/intro-carousel.service";
   ],
 })
 export class IntroCarouselComponent {
-  protected securityHandshake = SecurityHandshake;
+  protected itemTypes = ItemTypes;
   protected loginCards = LoginCards;
-  protected secureUser = SecureUser;
-  protected secureDevices = SecureDevices;
+  protected noCredentials = NoCredentialsIcon;
+  protected secureDevices = DevicesIcon;
 
   constructor(
     private router: Router,
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 42e2779679a..7ee7e141ee5 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
@@ -38,5 +38,10 @@
         {{ "assignToCollections" | i18n }}
       </a>
     </ng-container>
+    @if (canArchive$ | async) {
+      <button type="button" bitMenuItem (click)="archive()" *ngIf="canArchive$ | async">
+        {{ "archiveVerb" | i18n }}
+      </button>
+    }
   </bit-menu>
 </bit-item-action>
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 9ee3c3a6e41..324ea2ffcdf 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
@@ -3,7 +3,8 @@
 import { CommonModule } from "@angular/common";
 import { booleanAttribute, Component, Input } from "@angular/core";
 import { Router, RouterModule } from "@angular/router";
-import { BehaviorSubject, combineLatest, filter, firstValueFrom, map, switchMap } from "rxjs";
+import { BehaviorSubject, combineLatest, firstValueFrom, map, switchMap } from "rxjs";
+import { filter } from "rxjs/operators";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
@@ -11,6 +12,8 @@ import { OrganizationService } from "@bitwarden/common/admin-console/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 { 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 { CipherRepromptType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
@@ -103,6 +106,20 @@ 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;
+    }),
+  );
+
   constructor(
     private cipherService: CipherService,
     private passwordRepromptService: PasswordRepromptService,
@@ -116,6 +133,7 @@ export class ItemMoreOptionsComponent {
     private cipherAuthorizationService: CipherAuthorizationService,
     private collectionService: CollectionService,
     private restrictedItemTypesService: RestrictedItemTypesService,
+    private cipherArchiveService: CipherArchiveService,
   ) {}
 
   get canEdit() {
@@ -233,4 +251,23 @@ export class ItemMoreOptionsComponent {
       queryParams: { cipherId: this.cipher.id },
     });
   }
+
+  async archive() {
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "archiveItem" },
+      content: { key: "archiveItemConfirmDesc" },
+      type: "info",
+    });
+
+    if (!confirmed) {
+      return;
+    }
+
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    await this.cipherArchiveService.archiveWithServer(this.cipher.id as CipherId, activeUserId);
+    this.toastService.showToast({
+      variant: "success",
+      message: this.i18nService.t("itemSentToArchive"),
+    });
+  }
 }
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 86bdaa98835..fad5615764c 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
@@ -106,19 +106,21 @@
               <app-vault-icon [cipher]="cipher"></app-vault-icon>
             </div>
             <span data-testid="item-name">{{ cipher.name }}</span>
-            <i
-              *ngIf="cipher.organizationId"
-              slot="default-trailing"
-              appOrgIcon
-              [tierType]="cipher.organization!.productTierType"
-              [size]="'small'"
-              [appA11yTitle]="orgIconTooltip(cipher)"
-            ></i>
-            <i
-              *ngIf="CipherViewLikeUtils.hasAttachments(cipher)"
-              class="bwi bwi-paperclip bwi-sm"
-              [appA11yTitle]="'attachments' | i18n"
-            ></i>
+            <div slot="default-trailing" class="tw-flex tw-gap-1.5">
+              <i
+                *ngIf="cipher.organizationId"
+                slot="default-trailing"
+                appOrgIcon
+                [tierType]="cipher.organization!.productTierType"
+                [size]="'small'"
+                [appA11yTitle]="orgIconTooltip(cipher)"
+              ></i>
+              <i
+                *ngIf="CipherViewLikeUtils.hasAttachments(cipher)"
+                class="bwi bwi-paperclip bwi-sm"
+                [appA11yTitle]="'attachments' | i18n"
+              ></i>
+            </div>
             <span slot="secondary">{{ CipherViewLikeUtils.subtitle(cipher) }}</span>
           </button>
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
index 51116da2865..3d4fdb2e9f9 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
@@ -172,28 +172,28 @@ describe("ViewV2Component", () => {
       params$.next({ cipherId: mockCipher.id });
       flush(); // Resolve all promises
 
-      expect(component.headerText).toEqual("viewItemHeader typeLogin");
+      expect(component.headerText).toEqual("viewItemHeaderLogin");
 
       // Set header text for a card
       mockCipher.type = CipherType.Card;
       params$.next({ cipherId: mockCipher.id });
       flush(); // Resolve all promises
 
-      expect(component.headerText).toEqual("viewItemHeader typeCard");
+      expect(component.headerText).toEqual("viewItemHeaderCard");
 
       // Set header text for an identity
       mockCipher.type = CipherType.Identity;
       params$.next({ cipherId: mockCipher.id });
       flush(); // Resolve all promises
 
-      expect(component.headerText).toEqual("viewItemHeader typeIdentity");
+      expect(component.headerText).toEqual("viewItemHeaderIdentity");
 
       // Set header text for a secure note
       mockCipher.type = CipherType.SecureNote;
       params$.next({ cipherId: mockCipher.id });
       flush(); // Resolve all promises
 
-      expect(component.headerText).toEqual("viewItemHeader note");
+      expect(component.headerText).toEqual("viewItemHeaderNote");
     }));
 
     it("sends viewed event", fakeAsync(() => {
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 fff59e81046..915a27e4fd1 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
@@ -194,18 +194,14 @@ export class ViewV2Component {
   }
 
   setHeader(type: CipherType) {
-    switch (type) {
-      case CipherType.Login:
-        return this.i18nService.t("viewItemHeader", this.i18nService.t("typeLogin"));
-      case CipherType.Card:
-        return this.i18nService.t("viewItemHeader", this.i18nService.t("typeCard"));
-      case CipherType.Identity:
-        return this.i18nService.t("viewItemHeader", this.i18nService.t("typeIdentity"));
-      case CipherType.SecureNote:
-        return this.i18nService.t("viewItemHeader", this.i18nService.t("note"));
-      case CipherType.SshKey:
-        return this.i18nService.t("viewItemHeader", this.i18nService.t("typeSshkey"));
-    }
+    const translation = {
+      [CipherType.Login]: "viewItemHeaderLogin",
+      [CipherType.Card]: "viewItemHeaderCard",
+      [CipherType.Identity]: "viewItemHeaderIdentity",
+      [CipherType.SecureNote]: "viewItemHeaderNote",
+      [CipherType.SshKey]: "viewItemHeaderSshKey",
+    };
+    return this.i18nService.t(translation[type]);
   }
 
   async getCipherData(id: string, userId: UserId) {
@@ -329,8 +325,9 @@ export class ViewV2Component {
       case UPDATE_PASSWORD: {
         const repromptSuccess = await this.passwordRepromptService.showPasswordPrompt();
 
+        const tab = await BrowserApi.getTab(senderTabId);
         await sendExtensionMessage("bgHandleReprompt", {
-          tab: await chrome.tabs.get(senderTabId),
+          tab,
           success: repromptSuccess,
         });
 
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 3ba4e832b02..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
@@ -1,4 +1,4 @@
-import { WritableSignal, signal } from "@angular/core";
+import { signal, WritableSignal } from "@angular/core";
 import { TestBed } from "@angular/core/testing";
 import { mock } from "jest-mock-extended";
 import { BehaviorSubject, firstValueFrom, of, take, timeout } from "rxjs";
@@ -8,11 +8,13 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { ProductTierType } from "@bitwarden/common/billing/enums";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SyncService } from "@bitwarden/common/platform/sync";
-import { ObservableTracker, mockAccountServiceWith } from "@bitwarden/common/spec";
+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";
@@ -43,7 +45,7 @@ describe("VaultPopupItemsService", () => {
 
   let mockOrg: Organization;
   let mockCollections: CollectionView[];
-  let activeUserLastSync$: BehaviorSubject<Date>;
+  let activeUserLastSync$: BehaviorSubject<Date | null>;
   let viewCacheService: {
     signal: jest.Mock;
     mockSignal: WritableSignal<string | null>;
@@ -64,6 +66,9 @@ describe("VaultPopupItemsService", () => {
   const inlineMenuFieldQualificationServiceMock = mock<InlineMenuFieldQualificationService>();
   const userId = Utils.newGuid() as UserId;
   const accountServiceMock = mockAccountServiceWith(userId);
+  const configServiceMock = mock<ConfigService>();
+  const cipherArchiveServiceMock = mock<CipherArchiveService>();
+  cipherArchiveServiceMock.userCanArchive$.mockReturnValue(of(true));
 
   const restrictedItemTypesService = {
     restricted$: new BehaviorSubject<RestrictedCipherType[]>([]),
@@ -101,7 +106,7 @@ describe("VaultPopupItemsService", () => {
       failedToDecryptCiphersSubject.asObservable(),
     );
 
-    searchService.searchCiphers.mockImplementation(async (userId, _, __, ciphers) => ciphers);
+    searchService.searchCiphers.mockImplementation(async (userId, _, __, ciphers) => ciphers!);
     cipherServiceMock.filterCiphersForUrl.mockImplementation(async (ciphers) =>
       ciphers.filter((c) => ["0", "1"].includes(uuidAsString(c.id))),
     );
@@ -142,8 +147,9 @@ describe("VaultPopupItemsService", () => {
     organizationServiceMock.organizations$.mockReturnValue(new BehaviorSubject([mockOrg]));
     collectionService.decryptedCollections$.mockReturnValue(new BehaviorSubject(mockCollections));
 
-    activeUserLastSync$ = new BehaviorSubject(new Date());
+    activeUserLastSync$ = new BehaviorSubject<Date | null>(new Date());
     syncServiceMock.activeUserLastSync$.mockReturnValue(activeUserLastSync$);
+    configServiceMock.getFeatureFlag$.mockReturnValue(of(true));
 
     const testSearchSignal = createMockSignal<string | null>("");
     viewCacheService = {
@@ -168,10 +174,15 @@ describe("VaultPopupItemsService", () => {
           useValue: inlineMenuFieldQualificationServiceMock,
         },
         { provide: PopupViewCacheService, useValue: viewCacheService },
+        { provide: ConfigService, useValue: configServiceMock },
         {
           provide: RestrictedItemTypesService,
           useValue: restrictedItemTypesService,
         },
+        {
+          provide: CipherArchiveService,
+          useValue: cipherArchiveServiceMock,
+        },
       ],
     });
 
@@ -297,7 +308,7 @@ describe("VaultPopupItemsService", () => {
       const searchText = "Login";
 
       searchService.searchCiphers.mockImplementation(async (userId, q, _, ciphers) => {
-        return ciphers.filter((cipher) => {
+        return ciphers!.filter((cipher) => {
           return cipher.name.includes(searchText);
         });
       });
@@ -390,12 +401,12 @@ describe("VaultPopupItemsService", () => {
       });
     });
 
-    it("should return true when all ciphers are deleted", (done) => {
+    it("should return true when all ciphers are deleted/archived", (done) => {
       cipherServiceMock.cipherListViews$.mockReturnValue(
         of([
           { id: "1", type: CipherType.Login, name: "Login 1", isDeleted: true },
           { id: "2", type: CipherType.Login, name: "Login 2", isDeleted: true },
-          { id: "3", type: CipherType.Login, name: "Login 3", isDeleted: true },
+          { id: "3", type: CipherType.Login, name: "Login 3", isDeleted: false, isArchived: true },
         ] as CipherView[]),
       );
 
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 9d44eef2e47..fa56b45c080 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
@@ -23,8 +23,10 @@ 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 { 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";
@@ -133,14 +135,24 @@ export class VaultPopupItemsService {
       shareReplay({ refCount: true, bufferSize: 1 }),
     );
 
+  private userCanArchive$ = this.activeUserId$.pipe(
+    switchMap((userId) => {
+      return this.cipherArchiveService.userCanArchive$(userId);
+    }),
+  );
+
   private _activeCipherList$: Observable<PopupCipherViewLike[]> = this._allDecryptedCiphers$.pipe(
     switchMap((ciphers) =>
-      combineLatest([this.organizations$, this.decryptedCollections$]).pipe(
-        map(([organizations, collections]) => {
+      combineLatest([this.organizations$, this.decryptedCollections$, this.userCanArchive$]).pipe(
+        map(([organizations, collections, canArchive]) => {
           const orgMap = Object.fromEntries(organizations.map((org) => [org.id, org]));
           const collectionMap = Object.fromEntries(collections.map((col) => [col.id, col]));
           return ciphers
-            .filter((c) => !CipherViewLikeUtils.isDeleted(c))
+            .filter(
+              (c) =>
+                !CipherViewLikeUtils.isDeleted(c) &&
+                (!canArchive || !CipherViewLikeUtils.isArchived(c)),
+            )
             .map((cipher) => {
               (cipher as PopupCipherViewLike).collections = cipher.collectionIds?.map(
                 (colId) => collectionMap[colId as CollectionId],
@@ -330,6 +342,8 @@ export class VaultPopupItemsService {
     private accountService: AccountService,
     private ngZone: NgZone,
     private restrictedItemTypesService: RestrictedItemTypesService,
+    private configService: ConfigService,
+    private cipherArchiveService: CipherArchiveService,
   ) {}
 
   applyFilter(newSearchText: string) {
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/settings/appearance-v2.component.html b/apps/browser/src/vault/popup/settings/appearance-v2.component.html
index 4f7f2757e0e..c9598c76db0 100644
--- a/apps/browser/src/vault/popup/settings/appearance-v2.component.html
+++ b/apps/browser/src/vault/popup/settings/appearance-v2.component.html
@@ -45,7 +45,10 @@
     <bit-card>
       <bit-form-control>
         <input bitCheckbox formControlName="enableFavicon" type="checkbox" />
-        <bit-label>{{ "enableFavicon" | i18n }}</bit-label>
+        <bit-label>
+          {{ "showIconsChangePasswordUrls" | i18n }}
+          <vault-permit-cipher-details-popover></vault-permit-cipher-details-popover>
+        </bit-label>
       </bit-form-control>
       <bit-form-control>
         <input bitCheckbox formControlName="showQuickCopyActions" type="checkbox" />
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 d998ef846d2..23a609bd008 100644
--- a/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
@@ -23,6 +23,7 @@ import {
   Option,
   SelectModule,
 } from "@bitwarden/components";
+import { PermitCipherDetailsPopoverComponent } from "@bitwarden/vault";
 
 import { PopupWidthOption } from "../../../platform/browser/browser-popup-utils";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
@@ -46,6 +47,7 @@ import { VaultPopupCopyButtonsService } from "../services/vault-popup-copy-butto
     ReactiveFormsModule,
     CheckboxModule,
     BadgeModule,
+    PermitCipherDetailsPopoverComponent,
   ],
 })
 export class AppearanceV2Component implements OnInit {
diff --git a/apps/browser/src/vault/popup/settings/archive.component.html b/apps/browser/src/vault/popup/settings/archive.component.html
new file mode 100644
index 00000000000..5fb57814fff
--- /dev/null
+++ b/apps/browser/src/vault/popup/settings/archive.component.html
@@ -0,0 +1,81 @@
+<popup-page [loading]="loading$ | async">
+  <popup-header slot="header" [pageTitle]="'archive' | i18n" showBackButton>
+    <ng-container slot="end">
+      <app-pop-out></app-pop-out>
+    </ng-container>
+  </popup-header>
+
+  @if (archivedCiphers$ | async; as archivedItems) {
+    @if (archivedItems.length) {
+      <bit-section>
+        <bit-section-header>
+          <h2 bitTypography="h6">
+            {{ "itemsInArchive" | i18n }}
+          </h2>
+          <span bitTypography="body1" slot="end">{{ archivedItems.length }}</span>
+        </bit-section-header>
+        <bit-item-group>
+          @for (cipher of archivedItems; track cipher.id) {
+            <bit-item>
+              <button
+                bit-item-content
+                type="button"
+                [appA11yTitle]="'viewItemTitle' | i18n: cipher.name"
+                (click)="view(cipher)"
+              >
+                <div slot="start" class="tw-justify-start tw-w-7 tw-flex">
+                  <app-vault-icon [cipher]="cipher"></app-vault-icon>
+                </div>
+                <span data-testid="item-name">{{ cipher.name }}</span>
+                @if (cipher.hasAttachments) {
+                  <i class="bwi bwi-paperclip bwi-sm" [appA11yTitle]="'attachments' | i18n"></i>
+                }
+                <span slot="secondary">{{ cipher.subTitle }}</span>
+              </button>
+              <bit-item-action slot="end">
+                <button
+                  type="button"
+                  bitIconButton="bwi-ellipsis-v"
+                  size="small"
+                  label="{{ 'options' | i18n }}"
+                  [appA11yTitle]="'moreOptionsTitle' | i18n: cipher.name"
+                  [bitMenuTriggerFor]="moreOptions"
+                ></button>
+                <bit-menu #moreOptions>
+                  <button type="button" bitMenuItem (click)="edit(cipher)">
+                    {{ "edit" | i18n }}
+                  </button>
+                  <button type="button" bitMenuItem (click)="clone(cipher)">
+                    {{ "clone" | i18n }}
+                  </button>
+                  <button type="button" bitMenuItem (click)="unarchive(cipher)">
+                    {{ "unarchive" | i18n }}
+                  </button>
+                  <button
+                    type="button"
+                    bitMenuItem
+                    *appCanDeleteCipher="cipher"
+                    (click)="delete(cipher)"
+                  >
+                    <span class="tw-text-danger">
+                      {{ "delete" | i18n }}
+                    </span>
+                  </button>
+                </bit-menu>
+              </bit-item-action>
+            </bit-item>
+          }
+        </bit-item-group>
+      </bit-section>
+    } @else {
+      <bit-no-items class="tw-flex tw-h-full tw-items-center tw-justify-center">
+        <ng-container slot="title">
+          {{ "noItemsInArchive" | i18n }}
+        </ng-container>
+        <ng-container slot="description">
+          {{ "noItemsInArchiveDesc" | i18n }}
+        </ng-container>
+      </bit-no-items>
+    }
+  }
+</popup-page>
diff --git a/apps/browser/src/vault/popup/settings/archive.component.ts b/apps/browser/src/vault/popup/settings/archive.component.ts
new file mode 100644
index 00000000000..d685beb0287
--- /dev/null
+++ b/apps/browser/src/vault/popup/settings/archive.component.ts
@@ -0,0 +1,182 @@
+import { CommonModule } from "@angular/common";
+import { Component, inject } from "@angular/core";
+import { Router } from "@angular/router";
+import { firstValueFrom, map, Observable, startWith, 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 { 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 {
+  DialogService,
+  IconButtonModule,
+  ItemModule,
+  MenuModule,
+  NoItemsModule,
+  SectionComponent,
+  SectionHeaderComponent,
+  ToastService,
+  TypographyModule,
+} from "@bitwarden/components";
+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";
+
+@Component({
+  templateUrl: "archive.component.html",
+  standalone: true,
+  imports: [
+    CommonModule,
+    JslibModule,
+    PopupPageComponent,
+    PopupHeaderComponent,
+    PopOutComponent,
+    NoItemsModule,
+    ItemModule,
+    MenuModule,
+    IconButtonModule,
+    CanDeleteCipherDirective,
+    SectionComponent,
+    SectionHeaderComponent,
+    TypographyModule,
+  ],
+})
+export class ArchiveComponent {
+  private dialogService = inject(DialogService);
+  private router = inject(Router);
+  private cipherService = inject(CipherService);
+  private accountService = inject(AccountService);
+  private logService = inject(LogService);
+  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);
+
+  protected archivedCiphers$ = this.userId$.pipe(
+    switchMap((userId) => this.cipherArchiveService.archivedCiphers$(userId)),
+  );
+
+  protected loading$ = this.archivedCiphers$.pipe(
+    map(() => false),
+    startWith(true),
+  );
+
+  async view(cipher: CipherView) {
+    if (!(await this.canInteract(cipher))) {
+      return;
+    }
+
+    await this.router.navigate(["/view-cipher"], {
+      queryParams: { cipherId: cipher.id, type: cipher.type },
+    });
+  }
+
+  async edit(cipher: CipherView) {
+    if (!(await this.canInteract(cipher))) {
+      return;
+    }
+
+    await this.router.navigate(["/edit-cipher"], {
+      queryParams: { cipherId: cipher.id, type: cipher.type },
+    });
+  }
+
+  async delete(cipher: CipherView) {
+    if (!(await this.canInteract(cipher))) {
+      return;
+    }
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "deleteItem" },
+      content: { key: "deleteItemConfirmation" },
+      type: "warning",
+    });
+
+    if (!confirmed) {
+      return;
+    }
+
+    const activeUserId = await firstValueFrom(this.userId$);
+
+    try {
+      await this.cipherService.softDeleteWithServer(cipher.id, activeUserId);
+    } catch (e) {
+      this.logService.error(e);
+      return;
+    }
+
+    this.toastService.showToast({
+      variant: "success",
+      message: this.i18nService.t("deletedItem"),
+    });
+  }
+
+  async unarchive(cipher: CipherView) {
+    if (!(await this.canInteract(cipher))) {
+      return;
+    }
+    const activeUserId = await firstValueFrom(this.userId$);
+
+    await this.cipherArchiveService.unarchiveWithServer(cipher.id as CipherId, activeUserId);
+
+    this.toastService.showToast({
+      variant: "success",
+      message: this.i18nService.t("itemRemovedFromArchive"),
+    });
+  }
+
+  async clone(cipher: CipherView) {
+    if (!(await this.canInteract(cipher))) {
+      return;
+    }
+
+    if (cipher.login?.hasFido2Credentials) {
+      const confirmed = await this.dialogService.openSimpleDialog({
+        title: { key: "passkeyNotCopied" },
+        content: { key: "passkeyNotCopiedAlert" },
+        type: "info",
+      });
+
+      if (!confirmed) {
+        return;
+      }
+    }
+
+    await this.router.navigate(["/clone-cipher"], {
+      queryParams: {
+        clone: true.toString(),
+        cipherId: cipher.id,
+        type: cipher.type,
+      },
+    });
+  }
+
+  /**
+   * Check if the user is able to interact with the cipher
+   * (password re-prompt / decryption failure checks).
+   * @param cipher
+   * @private
+   */
+  private canInteract(cipher: CipherView) {
+    if (cipher.decryptionFailure) {
+      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/vault-settings-v2.component.html b/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html
index 4e16f58d7f8..3c1278b4d44 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,6 +34,14 @@
         <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">
+          {{ "archiveNoun" | i18n }}
+          <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
+        </a>
+      </bit-item>
+    }
     <bit-item>
       <a bit-item-content routerLink="/trash">
         {{ "trash" | i18n }}
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 e7305d57cab..92cbf951ead 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
@@ -1,5 +1,6 @@
 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";
 
@@ -8,6 +9,7 @@ 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 { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { BadgeComponent, ItemModule, ToastOptions, ToastService } from "@bitwarden/components";
 
@@ -32,6 +34,17 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
 })
 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(
+    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 emptyVaultImportBadge$ = this.accountService.activeAccount$.pipe(
     getUserId,
@@ -47,6 +60,7 @@ export class VaultSettingsV2Component implements OnInit, OnDestroy {
     private i18nService: I18nService,
     private nudgeService: NudgesService,
     private accountService: AccountService,
+    private cipherArchiveService: CipherArchiveService,
   ) {}
 
   async ngOnInit() {
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/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/uk/copy.resx b/apps/browser/store/locales/uk/copy.resx
index 6f994cd0bf1..0bc1e7afce4 100644
--- a/apps/browser/store/locales/uk/copy.resx
+++ b/apps/browser/store/locales/uk/copy.resx
@@ -130,7 +130,7 @@
 Убезпечте своє цифрове життя та захистіться від витоків даних, генеруючи та зберігаючи унікальні надійні паролі для кожного облікового запису. Зберігайте все в наскрізно зашифрованому сховищі паролів, доступ до якого маєте тільки ви.
 
 ДОСТУП ДО ДАНИХ БУДЬ-ДЕ, БУДЬ-КОЛИ, НА БУДЬ-ЯКОМУ ПРИСТРОЇ
-Легко керуйте, зберігайте, захищайте та діліться необмеженою кількістю паролів на необмеженій кількості пристроїв.
+Легко зберігайте необмежену кількість паролів у безпеці на необмеженій кількості пристроїв, а також керуйте й діліться ними.
 
 КОЖЕН ПОВИНЕН МАТИ ІНСТРУМЕНТИ ДЛЯ БЕЗПЕКИ В ІНТЕРНЕТІ
 Використовуйте Bitwarden безплатно без реклами або продажу даних. Bitwarden вважає, що кожен повинен мати можливість залишатися в безпеці в Інтернеті. Завдяки тарифним планам Преміум можна отримати доступ до розширених можливостей.
@@ -144,7 +144,7 @@
 Інші причини для вибору Bitwarden:
 
 Шифрування світового класу
-Паролі захищаються розширеним наскрізним шифруванням (AES-256, сіллю хешування і PBKDF2 SHA-256), тому ваші дані завжди зберігаються приватно і в безпеці.
+Паролі захищаються за допомогою досконалого наскрізного шифрування (AES-256, хешуванням із сіллю і PBKDF2 SHA-256), тому ваші дані завжди зберігаються приватно і в безпеці.
 
 Сторонні аудити
 Bitwarden регулярно проводить комплексні аудити безпеки із залученням третіх сторін – відомих компаній у сфері безпеки. Під час цих щорічних аудитів проводиться оцінка програмного коду і тестування на проникнення через IP-адреси Bitwarden, сервери та вебпрограми.
@@ -156,13 +156,13 @@ Bitwarden регулярно проводить комплексні аудит
 Передавайте дані безпосередньо іншим користувачам, зберігаючи наскрізне шифрування та обмежуючи їх викриття.
 
 Вбудований генератор
-Створюйте довгі, складні та чіткі паролі, а також унікальні імена користувачів для кожного сайту, який ви відвідуєте. Користуйтеся інтеграцією з провайдерами псевдонімів електронної пошти для забезпечення додаткової приватності.
+Створюйте довгі, складні та особливі паролі, а також унікальні імена користувачів для кожного сайту, який ви відвідуєте. Користуйтеся інтеграцією з провайдерами псевдонімів електронної пошти для забезпечення додаткової приватності.
 
 Переклад різними мовами
 Bitwarden перекладено понад 60 мовами завдяки зусиллям нашої світової спільноти на Crowdin.
 
 Програми для різних платформ
-Захищайте та діліться конфіденційними даними в межах свого сховища Bitwarden з будь-якого браузера, мобільного пристрою або комп'ютерної ОС, а також інших можливостей.
+Захищайте конфіденційні дані та діліться ними в межах свого сховища Bitwarden з будь-якого браузера, мобільного пристрою або комп'ютерної ОС, а також користуйтеся іншими можливостями.
 
 Bitwarden захищає не лише паролі
 Комплексні рішення для керування наскрізно зашифрованими обліковими даними від Bitwarden дають змогу організаціям захищати все, включно з секретами розробників та ключами доступу. Відвідайте Bitwarden.com, щоб дізнатися більше про Менеджер секретів Bitwarden і Bitwarden Passwordless.dev!
diff --git a/apps/browser/store/locales/zh_TW/copy.resx b/apps/browser/store/locales/zh_TW/copy.resx
index ad3f12ae6f0..bfabc13f280 100644
--- a/apps/browser/store/locales/zh_TW/copy.resx
+++ b/apps/browser/store/locales/zh_TW/copy.resx
@@ -121,55 +121,55 @@
     <value>Bitwarden 密碼管理工具</value>
   </data>
   <data name="Summary" xml:space="preserve">
-    <value>無論在家、在辦公或在途中，Bitwarden 都能輕易的保護你的密碼、登入金鑰和敏感資訊。</value>
+    <value>無論在家中、工作中抑或旅途中，Bitwarden 都能輕鬆地保護您的密碼、登入金鑰和敏感資訊。</value>
   </data>
   <data name="Description" xml:space="preserve">
-    <value>Recognized as the best password manager by PCMag, WIRED, The Verge, CNET, G2, and more!
+    <value>被 PCMag、WIRED、The Verge、CNET、G2 等認可為最佳的密碼管理工具！
 
-SECURE YOUR DIGITAL LIFE
-Secure your digital life and protect against data breaches by generating and saving unique, strong passwords for every account. Maintain everything in an end-to-end encrypted password vault that only you can access.
+保護您的數位生活
+透過為每個帳戶產生並保存唯一的強密碼，保護您的數位生活並防止資料外洩。將所有內容儲存在只有您可以存取的端對端加密密碼庫中。
 
-ACCESS YOUR DATA, ANYWHERE, ANYTIME, ON ANY DEVICE
-Easily manage, store, secure, and share unlimited passwords across unlimited devices without restrictions.
+隨時隨地在任何裝置上存取您的資料
+不受限制地跨裝置輕鬆管理、儲存、保護和分享無限多的密碼。
 
-EVERYONE SHOULD HAVE THE TOOLS TO STAY SAFE ONLINE
-Utilize Bitwarden for free with no ads or selling data. Bitwarden believes everyone should have the ability to stay safe online. Premium plans offer access to advanced features.
+每個人都應該擁有保持上網安全的工具
+免費使用 Bitwarden，沒有廣告或銷售資料。Bitwarden 認為每個人都應該有能力確保上網安全。進階版計劃提供對進階功能的存取。
 
-EMPOWER YOUR TEAMS WITH BITWARDEN
-Plans for Teams and Enterprise come with professional business features. Some examples include SSO integration, self-hosting, directory integration and SCIM provisioning, global policies, API access, event logs, and more.
+透過 BITWARDEN 強化您的團隊
+團隊和企業計劃具有專業的商業功能。包括 SSO 整合、自架服務、目錄整合和 SCIM 配置、全域原則、API 存取、事件記錄等。
 
-Use Bitwarden to secure your workforce and share sensitive information with colleagues.
+使用 Bitwarden 來保護您的員工並與同事分享敏感資訊。
 
 
-More reasons to choose Bitwarden:
+選擇 Bitwarden 的其他理由：
 
-World-Class Encryption
-Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashing, and PBKDF2 SHA-256) so your data stays secure and private.
+世界級的加密
+密碼受到進階端對端加密（AES-256 位元加密、加鹽雜湊和 PBKDF2 SHA-256）的保護，因此您的資料保持安全和私密。
 
-3rd-party Audits
-Bitwarden regularly conducts comprehensive third-party security audits with notable security firms. These annual audits include source code assessments and penetration testing across Bitwarden IPs, servers, and web applications.
+第三方稽核
+Bitwarden 定期與知名資安公司進行全面的第三方安全稽核。這些年度稽核包括 Bitwarden IP、伺服器和 Web 應用程式的原始程式碼評估和滲透測試。
 
-Advanced 2FA
-Secure your login with a third-party authenticator, emailed codes, or FIDO2 WebAuthn credentials such as a hardware security key or passkey.
+進階的雙重要素驗證
+使用第三方驗證器、透過電子郵件傳送的代碼或 FIDO2 WebAuthn 憑證（例如硬體安全金鑰或密碼）來保護您的登入。
 
-Bitwarden Send
-Transmit data directly to others while maintaining end-to-end encrypted security and limiting exposure.
+Bitwarden 傳送
+直接將資料傳輸給其他人，同時保持端對端加密安全性並限制暴露。
 
-Built-in Generator
-Create long, complex, and distinct passwords and unique usernames for every site you visit. Integrate with email alias providers for additional privacy.
+內建產生器
+為您造訪的每個網站建立長、複雜且獨特的密碼和唯一的使用者名稱。與電子郵件別名提供者整合以進一步保護隱私。
 
-Global Translations
-Bitwarden translations exist for more than 60 languages, translated by the global community though Crowdin.
+全球化翻譯
+Bitwarden 有 60 多種語言翻譯，由全球社群透過 Crowdin 翻譯。
 
-Cross-Platform Applications
-Secure and share sensitive data within your Bitwarden Vault from any browser, mobile device, or desktop OS, and more.
+跨平台應用程式
+透過任何瀏覽器、行動裝置或桌面作業系統等，保護和共用 Bitwarden 密碼庫中的敏感資料。
 
-Bitwarden secures more than just passwords
-End-to-end encrypted credential management solutions from Bitwarden empower organizations to secure everything, including developer secrets and passkey experiences. Visit Bitwarden.com to learn more about Bitwarden Secrets Manager and Bitwarden Passwordless.dev!
+Bitwarden 保護的不僅是密碼
+Bitwarden 的端對端加密憑證管理解決方案可讓組織保護一切，包括開發人員機密和金鑰體驗。造訪 Bitwarden.com 以了解更多有關 Bitwarden 機密管理員和 Bitwarden Passwordless.dev 的資訊！
 </value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
-    <value>無論在家、在辦公或在途中，Bitwarden 都能輕易的保護你的密碼、登入金鑰和敏感資訊。</value>
+    <value>無論在家中、工作中抑或旅途中，Bitwarden 都能輕鬆地保護您的密碼、登入金鑰和敏感資訊。</value>
   </data>
   <data name="ScreenshotSync" xml:space="preserve">
     <value>在多部裝置上同步和存取密碼庫</value>
diff --git a/apps/browser/test.setup.ts b/apps/browser/test.setup.ts
index eb635e646e1..08b7287984c 100644
--- a/apps/browser/test.setup.ts
+++ b/apps/browser/test.setup.ts
@@ -79,6 +79,7 @@ const scripting = {
   executeScript: jest.fn(),
   registerContentScripts: jest.fn(),
   unregisterContentScripts: jest.fn(),
+  ExecutionWorld: { ISOLATED: "ISOLATED", MAIN: "MAIN" },
 };
 
 const windows = {
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 e5dbd66ab12..659a68d13a5 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -64,11 +64,11 @@
   },
   "dependencies": {
     "@koa/multer": "4.0.0",
-    "@koa/router": "13.1.0",
+    "@koa/router": "14.0.0",
     "big-integer": "1.6.52",
     "browser-hrtime": "1.1.8",
     "chalk": "4.1.2",
-    "commander": "11.1.0",
+    "commander": "14.0.0",
     "core-js": "3.45.0",
     "form-data": "4.0.4",
     "https-proxy-agent": "7.0.6",
@@ -80,7 +80,7 @@
     "koa-json": "2.0.2",
     "lowdb": "1.0.0",
     "lunr": "2.3.9",
-    "multer": "1.4.5-lts.2",
+    "multer": "2.0.2",
     "node-fetch": "2.6.12",
     "node-forge": "1.3.1",
     "open": "10.1.2",
diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts
index 133c9658ae7..7e5058dcff0 100644
--- a/apps/cli/src/auth/commands/login.command.ts
+++ b/apps/cli/src/auth/commands/login.command.ts
@@ -34,6 +34,7 @@ import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/a
 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";
@@ -369,6 +370,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);
     }
   }
diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts
index 92674aa3dcd..f4216196ead 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,38 @@ 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 running in serve or no interaction mode, automatically accept the prompt
+    if (process.env.BW_SERVE === "true" || process.env.BW_NOINTERACTION === "true") {
+      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/list.command.ts b/apps/cli/src/commands/list.command.ts
index d8b4cfcfd10..e5174f67913 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,9 +92,12 @@ 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;
@@ -131,11 +141,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 +302,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 +322,7 @@ class Options {
   search: string;
   url: string;
   trash: boolean;
+  archived: boolean;
 
   constructor(passedOptions: Record<string, any>) {
     this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
@@ -304,5 +331,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/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..3c80d12af2f 100644
--- a/apps/cli/src/oss-serve-configurator.ts
+++ b/apps/cli/src/oss-serve-configurator.ts
@@ -5,6 +5,8 @@ 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";
@@ -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,6 +153,8 @@ 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,
@@ -199,7 +214,7 @@ export class OssServeConfigurator {
     );
   }
 
-  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 +416,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 9e02b9dcca9..27f8e5268bd 100644
--- a/apps/cli/src/platform/services/cli-platform-utils.service.ts
+++ b/apps/cli/src/platform/services/cli-platform-utils.service.ts
@@ -71,6 +71,10 @@ export class CliPlatformUtilsService implements PlatformUtilsService {
     return false;
   }
 
+  isChromium(): boolean {
+    return false;
+  }
+
   isMacAppStore() {
     return false;
   }
diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts
index 4d541739aab..8f202bc0845 100644
--- a/apps/cli/src/program.ts
+++ b/apps/cli/src/program.ts
@@ -5,6 +5,7 @@ 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";
@@ -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");
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 76eeb340550..8fb48fbc1ee 100644
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -59,6 +59,7 @@ import {
 } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/billing/services/account/billing-account-profile-state.service";
+import { HibpApiService } from "@bitwarden/common/dirt/services/hibp-api.service";
 import { ClientType } from "@bitwarden/common/enums";
 import {
   DefaultKeyGenerationService,
@@ -124,6 +125,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 {
@@ -131,6 +133,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";
@@ -179,10 +182,12 @@ import { SerializedMemoryStorageService } from "@bitwarden/storage-core";
 import {
   IndividualVaultExportService,
   IndividualVaultExportServiceAbstraction,
+  VaultExportApiService,
   OrganizationVaultExportService,
   OrganizationVaultExportServiceAbstraction,
   VaultExportService,
   VaultExportServiceAbstraction,
+  DefaultVaultExportApiService,
 } from "@bitwarden/vault-export-core";
 
 import { CliBiometricsService } from "../key-management/cli-biometrics-service";
@@ -221,6 +226,7 @@ export class ServiceContainer {
   tokenService: TokenService;
   appIdService: AppIdService;
   apiService: NodeApiService;
+  hibpApiService: HibpApiService;
   environmentService: EnvironmentService;
   cipherService: CipherService;
   folderService: InternalFolderService;
@@ -241,6 +247,7 @@ export class ServiceContainer {
   importService: ImportServiceAbstraction;
   importApiService: ImportApiServiceAbstraction;
   exportService: VaultExportServiceAbstraction;
+  vaultExportApiService: VaultExportApiService;
   individualExportService: IndividualVaultExportServiceAbstraction;
   organizationExportService: OrganizationVaultExportServiceAbstraction;
   searchService: SearchService;
@@ -298,6 +305,7 @@ export class ServiceContainer {
   cipherEncryptionService: CipherEncryptionService;
   restrictedItemTypesService: RestrictedItemTypesService;
   cliRestrictedItemTypesService: CliRestrictedItemTypesService;
+  cipherArchiveService: CipherArchiveService;
 
   constructor() {
     let p = null;
@@ -686,7 +694,6 @@ export class ServiceContainer {
     );
 
     this.restrictedItemTypesService = new RestrictedItemTypesService(
-      this.configService,
       this.accountService,
       this.organizationService,
       this.policyService,
@@ -726,6 +733,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,
@@ -839,32 +853,38 @@ export class ServiceContainer {
       this.encryptService,
       this.cryptoFunctionService,
       this.kdfConfigService,
-      this.accountService,
       this.apiService,
       this.restrictedItemTypesService,
     );
 
+    this.vaultExportApiService = new DefaultVaultExportApiService(this.apiService);
+
     this.organizationExportService = new OrganizationVaultExportService(
       this.cipherService,
-      this.apiService,
+      this.vaultExportApiService,
       this.pinService,
       this.keyService,
       this.encryptService,
       this.cryptoFunctionService,
       this.collectionService,
       this.kdfConfigService,
-      this.accountService,
       this.restrictedItemTypesService,
     );
 
     this.exportService = new VaultExportService(
       this.individualExportService,
       this.organizationExportService,
+      this.accountService,
     );
 
     this.userAutoUnlockKeyService = new UserAutoUnlockKeyService(this.keyService);
 
-    this.auditService = new AuditService(this.cryptoFunctionService, this.apiService);
+    this.hibpApiService = new HibpApiService(this.apiService);
+    this.auditService = new AuditService(
+      this.cryptoFunctionService,
+      this.apiService,
+      this.hibpApiService,
+    );
 
     this.eventUploadService = new EventUploadService(
       this.apiService,
@@ -907,6 +927,7 @@ 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),
     ]);
 
diff --git a/apps/cli/src/tools/export.command.ts b/apps/cli/src/tools/export.command.ts
index 3fbc466efe0..fd35b845bec 100644
--- a/apps/cli/src/tools/export.command.ts
+++ b/apps/cli/src/tools/export.command.ts
@@ -70,10 +70,13 @@ export class ExportCommand {
         password = await this.promptPassword(password);
       }
 
+      const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
       exportContent =
         options.organizationid == null
-          ? await this.exportService.getExport(format, password)
+          ? await this.exportService.getExport(userId, format, password)
           : await this.exportService.getOrganizationExport(
+              userId,
               options.organizationid,
               format,
               password,
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..03a205e9c48 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";
@@ -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/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 23deda915ed..9020e08362e 100644
--- a/apps/desktop/desktop_native/Cargo.lock
+++ b/apps/desktop/desktop_native/Cargo.lock
@@ -231,17 +231,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "async-fs"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
-dependencies = [
- "async-lock",
- "blocking",
- "futures-lite",
-]
-
 [[package]]
 name = "async-io"
 version = "2.4.0"
@@ -353,6 +342,8 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 name = "autotype"
 version = "0.0.0"
 dependencies = [
+ "anyhow",
+ "tracing",
  "windows 0.61.1",
  "windows-core 0.61.0",
 ]
@@ -459,7 +450,6 @@ dependencies = [
  "cbc",
  "hex",
  "homedir",
- "log",
  "oo7",
  "pbkdf2",
  "rand 0.9.1",
@@ -702,9 +692,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -914,7 +904,6 @@ dependencies = [
  "interprocess",
  "keytar",
  "libc",
- "log",
  "oo7",
  "pin-project",
  "pkcs8",
@@ -933,6 +922,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tokio-util",
+ "tracing",
  "typenum",
  "widestring",
  "windows 0.61.1",
@@ -952,7 +942,6 @@ dependencies = [
  "bitwarden_chromium_importer",
  "desktop_core",
  "hex",
- "log",
  "napi",
  "napi-build",
  "napi-derive",
@@ -961,6 +950,8 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tokio-util",
+ "tracing",
+ "tracing-subscriber",
  "windows-registry",
  "windows_plugin_authenticator",
 ]
@@ -975,6 +966,7 @@ dependencies = [
  "glob",
  "thiserror 2.0.12",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -1021,7 +1013,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1520,7 +1512,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5bdbbd5bc8c5749697ccaa352fa45aff8730cf21c68029c0eef1ffed7c3d6ba2"
 dependencies = [
  "cfg-if",
- "nix",
+ "nix 0.29.0",
  "widestring",
  "windows 0.57.0",
 ]
@@ -1722,7 +1714,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.53.3",
 ]
 
 [[package]]
@@ -1743,9 +1735,9 @@ dependencies = [
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.33.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "947e6816f7825b2b45027c2c32e7085da9934defa535de4a6a46b10a4d5257fa"
+checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f"
 dependencies = [
  "cc",
  "pkg-config",
@@ -1807,9 +1799,19 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-util",
+ "tracing",
  "uniffi",
 ]
 
+[[package]]
+name = "matchers"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+dependencies = [
+ "regex-automata",
+]
+
 [[package]]
 name = "md-5"
 version = "0.10.6"
@@ -1940,6 +1942,18 @@ name = "nix"
 version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nix"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1967,6 +1981,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.50.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "num"
 version = "0.4.3"
@@ -2707,9 +2730,9 @@ dependencies = [
 
 [[package]]
 name = "rusqlite"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a22715a5d6deef63c637207afbe68d0c72c3f8d0022d7cf9714c442d6157606b"
+checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f"
 dependencies = [
  "bitflags",
  "fallible-iterator",
@@ -2875,9 +2898,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "3.1.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81d3f8c9bfcc3cbb6b0179eb57042d75b1582bdc65c3cb95f3fa999509c03cbc"
+checksum = "cc198e42d9b7510827939c9a15f5062a0c913f3371d765977e586d2fe6c16f4a"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -2888,9 +2911,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.13.0"
+version = "2.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2970,6 +2993,15 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -3238,6 +3270,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "thread_local"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "time"
 version = "0.3.41"
@@ -3390,6 +3431,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex-automata",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
 ]
 
 [[package]]
@@ -3610,6 +3681,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
+[[package]]
+name = "valuable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -3936,6 +4013,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.3",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -3960,13 +4046,30 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -3979,6 +4082,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -3991,6 +4100,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -4003,12 +4118,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -4021,6 +4148,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_plugin_authenticator"
 version = "0.0.0"
@@ -4042,6 +4175,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -4054,6 +4193,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -4066,6 +4211,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
 [[package]]
 name = "winnow"
 version = "0.7.10"
@@ -4126,16 +4277,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
 
-[[package]]
-name = "xdg-home"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "yoke"
 version = "0.8.0"
@@ -4162,13 +4303,12 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.5.0"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c333f648ea1b647bc95dc1d34807c8e25ed7a6feff3394034dc4776054b236"
+checksum = "2d07e46d035fb8e375b2ce63ba4e4ff90a7f73cf2ffb0138b29e1158d2eaadf7"
 dependencies = [
  "async-broadcast",
  "async-executor",
- "async-fs",
  "async-io",
  "async-lock",
  "async-process",
@@ -4181,17 +4321,15 @@ dependencies = [
  "futures-core",
  "futures-lite",
  "hex",
- "nix",
+ "nix 0.30.1",
  "ordered-stream",
  "serde",
  "serde_repr",
- "static_assertions",
  "tokio",
  "tracing",
  "uds_windows",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
  "winnow",
- "xdg-home",
  "zbus_macros",
  "zbus_names",
  "zvariant",
@@ -4199,9 +4337,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.5.0"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f325ad10eb0d0a3eb060203494c3b7ec3162a01a59db75d2deee100339709fc0"
+checksum = "57e797a9c847ed3ccc5b6254e8bcce056494b375b511b3d6edcec0aeb4defaca"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -4339,9 +4477,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.5.1"
+version = "5.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "557e89d54880377a507c94cd5452f20e35d14325faf9d2958ebeadce0966c1b2"
+checksum = "999dd3be73c52b1fccd109a4a81e4fcd20fab1d3599c8121b38d04e1419498db"
 dependencies = [
  "endi",
  "enumflags2",
@@ -4354,9 +4492,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.5.1"
+version = "5.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "757779842a0d242061d24c28be589ce392e45350dfb9186dfd7a042a2e19870c"
+checksum = "6643fd0b26a46d226bd90d3f07c1b5321fe9bb7f04673cb37ac6d6883885b68e"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/apps/desktop/desktop_native/Cargo.toml b/apps/desktop/desktop_native/Cargo.toml
index 7e5ab43c6b9..0a637b12de9 100644
--- a/apps/desktop/desktop_native/Cargo.toml
+++ b/apps/desktop/desktop_native/Cargo.toml
@@ -26,7 +26,7 @@ bitwarden-russh = { git = "https://github.com/bitwarden/bitwarden-russh.git", re
 byteorder = "=1.5.0"
 bytes = "=1.10.1"
 cbc = "=0.1.2"
-core-foundation = "=0.10.0"
+core-foundation = "=0.10.1"
 dirs = "=6.0.0"
 ed25519 = "=2.2.3"
 embed_plist = "=1.2.2"
@@ -49,8 +49,8 @@ rsa = "=0.9.6"
 russh-cryptovec = "=0.7.3"
 scopeguard = "=1.2.0"
 secmem-proc = "=0.3.7"
-security-framework = "=3.1.0"
-security-framework-sys = "=2.13.0"
+security-framework = "=3.5.0"
+security-framework-sys = "=2.15.0"
 serde = "=1.0.209"
 serde_json = "=1.0.127"
 sha2 = "=0.10.8"
@@ -62,6 +62,8 @@ 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"
 uniffi = "=0.28.3"
 widestring = "=1.2.0"
@@ -69,7 +71,7 @@ windows = "=0.61.1"
 windows-core = "=0.61.0"
 windows-future = "=0.2.0"
 windows-registry = "=0.5.3"
-zbus = "=5.5.0"
+zbus = "=5.11.0"
 zbus_polkit = "=5.0.0"
 zeroizing-alloc = "=0.1.0"
 
diff --git a/apps/desktop/desktop_native/autotype/Cargo.toml b/apps/desktop/desktop_native/autotype/Cargo.toml
index de026a3ddd8..3d1e74254ce 100644
--- a/apps/desktop/desktop_native/autotype/Cargo.toml
+++ b/apps/desktop/desktop_native/autotype/Cargo.toml
@@ -5,7 +5,11 @@ license.workspace = true
 edition.workspace = true
 publish.workspace = true
 
+[dependencies]
+anyhow = { workspace = true }
+
 [target.'cfg(windows)'.dependencies]
+tracing.workspace = true
 windows = { workspace = true, features = [
     "Win32_UI_Input_KeyboardAndMouse",
     "Win32_UI_WindowsAndMessaging",
diff --git a/apps/desktop/desktop_native/autotype/src/lib.rs b/apps/desktop/desktop_native/autotype/src/lib.rs
index 6d7b9f9db85..92996996434 100644
--- a/apps/desktop/desktop_native/autotype/src/lib.rs
+++ b/apps/desktop/desktop_native/autotype/src/lib.rs
@@ -1,3 +1,5 @@
+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")]
@@ -5,18 +7,26 @@ 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>) -> std::result::Result<(), ()> {
-    windowing::type_input(input)
+/// * `input` must be an array of utf-16 encoded characters to insert.
+///
+/// # 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 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 d53d7af0bd9..9fda0ed9e33 100644
--- a/apps/desktop/desktop_native/autotype/src/linux.rs
+++ b/apps/desktop/desktop_native/autotype/src/linux.rs
@@ -1,7 +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>) -> 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 7ab9f5441b7..c6681a3291e 100644
--- a/apps/desktop/desktop_native/autotype/src/macos.rs
+++ b/apps/desktop/desktop_native/autotype/src/macos.rs
@@ -1,7 +1,7 @@
-pub fn get_foreground_window_title() -> std::result::Result<String, ()> {
-    todo!("Bitwarden does not yet support Mac OS autotype");
+pub fn get_foreground_window_title() -> anyhow::Result<String> {
+    todo!("Bitwarden does not yet support macOS autotype");
 }
 
-pub fn type_input(_input: Vec<u16>) -> std::result::Result<(), ()> {
-    todo!("Bitwarden does not yet support Mac OS autotype");
+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.rs b/apps/desktop/desktop_native/autotype/src/windows.rs
index dba0251ed82..1e125ef8e21 100644
--- a/apps/desktop/desktop_native/autotype/src/windows.rs
+++ b/apps/desktop/desktop_native/autotype/src/windows.rs
@@ -1,48 +1,156 @@
-use std::ffi::OsString;
-use std::os::windows::ffi::OsStringExt;
+use std::{ffi::OsString, os::windows::ffi::OsStringExt};
 
-use windows::Win32::Foundation::{GetLastError, HWND};
-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,
+use anyhow::{anyhow, Result};
+use tracing::{debug, error, warn};
+use windows::Win32::{
+    Foundation::{GetLastError, SetLastError, HWND, WIN32_ERROR},
+    UI::{
+        Input::KeyboardAndMouse::{
+            SendInput, INPUT, INPUT_0, INPUT_KEYBOARD, KEYBDINPUT, KEYEVENTF_KEYUP,
+            KEYEVENTF_UNICODE, VIRTUAL_KEY,
+        },
+        WindowsAndMessaging::{GetForegroundWindow, GetWindowTextLengthW, GetWindowTextW},
+    },
 };
 
+const WIN32_SUCCESS: WIN32_ERROR = WIN32_ERROR(0);
+
+fn clear_last_error() {
+    debug!("Clearing last error with SetLastError.");
+    unsafe {
+        SetLastError(WIN32_ERROR(0));
+    }
+}
+
+fn get_last_error() -> WIN32_ERROR {
+    let last_err = unsafe { GetLastError() };
+    debug!("GetLastError(): {}", last_err.to_hresult().message());
+    last_err
+}
+
+// The handle should be validated before any unsafe calls referencing it.
+fn validate_window_handle(handle: &HWND) -> Result<()> {
+    if handle.is_invalid() {
+        error!("Window handle is invalid.");
+        return Err(anyhow!("Window handle is invalid."));
+    }
+    Ok(())
+}
+
+// ---------- Window title --------------
+
 /// 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(());
-    };
+pub fn get_foreground_window_title() -> Result<String> {
+    // https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getforegroundwindow
+    let window_handle = unsafe { GetForegroundWindow() };
 
-    Ok(window_title)
+    debug!("GetForegroundWindow() called.");
+
+    validate_window_handle(&window_handle)?;
+
+    get_window_title(&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> {
+    // GetWindowTextLengthW does not itself clear the last error so we must do it ourselves.
+    clear_last_error();
+
+    validate_window_handle(window_handle)?;
+
+    let length = unsafe { GetWindowTextLengthW(*window_handle) };
+
+    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 = 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.
+///
+/// https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getwindowtextw
+fn get_window_title(window_handle: &HWND) -> Result<String> {
+    let expected_window_title_length = get_window_title_length(window_handle)?;
+
+    // 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.
+    if expected_window_title_length == 0 {
+        warn!("Window title length is zero.");
+        return Ok(String::from(""));
+    }
+
+    let mut buffer: Vec<u16> = vec![0; expected_window_title_length + 1]; // add extra space for the null character
+
+    validate_window_handle(window_handle)?;
+
+    let actual_window_title_length = unsafe { GetWindowTextW(*window_handle, &mut buffer) };
+
+    debug!(actual_window_title_length, "window title retrieved.");
+
+    if actual_window_title_length == 0 {
+        // attempt to retreive win32 error
+        let last_err = 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_window_title_length, "No window title retrieved.");
+    }
+
+    let window_title = OsString::from_wide(&buffer);
+
+    Ok(window_title.to_string_lossy().into_owned())
+}
+
+// ---------- Type Input --------------
+
 /// Attempts to type the input text wherever the user's cursor is.
 ///
-/// `input` must be an array of utf-16 encoded characters to insert.
+/// `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
 ///
 /// https://learn.microsoft.com/en-in/windows/win32/api/winuser/nf-winuser-sendinput
-pub fn type_input(input: Vec<u16>) -> Result<(), ()> {
-    const TAB_KEY: u16 = 9;
-    let mut keyboard_inputs: Vec<INPUT> = Vec::new();
+pub fn type_input(input: Vec<u16>, keyboard_shortcut: Vec<String>) -> Result<()> {
+    const TAB_KEY: u8 = 9;
 
-    // Release hotkeys
-    keyboard_inputs.push(build_virtual_key_input(InputKeyPress::Up, 0x12)); // alt
-    keyboard_inputs.push(build_virtual_key_input(InputKeyPress::Up, 0x11)); // ctrl
-    keyboard_inputs.push(build_unicode_input(InputKeyPress::Up, 105)); // i
+    // 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));
 
+    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})
     for i in input {
-        let next_down_input = if i == TAB_KEY {
+        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)
         };
-        let next_up_input = if i == TAB_KEY {
+        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)
@@ -55,59 +163,65 @@ pub fn type_input(input: Vec<u16>) -> Result<(), ()> {
     send_input(keyboard_inputs)
 }
 
-/// Gets the foreground window handle.
+/// Converts a valid shortcut key to an "up" keyboard input.
 ///
-/// 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() };
+/// `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> {
+    const SHIFT_KEY: u8 = 0x10;
+    const SHIFT_KEY_STR: &str = "Shift";
+    const CONTROL_KEY: u8 = 0x11;
+    const CONTROL_KEY_STR: &str = "Control";
+    const ALT_KEY: u8 = 0x12;
+    const ALT_KEY_STR: &str = "Alt";
+    const LEFT_WINDOWS_KEY: u8 = 0x5B;
+    const LEFT_WINDOWS_KEY_STR: &str = "Super";
 
-    if foreground_window_handle.is_invalid() {
-        return Err(());
-    }
-
-    Ok(foreground_window_handle)
+    Ok(match key.as_str() {
+        SHIFT_KEY_STR => build_virtual_key_input(InputKeyPress::Up, SHIFT_KEY),
+        CONTROL_KEY_STR => build_virtual_key_input(InputKeyPress::Up, CONTROL_KEY),
+        ALT_KEY_STR => build_virtual_key_input(InputKeyPress::Up, ALT_KEY),
+        LEFT_WINDOWS_KEY_STR => build_virtual_key_input(InputKeyPress::Up, LEFT_WINDOWS_KEY),
+        _ => build_unicode_input(InputKeyPress::Up, get_alphabetic_hotkey(key)?),
+    })
 }
 
-/// Gets the length of the window title bar text.
+/// Given a letter that is a String, get the utf16 encoded
+/// decimal version of the letter as long as it meets the
+/// [a-z][A-Z] restriction.
 ///
-/// 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(());
+/// 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> {
+    if letter.len() != 1 {
+        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}"
+        ));
     }
 
-    match usize::try_from(unsafe { GetWindowTextLengthW(window_handle) }) {
-        Ok(length) => Ok(length),
-        Err(_) => Err(()),
+    let c = letter.chars().next().expect("letter is size 1");
+
+    // is_ascii_alphabetic() checks for:
+    // U+0041 `A` ..= U+005A `Z`, or  U+0061 `a` ..= U+007A `z`
+    if !c.is_ascii_alphabetic() {
+        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}'",
+        ));
     }
+
+    let c = c as u16;
+
+    debug!(c, letter, "Got alphabetic hotkey.");
+
+    Ok(c)
 }
 
-/// 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,
@@ -183,17 +297,57 @@ 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<(), ()> {
+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() };
-    println!("type_input() called, GetLastError() is: {:?}", e);
+    debug!("SendInput() called.");
 
     if insert_count == 0 {
-        return Err(()); // input was blocked by another thread
+        let last_err = 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 = 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()
+        ));
     }
 
+    debug!(insert_count, "Autotype sent input.");
+
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn get_alphabetic_hot_key_happy() {
+        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 = "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 = "Letter is not ASCII Alphabetic ([a-z][A-Z]): '}'"]
+    fn get_alphabetic_hot_key_fail_not_alphabetic() {
+        let letter = String::from("}");
+        get_alphabetic_hotkey(letter).unwrap();
+    }
+}
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml b/apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml
index 8512ed1b319..d1efbd006f0 100644
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml
+++ b/apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml
@@ -14,10 +14,9 @@ base64 = { workspace = true }
 cbc = { workspace = true, features = ["alloc"] }
 hex = { workspace = true }
 homedir = { workspace = true }
-log = { workspace = true }
 pbkdf2 = "=0.12.2"
 rand = { workspace = true }
-rusqlite = { version = "=0.35.0", features = ["bundled"] }
+rusqlite = { version = "=0.37.0", features = ["bundled"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 sha1 = "=0.10.6"
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/crypto.rs b/apps/desktop/desktop_native/bitwarden_chromium_importer/src/crypto.rs
index a2b87d758a4..e6442e21742 100644
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/crypto.rs
+++ b/apps/desktop/desktop_native/bitwarden_chromium_importer/src/crypto.rs
@@ -1,6 +1,6 @@
 //! Cryptographic primitives used in the SDK
 
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 
 use aes::cipher::{
     block_padding::Pkcs7, generic_array::GenericArray, typenum::U32, BlockDecryptMut, KeyIvInit,
@@ -9,9 +9,40 @@ use aes::cipher::{
 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();
-    return cbc::Decryptor::<aes::Aes256>::new(&key, iv)
+    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/util.rs b/apps/desktop/desktop_native/bitwarden_chromium_importer/src/util.rs
index 5edd4a2610f..e9c20ab621d 100644
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/util.rs
+++ b/apps/desktop/desktop_native/bitwarden_chromium_importer/src/util.rs
@@ -29,7 +29,7 @@ pub fn split_encrypted_string_and_validate<'a>(
 
 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 = decryptor
+    let plaintext: Vec<u8> = decryptor
         .decrypt_padded_vec_mut::<Pkcs7>(ciphertext)
         .map_err(|e| anyhow!("Failed to decrypt: {}", e))?;
     Ok(plaintext)
@@ -41,3 +41,110 @@ pub fn derive_saltysalt(password: &[u8], iterations: u32) -> Result<Vec<u8>> {
         .map_err(|e| anyhow!("Failed to derive master key: {}", e))?;
     Ok(key)
 }
+
+#[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;
+
+    fn run_split_encrypted_string_test<'a, const N: usize>(
+        successfully_split: bool,
+        plaintext_to_encrypt: &'a str,
+        version: &'a str,
+        password: Vec<u8>,
+    ) {
+        let res = super::split_encrypted_string(plaintext_to_encrypt.as_bytes());
+
+        assert_eq!(res.is_ok(), successfully_split);
+        if let Ok((version_found, password_found)) = res {
+            assert_eq!(version_found, version);
+            assert_eq!(password_found.len(), password.len());
+            assert_eq!(password_found, &password);
+        }
+    }
+
+    #[test]
+    fn test_split_encrypted_string_success_v10() {
+        run_split_encrypted_string_test::<LENGTH0>(
+            true,
+            "v10EncryptMe!",
+            "v10",
+            vec![69, 110, 99, 114, 121, 112, 116, 77, 101, 33],
+        );
+    }
+
+    #[test]
+    fn test_split_encrypted_string_fail_no_password() {
+        run_split_encrypted_string_test::<LENGTH10>(true, "v09", "v09", Vec::<u8>::new());
+    }
+
+    #[test]
+    fn test_split_encrypted_string_fail_too_small() {
+        run_split_encrypted_string_test::<LENGTH10>(false, "v0", "v0", vec![0]);
+    }
+
+    fn run_split_encrypted_string_and_validate_test(
+        valid_version: bool,
+        plaintext_to_encrypt: &str,
+        supported_versions: &[&str],
+    ) {
+        let result = super::split_encrypted_string_and_validate(
+            plaintext_to_encrypt.as_bytes(),
+            supported_versions,
+        );
+        assert_eq!(result.is_ok(), valid_version);
+    }
+
+    #[test]
+    fn test_split_encrypted_string_and_validate_version_found_from_single_version() {
+        run_split_encrypted_string_and_validate_test(true, "v10EncryptMe!", &["v10"]);
+    }
+
+    #[test]
+    fn test_split_encrypted_string_and_validate_version_found_from_multiple_versions() {
+        run_split_encrypted_string_and_validate_test(true, "v10EncryptMe!", &["v11", "v10"]);
+    }
+
+    #[test]
+    fn test_split_encrypted_string_and_validate_version_not_found() {
+        run_split_encrypted_string_and_validate_test(false, "v10EncryptMe!", &["v11", "v12"]);
+    }
+
+    #[test]
+    fn test_split_encrypted_string_and_validate_version_not_found_empty_list() {
+        run_split_encrypted_string_and_validate_test(false, "v10EncryptMe!", &[]);
+    }
+
+    #[test]
+    fn test_decrypt_aes_128_cbc() {
+        let offset = 0;
+        let increment = 1;
+
+        let iv = generate_vec(LENGTH16, offset, increment);
+        let iv: &[u8; LENGTH16] = iv.as_slice().try_into().unwrap();
+        let key: GenericArray<u8, _> = generate_generic_array(0, 1);
+        let data = cbc::Encryptor::<aes::Aes128>::new(&key, iv.into())
+            .encrypt_padded_vec_mut::<Pkcs7>("EncryptMe!".as_bytes());
+
+        let decrypted = super::decrypt_aes_128_cbc(&key, iv, &data).unwrap();
+
+        assert_eq!(String::from_utf8(decrypted).unwrap(), "EncryptMe!");
+    }
+}
diff --git a/apps/desktop/desktop_native/core/Cargo.toml b/apps/desktop/desktop_native/core/Cargo.toml
index 3aedf90613e..36e1a85abc0 100644
--- a/apps/desktop/desktop_native/core/Cargo.toml
+++ b/apps/desktop/desktop_native/core/Cargo.toml
@@ -31,7 +31,6 @@ ed25519 = { workspace = true, features = ["pkcs8"] }
 futures = { workspace = true }
 homedir = { workspace = true }
 interprocess = { workspace = true, features = ["tokio"] }
-log = { workspace = true }
 pin-project = { workspace = true }
 pkcs8 = { workspace = true, features = ["alloc", "encryption", "pem"] }
 rand = { workspace = true }
@@ -52,6 +51,7 @@ 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 }
 
diff --git a/apps/desktop/desktop_native/core/src/autostart/linux.rs b/apps/desktop/desktop_native/core/src/autostart/linux.rs
index 1fd02a6ea5d..b89ba80f71d 100644
--- a/apps/desktop/desktop_native/core/src/autostart/linux.rs
+++ b/apps/desktop/desktop_native/core/src/autostart/linux.rs
@@ -1,5 +1,6 @@
 use anyhow::Result;
 use ashpd::desktop::background::Background;
+use tracing::{error, info};
 
 pub async fn set_autostart(autostart: bool, params: Vec<String>) -> Result<()> {
     let request = if params.is_empty() {
@@ -10,11 +11,15 @@ pub async fn set_autostart(autostart: bool, params: Vec<String>) -> Result<()> {
 
     match request.send().await.and_then(|r| r.response()) {
         Ok(response) => {
-            println!("[ASHPD] Autostart enabled: {:?}", response);
+            info!(
+                response = ?response,
+                "[ASHPD] Autostart enabled");
             Ok(())
         }
         Err(err) => {
-            println!("[ASHPD] Error enabling autostart: {}", err);
+            error!(
+                error = %err,
+                "[ASHPD] Error enabling autostart");
             Err(anyhow::anyhow!("error enabling autostart {}", err))
         }
     }
diff --git a/apps/desktop/desktop_native/core/src/biometric/unix.rs b/apps/desktop/desktop_native/core/src/biometric/unix.rs
index 60392adc9d7..0f6ff8f33dc 100644
--- a/apps/desktop/desktop_native/core/src/biometric/unix.rs
+++ b/apps/desktop/desktop_native/core/src/biometric/unix.rs
@@ -4,6 +4,7 @@ use 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;
@@ -35,7 +36,7 @@ impl super::BiometricTrait for Biometric {
         match result {
             Ok(result) => Ok(result.is_authorized),
             Err(e) => {
-                println!("polkit biometric error: {:?}", e);
+                error!( error = %e, "polkit biometric error");
                 Ok(false)
             }
         }
diff --git a/apps/desktop/desktop_native/core/src/ipc/client.rs b/apps/desktop/desktop_native/core/src/ipc/client.rs
index 6c4ca0a6053..45b19e72bb8 100644
--- a/apps/desktop/desktop_native/core/src/ipc/client.rs
+++ b/apps/desktop/desktop_native/core/src/ipc/client.rs
@@ -5,21 +5,21 @@ use interprocess::local_socket::{
     tokio::{prelude::*, Stream},
     GenericFilePath, ToFsName,
 };
-use log::{error, info};
+use tracing::{error, info};
 
 pub async fn connect(
     path: PathBuf,
     send: tokio::sync::mpsc::Sender<String>,
     mut recv: tokio::sync::mpsc::Receiver<String>,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    info!("Attempting to connect to {}", path.display());
+    info!(?path, "Attempting to connect");
 
     let name = path.as_os_str().to_fs_name::<GenericFilePath>()?;
     let conn = Stream::connect(name).await?;
 
     let mut conn = crate::ipc::internal_ipc_codec(conn);
 
-    info!("Connected to {}", path.display());
+    info!(?path, "Connected");
 
     // This `connected` and the latter `disconnected` messages are the only ones that
     // are sent from the Rust IPC code and not just forwarded from the desktop app.
@@ -46,7 +46,7 @@ pub async fn connect(
             res = conn.next() => {
                 match res {
                     Some(Err(e)) => {
-                        error!("Error reading from IPC server: {e}");
+                        error!(error = %e, "Error reading from IPC server");
                         break;
                     }
                      None => {
diff --git a/apps/desktop/desktop_native/core/src/ipc/server.rs b/apps/desktop/desktop_native/core/src/ipc/server.rs
index a1c77e7ab16..2762a832ac6 100644
--- a/apps/desktop/desktop_native/core/src/ipc/server.rs
+++ b/apps/desktop/desktop_native/core/src/ipc/server.rs
@@ -7,12 +7,12 @@ use futures::{SinkExt, StreamExt, TryFutureExt};
 
 use anyhow::Result;
 use interprocess::local_socket::{tokio::prelude::*, GenericFilePath, ListenerOptions};
-use log::{error, info};
 use tokio::{
     io::{AsyncRead, AsyncWrite},
     sync::{broadcast, mpsc},
 };
 use tokio_util::sync::CancellationToken;
+use tracing::{error, info};
 
 use super::MESSAGE_CHANNEL_BUFFER;
 
@@ -143,11 +143,11 @@ async fn listen_incoming(
                             client_id
                         );
                         tokio::spawn(future.map_err(|e| {
-                            error!("Error handling connection: {}", e)
+                            error!(error = %e, "Error handling connection")
                         }));
                     },
                     Err(e) => {
-                        error!("Error accepting connection: {}", e);
+                        error!(error = %e, "Error accepting connection");
                         break;
                     },
                 }
@@ -176,7 +176,7 @@ async fn handle_connection(
     loop {
         tokio::select! {
             _ = cancel_token.cancelled() => {
-                info!("Client {client_id} cancelled.");
+                info!(client_id, "Client cancelled.");
                 break;
             },
 
@@ -187,7 +187,7 @@ async fn handle_connection(
                         client_stream.send(msg.into()).await?;
                     },
                     Err(e) => {
-                        info!("Error reading message: {}", e);
+                        error!(error = %e, "Error reading message");
                         break;
                     }
                 }
@@ -199,7 +199,7 @@ async fn handle_connection(
             result = client_stream.next() => {
                 match result {
                     Some(Err(e))  => {
-                        info!("Error reading from client {client_id}: {e}");
+                        error!(client_id, error = %e, "Error reading from client");
 
                         client_to_server_send.send(Message {
                             client_id,
@@ -209,7 +209,7 @@ async fn handle_connection(
                         break;
                     },
                     None => {
-                        info!("Client {client_id} disconnected.");
+                        info!(client_id, "Client disconnected.");
 
                         client_to_server_send.send(Message {
                             client_id,
diff --git a/apps/desktop/desktop_native/core/src/password/unix.rs b/apps/desktop/desktop_native/core/src/password/unix.rs
index 0b1c59e7724..b7595dca287 100644
--- a/apps/desktop/desktop_native/core/src/password/unix.rs
+++ b/apps/desktop/desktop_native/core/src/password/unix.rs
@@ -2,6 +2,7 @@ use crate::password::PASSWORD_NOT_FOUND;
 use anyhow::{anyhow, Result};
 use oo7::dbus::{self};
 use std::collections::HashMap;
+use tracing::info;
 
 pub async fn get_password(service: &str, account: &str) -> Result<String> {
     match get_password_new(service, account).await {
@@ -27,7 +28,7 @@ async fn get_password_new(service: &str, account: &str) -> Result<String> {
 
 // forces to read via secret service; remvove after 2025.03
 async fn get_password_legacy(service: &str, account: &str) -> Result<String> {
-    println!("falling back to get legacy {} {}", service, account);
+    info!("falling back to get legacy {} {}", service, account);
     let svc = dbus::Service::new().await?;
     let collection = svc.default_collection().await?;
     let keyring = oo7::Keyring::DBus(collection);
@@ -38,10 +39,7 @@ async fn get_password_legacy(service: &str, account: &str) -> Result<String> {
     match res {
         Some(res) => {
             let secret = res.secret().await?;
-            println!(
-                "deleting legacy secret service entry {} {}",
-                service, account
-            );
+            info!(service, account, "deleting legacy secret service entry",);
             keyring.delete(&attributes).await?;
             let secret_string = String::from_utf8(secret.to_vec())?;
             set_password(service, account, &secret_string).await?;
@@ -77,7 +75,7 @@ pub async fn delete_password(service: &str, account: &str) -> Result<()> {
     // seems to happen because we call [delete_password] many times when a forced
     // de-auth occurs to clean up old keys.
     if is_locked().await? {
-        println!("skipping deletion of old keys. OS keyring is locked.");
+        info!("skipping deletion of old keys. OS keyring is locked.");
         return Ok(());
     }
 
@@ -105,11 +103,11 @@ pub async fn is_locked() -> Result<bool> {
     if let Some(item) = items.first() {
         return match item.is_locked().await {
             Ok(is_locked) => {
-                println!("OS keyring is locked = {is_locked}");
+                info!(is_locked, "OS keyring");
                 Ok(is_locked)
             }
             Err(_) => {
-                println!("OS keyring is unlocked");
+                info!("OS keyring is unlocked");
                 Ok(false)
             }
         };
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..3440a0114ae 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs
@@ -11,6 +11,7 @@ use bitwarden_russh::{
     session_bind::SessionBindResult,
     ssh_agent::{self, SshKey},
 };
+use tracing::{error, info};
 
 #[cfg_attr(target_os = "windows", path = "windows.rs")]
 #[cfg_attr(target_os = "macos", path = "unix.rs")]
@@ -86,7 +87,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 +95,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 +106,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,7 +173,7 @@ 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");
             }
         }
     }
@@ -181,7 +182,7 @@ impl ssh_agent::Agent<peerinfo::models::PeerInfo, BitwardenSshKey>
 impl BitwardenDesktopAgent<BitwardenSshKey> {
     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 +228,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 +266,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..cb10e873a33 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
@@ -14,6 +14,7 @@ use tokio::{
     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 +32,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 +73,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/unix.rs b/apps/desktop/desktop_native/core/src/ssh_agent/unix.rs
index 53142d4c476..813ebd61cc1 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/unix.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/unix.rs
@@ -12,6 +12,7 @@ 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 crate::ssh_agent::peercred_unix_listener_stream::PeercredUnixListenerStream;
 
@@ -36,14 +37,12 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
             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");
+                    info!("BITWARDEN_SSH_AUTH_SOCK not set, using default path");
 
                     let ssh_agent_directory = match my_home() {
                         Ok(Some(home)) => home,
                         _ => {
-                            println!(
-                                "[SSH Agent Native Module] Could not determine home directory"
-                            );
+                            info!("Could not determine home directory");
                             return;
                         }
                     };
@@ -65,10 +64,10 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
                 }
             };
 
-            println!("[SSH Agent Native Module] Starting SSH Agent server on {ssh_path:?}");
+            info!(socket = %ssh_path, "Starting SSH Agent server");
             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}");
+                error!(error = %e, socket = %ssh_path, "Could not remove existing socket file");
                 if e.kind() != std::io::ErrorKind::NotFound {
                     return;
                 }
@@ -79,7 +78,7 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
                     // 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}");
+                        error!(error = %e, socket = ?sockname, "Could not set socket permissions");
                         return;
                     }
 
@@ -100,10 +99,10 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
                     cloned_agent_state
                         .is_running
                         .store(false, std::sync::atomic::Ordering::Relaxed);
-                    println!("[SSH Agent Native Module] SSH Agent server exited");
+                    info!("SSH Agent server exited");
                 }
                 Err(e) => {
-                    eprintln!("[SSH Agent Native Module] Error while starting agent server: {e}");
+                    error!(error = %e, socket = %ssh_path, "Unable to start start agent server");
                 }
             }
         });
diff --git a/apps/desktop/desktop_native/macos_provider/Cargo.toml b/apps/desktop/desktop_native/macos_provider/Cargo.toml
index a48aadb5b99..9f042209b06 100644
--- a/apps/desktop/desktop_native/macos_provider/Cargo.toml
+++ b/apps/desktop/desktop_native/macos_provider/Cargo.toml
@@ -21,6 +21,7 @@ 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]
diff --git a/apps/desktop/desktop_native/macos_provider/src/lib.rs b/apps/desktop/desktop_native/macos_provider/src/lib.rs
index 89a6063e4fa..b72e8cabb75 100644
--- a/apps/desktop/desktop_native/macos_provider/src/lib.rs
+++ b/apps/desktop/desktop_native/macos_provider/src/lib.rs
@@ -7,8 +7,8 @@ use std::{
 };
 
 use futures::FutureExt;
-use log::{error, info};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use tracing::{error, info};
 
 uniffi::setup_scaffolding!();
 
@@ -134,21 +134,21 @@ impl MacOSProviderClient {
                                 match value {
                                     Ok(value) => {
                                         if let Err(e) = cb.complete(value) {
-                                            error!("Error deserializing message: {e}");
+                                            error!(error = %e, "Error deserializing message");
                                         }
                                     }
                                     Err(e) => {
-                                        error!("Error processing message: {e:?}");
+                                        error!(error = ?e, "Error processing message");
                                         cb.error(e)
                                     }
                                 }
                             }
                             None => {
-                                error!("No callback found for sequence number: {sequence_number}")
+                                error!(sequence_number, "No callback found for sequence number")
                             }
                         },
                         Err(e) => {
-                            error!("Error deserializing message: {e}");
+                            error!(error = %e, "Error deserializing message");
                         }
                     };
                 }
diff --git a/apps/desktop/desktop_native/napi/Cargo.toml b/apps/desktop/desktop_native/napi/Cargo.toml
index 9e8404ea8dc..5e2e42b463f 100644
--- a/apps/desktop/desktop_native/napi/Cargo.toml
+++ b/apps/desktop/desktop_native/napi/Cargo.toml
@@ -20,7 +20,6 @@ base64 = { workspace = true }
 bitwarden_chromium_importer = { path = "../bitwarden_chromium_importer" }
 desktop_core = { path = "../core" }
 hex = { workspace = true }
-log = { workspace = true }
 napi = { workspace = true, features = ["async"] }
 napi-derive = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
@@ -28,6 +27,8 @@ serde_json = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
 tokio-util = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
 windows-registry = { workspace = true }
diff --git a/apps/desktop/desktop_native/napi/index.d.ts b/apps/desktop/desktop_native/napi/index.d.ts
index 3f34b7ba4f4..6df4667928a 100644
--- a/apps/desktop/desktop_native/napi/index.d.ts
+++ b/apps/desktop/desktop_native/napi/index.d.ts
@@ -239,5 +239,5 @@ export declare namespace chromium_importer {
 }
 export declare namespace autotype {
   export function getForegroundWindowTitle(): string
-  export function typeInput(input: Array<number>): void
+  export function typeInput(input: Array<number>, keyboardShortcut: Array<string>): void
 }
diff --git a/apps/desktop/desktop_native/napi/src/lib.rs b/apps/desktop/desktop_native/napi/src/lib.rs
index 4d2af3f9b00..f5048827e79 100644
--- a/apps/desktop/desktop_native/napi/src/lib.rs
+++ b/apps/desktop/desktop_native/napi/src/lib.rs
@@ -175,6 +175,7 @@ pub mod sshagent {
         threadsafe_function::{ErrorStrategy::CalleeHandled, ThreadsafeFunction},
     };
     use tokio::{self, sync::Mutex};
+    use tracing::error;
 
     #[napi]
     pub struct SshAgentState {
@@ -242,7 +243,7 @@ pub mod sshagent {
                                     .expect("should be able to send auth response to agent");
                             }
                             Err(e) => {
-                                println!("[SSH Agent Native Module] calling UI callback promise was rejected: {e}");
+                                error!(error = %e, "Calling UI callback promise was rejected");
                                 let _ = auth_response_tx_arc
                                     .lock()
                                     .await
@@ -251,7 +252,7 @@ pub mod sshagent {
                             }
                         },
                         Err(e) => {
-                            println!("[SSH Agent Native Module] calling UI callback could not create promise: {e}");
+                            error!(error = %e, "Calling UI callback could not create promise");
                             let _ = auth_response_tx_arc
                                 .lock()
                                 .await
@@ -513,6 +514,7 @@ pub mod autofill {
         ErrorStrategy, ThreadsafeFunction, ThreadsafeFunctionCallMode,
     };
     use serde::{de::DeserializeOwned, Deserialize, Serialize};
+    use tracing::error;
 
     #[napi]
     pub async fn run_command(value: String) -> napi::Result<String> {
@@ -684,7 +686,7 @@ pub mod autofill {
                         MessageType::Connected | MessageType::Disconnected => continue,
                         MessageType::Message => {
                             let Some(message) = message else {
-                                println!("[ERROR] Message is empty");
+                                error!("Message is empty");
                                 continue;
                             };
 
@@ -702,7 +704,7 @@ pub mod autofill {
                                     continue;
                                 }
                                 Err(e) => {
-                                    println!("[ERROR] Error deserializing message1: {e}");
+                                    error!(error = %e, "Error deserializing message1");
                                 }
                             }
 
@@ -721,7 +723,7 @@ pub mod autofill {
                                     continue;
                                 }
                                 Err(e) => {
-                                    println!("[ERROR] Error deserializing message1: {e}");
+                                    error!(error = %e, "Error deserializing message1");
                                 }
                             }
 
@@ -738,9 +740,7 @@ pub mod autofill {
                                     continue;
                                 }
                                 Err(e) => {
-                                    println!(
-                                        "[ERROR] Error deserializing registration request: {e}"
-                                    );
+                                    error!(error = %e, "Error deserializing message2");
                                 }
                             }
 
@@ -759,7 +759,7 @@ pub mod autofill {
                                 }
                             }
 
-                            println!("[ERROR] Received an unknown message2: {message:?}");
+                            error!(message, "Received an unknown message2");
                         }
                     }
                 }
@@ -856,11 +856,28 @@ pub mod passkey_authenticator {
 
 #[napi]
 pub mod logging {
-    use log::{Level, Metadata, Record};
+    //! `logging` is the interface between the native desktop's usage of the `tracing` crate
+    //!  for logging, to intercept events and write to the JS space.
+    //!
+    //! # 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}
+
+    use std::fmt::Write;
+    use std::sync::OnceLock;
+
     use napi::threadsafe_function::{
         ErrorStrategy::CalleeHandled, ThreadsafeFunction, ThreadsafeFunctionCallMode,
     };
-    use std::sync::OnceLock;
+    use tracing::Level;
+    use tracing_subscriber::fmt::format::{DefaultVisitor, Writer};
+    use tracing_subscriber::{
+        filter::{EnvFilter, LevelFilter},
+        layer::SubscriberExt,
+        util::SubscriberInitExt,
+        Layer,
+    };
+
     struct JsLogger(OnceLock<ThreadsafeFunction<(LogLevel, String), CalleeHandled>>);
     static JS_LOGGER: JsLogger = JsLogger(OnceLock::new());
 
@@ -873,42 +890,86 @@ pub mod logging {
         Error,
     }
 
-    impl From<Level> for LogLevel {
-        fn from(level: Level) -> Self {
-            match level {
-                Level::Trace => LogLevel::Trace,
-                Level::Debug => LogLevel::Debug,
-                Level::Info => LogLevel::Info,
-                Level::Warn => LogLevel::Warn,
-                Level::Error => LogLevel::Error,
+    impl From<&Level> for LogLevel {
+        fn from(level: &Level) -> Self {
+            match *level {
+                Level::TRACE => LogLevel::Trace,
+                Level::DEBUG => LogLevel::Debug,
+                Level::INFO => LogLevel::Info,
+                Level::WARN => LogLevel::Warn,
+                Level::ERROR => LogLevel::Error,
             }
         }
     }
 
+    // JsLayer lets us intercept events and write them to the JS Logger.
+    struct JsLayer;
+
+    impl<S> Layer<S> for JsLayer
+    where
+        S: tracing::Subscriber,
+    {
+        // This function builds a log message buffer from the event data and
+        // calls the JS logger with it.
+        //
+        // For example, this log call:
+        //
+        // ```
+        // mod supreme {
+        //   mod module {
+        //     let foo = "bar";
+        //     info!(best_variable_name = %foo, "Foo done it again.");
+        //   }
+        // }
+        // ```
+        //
+        // , results in the following string:
+        //
+        // [INFO] supreme::module: Foo done it again. {best_variable_name=bar}
+        fn on_event(
+            &self,
+            event: &tracing::Event<'_>,
+            _ctx: tracing_subscriber::layer::Context<'_, S>,
+        ) {
+            let mut buffer = String::new();
+
+            // create the preamble text that precedes the message and vars. e.g.:
+            //     [INFO] desktop_core::ssh_agent::platform_ssh_agent:
+            let level = event.metadata().level().as_str();
+            let module_path = event.metadata().module_path().unwrap_or_default();
+
+            write!(&mut buffer, "[{level}] {module_path}:")
+                .expect("Failed to write tracing event to buffer");
+
+            let writer = Writer::new(&mut buffer);
+
+            // DefaultVisitor adds the message and variables to the buffer
+            let mut visitor = DefaultVisitor::new(writer, false);
+            event.record(&mut visitor);
+
+            let msg = (event.metadata().level().into(), buffer);
+
+            if let Some(logger) = JS_LOGGER.0.get() {
+                let _ = logger.call(Ok(msg), ThreadsafeFunctionCallMode::NonBlocking);
+            };
+        }
+    }
+
     #[napi]
     pub fn init_napi_log(js_log_fn: ThreadsafeFunction<(LogLevel, String), CalleeHandled>) {
         let _ = JS_LOGGER.0.set(js_log_fn);
-        let _ = log::set_logger(&JS_LOGGER);
-        log::set_max_level(log::LevelFilter::Debug);
-    }
 
-    impl log::Log for JsLogger {
-        fn enabled(&self, metadata: &Metadata) -> bool {
-            metadata.level() <= log::max_level()
-        }
+        let filter = EnvFilter::builder()
+            // set the default log level to INFO.
+            .with_default_directive(LevelFilter::INFO.into())
+            // parse directives from the RUST_LOG environment variable,
+            // overriding the default directive for matching targets.
+            .from_env_lossy();
 
-        fn log(&self, record: &Record) {
-            if !self.enabled(record.metadata()) {
-                return;
-            }
-            let Some(logger) = self.0.get() else {
-                return;
-            };
-            let msg = (record.level().into(), record.args().to_string());
-            let _ = logger.call(Ok(msg), ThreadsafeFunctionCallMode::NonBlocking);
-        }
-
-        fn flush(&self) {}
+        tracing_subscriber::registry()
+            .with(filter)
+            .with(JsLayer)
+            .init();
     }
 }
 
@@ -1014,8 +1075,11 @@ pub mod autotype {
     }
 
     #[napi]
-    pub fn type_input(input: Vec<u16>) -> napi::Result<(), napi::Status> {
-        autotype::type_input(input).map_err(|_| {
+    pub fn type_input(
+        input: Vec<u16>,
+        keyboard_shortcut: Vec<String>,
+    ) -> napi::Result<(), napi::Status> {
+        autotype::type_input(input, keyboard_shortcut).map_err(|_| {
             napi::Error::from_reason("Autotype Error: failed to type input".to_string())
         })
     }
diff --git a/apps/desktop/desktop_native/objc/Cargo.toml b/apps/desktop/desktop_native/objc/Cargo.toml
index 339cce2e024..fc8910bddd3 100644
--- a/apps/desktop/desktop_native/objc/Cargo.toml
+++ b/apps/desktop/desktop_native/objc/Cargo.toml
@@ -12,9 +12,10 @@ default = []
 anyhow = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
+tracing = { workspace = true }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-foundation = "=0.10.0"
+core-foundation = "=0.10.1"
 
 [build-dependencies]
 cc = "=1.2.4"
diff --git a/apps/desktop/desktop_native/objc/src/lib.rs b/apps/desktop/desktop_native/objc/src/lib.rs
index 60e48760da8..eaa9f66669a 100644
--- a/apps/desktop/desktop_native/objc/src/lib.rs
+++ b/apps/desktop/desktop_native/objc/src/lib.rs
@@ -66,6 +66,8 @@ impl Drop for ObjCString {
 mod objc {
     use std::os::raw::c_void;
 
+    use tracing::error;
+
     use super::*;
 
     unsafe extern "C" {
@@ -79,8 +81,9 @@ mod objc {
         let value: String = match value.try_into() {
             Ok(value) => value,
             Err(e) => {
-                println!(
-                    "Error: Failed to convert ObjCString to Rust string during commandReturn: {e}"
+                error!(
+                    error = %e,
+                    "Error: Failed to convert ObjCString to Rust string during commandReturn"
                 );
 
                 return false;
@@ -90,7 +93,9 @@ mod objc {
         match context.send(value) {
             Ok(_) => 0,
             Err(e) => {
-                println!("Error: Failed to return ObjCString from ObjC code to Rust code: {e}");
+                error!(
+                    error = %e,
+                    "Error: Failed to return ObjCString from ObjC code to Rust code");
 
                 return false;
             }
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index 4d0dac1242a..ab9a162f8c5 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": "38.2.0",
   "generateUpdatesFilesForAllChannels": true,
   "publish": {
     "provider": "generic",
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/package.json b/apps/desktop/package.json
index fd8067eb0e6..6179c9d48c1 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.0",
+  "version": "2025.9.1",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html
index 6ebaea550ec..7fdca9ff29b 100644
--- a/apps/desktop/src/app/accounts/settings.component.html
+++ b/apps/desktop/src/app/accounts/settings.component.html
@@ -162,14 +162,15 @@
                     <input
                       id="enableFavicons"
                       type="checkbox"
-                      aria-describedby="enableFaviconsHelp"
                       formControlName="enableFavicons"
                       (change)="saveFavicons()"
                     />
-                    {{ "enableFavicon" | i18n }}
+                    {{ "showIconsChangePasswordUrls" | i18n }}
                   </label>
+                  <div class="tw-inline-block tw-ml-2">
+                    <vault-permit-cipher-details-popover></vault-permit-cipher-details-popover>
+                  </div>
                 </div>
-                <small id="enableFaviconsHelp" class="help-block">{{ "faviconDesc" | i18n }}</small>
               </div>
             </ng-container>
           </div>
@@ -338,22 +339,27 @@
                       formControlName="enableAutotype"
                       (change)="saveEnableAutotype()"
                     />
-                    {{ "enableAutotypeTransitionKey" | i18n }}
-                    <button
-                      type="button"
-                      bitBadge
-                      variant="success"
-                      (click)="openPremiumDialog()"
-                      *ngIf="!hasPremium"
-                    >
-                      {{ "premium" | i18n }}
-                    </button>
+                    <div class="tw-flex tw-items-center tw-gap-2">
+                      {{ "enableAutotypeShortcutPreview" | i18n }}
+                      <div>
+                        <code>{{ form.value.autotypeShortcut }}</code>
+                      </div>
+                      <app-premium-badge></app-premium-badge>
+                    </div>
                   </label>
                 </div>
                 <small class="help-block" *ngIf="form.value.enableAutotype">
                   <b>{{ "important" | i18n }}</b>
                   {{ "enableAutotypeDescriptionTransitionKey" | i18n }}
-                  <b>{{ "editShortcut" | i18n }}</b></small
+                  <a
+                    class="settings-link"
+                    tabindex="0"
+                    *ngIf="this.form.value.enableAutotype"
+                    (click)="saveAutotypeShortcut()"
+                    (keydown.enter)="saveAutotypeShortcut(); $event.preventDefault()"
+                  >
+                    {{ "editShortcut" | i18n }}
+                  </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 e0bdea5a466..a791fd7b9a4 100644
--- a/apps/desktop/src/app/accounts/settings.component.spec.ts
+++ b/apps/desktop/src/app/accounts/settings.component.spec.ts
@@ -182,6 +182,8 @@ describe("SettingsComponent", () => {
     pinServiceAbstraction.isPinSet.mockResolvedValue(false);
     policyService.policiesByType$.mockReturnValue(of([null]));
     desktopAutotypeService.resolvedAutotypeEnabled$ = of(false);
+    desktopAutotypeService.autotypeEnabledUserSetting$ = of(false);
+    desktopAutotypeService.autotypeKeyboardShortcut$ = of(["Control", "Shift", "B"]);
     billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(false));
     configService.getFeatureFlag$.mockReturnValue(of(true));
   });
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index 98d11469d1e..030027913bc 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -7,6 +7,7 @@ import { RouterModule } from "@angular/router";
 import { BehaviorSubject, Observable, Subject, combineLatest, firstValueFrom, of } from "rxjs";
 import { concatMap, map, pairwise, startWith, switchMap, takeUntil, timeout } from "rxjs/operators";
 
+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";
@@ -39,6 +40,7 @@ import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.e
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 import { UserId } from "@bitwarden/common/types/guid";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import {
   CheckboxModule,
   DialogService,
@@ -51,25 +53,31 @@ import {
   SelectModule,
   ToastService,
   TypographyModule,
-  BadgeComponent,
 } from "@bitwarden/components";
 import { KeyService, BiometricStateService, BiometricsStatus } from "@bitwarden/key-management";
+import { PermitCipherDetailsPopoverComponent } from "@bitwarden/vault";
 
 import { SetPinComponent } from "../../auth/components/set-pin.component";
+import { AutotypeShortcutComponent } from "../../autofill/components/autotype-shortcut.component";
 import { SshAgentPromptType } from "../../autofill/models/ssh-agent-setting";
 import { DesktopAutofillSettingsService } from "../../autofill/services/desktop-autofill-settings.service";
 import { DesktopAutotypeService } from "../../autofill/services/desktop-autotype.service";
-import { PremiumComponent } from "../../billing/app/accounts/premium.component";
 import { DesktopBiometricsService } from "../../key-management/biometrics/desktop.biometrics.service";
 import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
+import { DesktopPremiumUpgradePromptService } from "../../services/desktop-premium-upgrade-prompt.service";
 import { NativeMessagingManifestService } from "../services/native-messaging-manifest.service";
 
 @Component({
   selector: "app-settings",
   templateUrl: "settings.component.html",
   standalone: true,
+  providers: [
+    {
+      provide: PremiumUpgradePromptService,
+      useClass: DesktopPremiumUpgradePromptService,
+    },
+  ],
   imports: [
-    BadgeComponent,
     CheckboxModule,
     CommonModule,
     FormFieldModule,
@@ -85,6 +93,8 @@ import { NativeMessagingManifestService } from "../services/native-messaging-man
     SelectModule,
     TypographyModule,
     VaultTimeoutInputComponent,
+    PermitCipherDetailsPopoverComponent,
+    PremiumBadgeComponent,
   ],
 })
 export class SettingsComponent implements OnInit, OnDestroy {
@@ -102,6 +112,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
   requireEnableTray = false;
   showDuckDuckGoIntegrationOption = false;
   showEnableAutotype = false;
+  autotypeShortcut: string;
   showOpenAtLoginOption = false;
   isWindows: boolean;
   isLinux: boolean;
@@ -132,8 +143,6 @@ export class SettingsComponent implements OnInit, OnDestroy {
 
   pinEnabled$: Observable<boolean> = of(true);
 
-  hasPremium: boolean = false;
-
   form = this.formBuilder.group({
     // Security
     vaultTimeout: [null as VaultTimeout | null],
@@ -166,6 +175,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
       value: false,
       disabled: true,
     }),
+    autotypeShortcut: [null as string | null],
     theme: [null as Theme | null],
     locale: [null as string | null],
   });
@@ -389,7 +399,10 @@ export class SettingsComponent implements OnInit, OnDestroy {
         this.desktopSettingsService.sshAgentPromptBehavior$,
       ),
       allowScreenshots: !(await firstValueFrom(this.desktopSettingsService.preventScreenshots$)),
-      enableAutotype: await firstValueFrom(this.desktopAutotypeService.resolvedAutotypeEnabled$),
+      enableAutotype: await firstValueFrom(this.desktopAutotypeService.autotypeEnabledUserSetting$),
+      autotypeShortcut: this.getFormattedAutotypeShortcutText(
+        (await firstValueFrom(this.desktopAutotypeService.autotypeKeyboardShortcut$)) ?? [],
+      ),
       theme: await firstValueFrom(this.themeStateService.selectedTheme$),
       locale: await firstValueFrom(this.i18nService.userSetLocale$),
     };
@@ -419,9 +432,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
         .hasPremiumFromAnySource$(activeAccount.id)
         .pipe(takeUntil(this.destroy$))
         .subscribe((hasPremium) => {
-          this.hasPremium = hasPremium;
-
-          if (this.hasPremium) {
+          if (hasPremium) {
             this.form.controls.enableAutotype.enable();
           }
         });
@@ -890,12 +901,31 @@ export class SettingsComponent implements OnInit, OnDestroy {
     }
   }
 
-  async openPremiumDialog() {
-    await this.dialogService.open(PremiumComponent);
-  }
-
   async saveEnableAutotype() {
     await this.desktopAutotypeService.setAutotypeEnabledState(this.form.value.enableAutotype);
+    const currentShortcut = await firstValueFrom(
+      this.desktopAutotypeService.autotypeKeyboardShortcut$,
+    );
+    if (currentShortcut) {
+      this.form.controls.autotypeShortcut.setValue(
+        this.getFormattedAutotypeShortcutText(currentShortcut),
+      );
+    }
+  }
+
+  async saveAutotypeShortcut() {
+    const dialogRef = AutotypeShortcutComponent.open(this.dialogService);
+
+    const newShortcutArray = await firstValueFrom(dialogRef.closed);
+
+    if (!newShortcutArray) {
+      return;
+    }
+
+    this.form.controls.autotypeShortcut.setValue(
+      this.getFormattedAutotypeShortcutText(newShortcutArray),
+    );
+    await this.desktopAutotypeService.setAutotypeKeyboardShortcutState(newShortcutArray);
   }
 
   private async generateVaultTimeoutOptions(): Promise<VaultTimeoutOption[]> {
@@ -943,4 +973,8 @@ export class SettingsComponent implements OnInit, OnDestroy {
         throw new Error("Unsupported platform");
     }
   }
+
+  getFormattedAutotypeShortcutText(shortcut: string[]) {
+    return shortcut ? shortcut.join("+").replace("Super", "Win") : null;
+  }
 }
diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts
index b14152a17e2..d7f0aac74a6 100644
--- a/apps/desktop/src/app/app-routing.module.ts
+++ b/apps/desktop/src/app/app-routing.module.ts
@@ -15,10 +15,9 @@ import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-manage
 import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.component";
 import {
   DevicesIcon,
-  RegistrationLockAltIcon,
   RegistrationUserAddIcon,
   TwoFactorTimeoutIcon,
-  DeviceVerificationIcon,
+  TwoFactorAuthEmailIcon,
   UserLockIcon,
   VaultIcon,
   LockIcon,
@@ -89,7 +88,7 @@ const routes: Routes = [
     canActivate: [unauthGuardFn(), activeAuthGuard()],
     children: [{ path: "", component: NewDeviceVerificationComponent }],
     data: {
-      pageIcon: DeviceVerificationIcon,
+      pageIcon: TwoFactorAuthEmailIcon,
       pageTitle: {
         key: "verifyYourIdentity",
       },
@@ -157,7 +156,7 @@ const routes: Routes = [
         path: "finish-signup",
         canActivate: [unauthGuardFn()],
         data: {
-          pageIcon: RegistrationLockAltIcon,
+          pageIcon: LockIcon,
         } satisfies AnonLayoutWrapperData,
         children: [
           {
diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index ee2614e19d4..a296857830c 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -77,6 +77,7 @@ import { KeyService, BiometricStateService } from "@bitwarden/key-management";
 import { AddEditFolderDialogComponent, AddEditFolderDialogResult } from "@bitwarden/vault";
 
 import { DeleteAccountComponent } from "../auth/delete-account.component";
+import { DesktopAutotypeDefaultSettingPolicy } from "../autofill/services/desktop-autotype-policy.service";
 import { PremiumComponent } from "../billing/app/accounts/premium.component";
 import { MenuAccount, MenuUpdateRequest } from "../main/menu/menu.updater";
 
@@ -178,6 +179,7 @@ export class AppComponent implements OnInit, OnDestroy {
     private readonly documentLangSetter: DocumentLangSetter,
     private restrictedItemTypesService: RestrictedItemTypesService,
     private readonly tokenService: TokenService,
+    private desktopAutotypeDefaultSettingPolicy: DesktopAutotypeDefaultSettingPolicy,
   ) {
     this.deviceTrustToastService.setupListeners$.pipe(takeUntilDestroyed()).subscribe();
 
@@ -296,7 +298,7 @@ export class AppComponent implements OnInit, OnDestroy {
             await this.openModal<SettingsComponent>(SettingsComponent, this.settingsRef);
             break;
           case "openPremium":
-            await this.openModal<PremiumComponent>(PremiumComponent, this.premiumRef);
+            this.dialogService.open(PremiumComponent);
             break;
           case "showFingerprintPhrase": {
             const activeUserId = await firstValueFrom(
@@ -690,6 +692,7 @@ 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);
diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts
index 014e29555e8..4f53e587994 100644
--- a/apps/desktop/src/app/app.module.ts
+++ b/apps/desktop/src/app/app.module.ts
@@ -31,7 +31,6 @@ import { SharedModule } from "./shared/shared.module";
 @NgModule({
   imports: [
     BrowserAnimationsModule,
-
     SharedModule,
     AppRoutingModule,
     VaultFilterModule,
diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts
index da4eed57793..02bae995c7e 100644
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -37,7 +37,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 { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import {
+  PolicyService as PolicyServiceAbstraction,
+  InternalPolicyService,
+} from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import {
   AccountService,
   AccountService as AccountServiceAbstraction,
@@ -112,6 +115,7 @@ import { DesktopLoginComponentService } from "../../auth/login/desktop-login-com
 import { DesktopTwoFactorAuthDuoComponentService } from "../../auth/services/desktop-two-factor-auth-duo-component.service";
 import { DesktopAutofillSettingsService } from "../../autofill/services/desktop-autofill-settings.service";
 import { DesktopAutofillService } from "../../autofill/services/desktop-autofill.service";
+import { DesktopAutotypeDefaultSettingPolicy } from "../../autofill/services/desktop-autotype-policy.service";
 import { DesktopAutotypeService } from "../../autofill/services/desktop-autotype.service";
 import { DesktopFido2UserInterfaceService } from "../../autofill/services/desktop-fido2-user-interface.service";
 import { DesktopBiometricsService } from "../../key-management/biometrics/desktop.biometrics.service";
@@ -465,8 +469,14 @@ const safeProviders: SafeProvider[] = [
       GlobalStateProvider,
       PlatformUtilsServiceAbstraction,
       BillingAccountProfileStateService,
+      DesktopAutotypeDefaultSettingPolicy,
     ],
   }),
+  safeProvider({
+    provide: DesktopAutotypeDefaultSettingPolicy,
+    useClass: DesktopAutotypeDefaultSettingPolicy,
+    deps: [AccountServiceAbstraction, AuthServiceAbstraction, InternalPolicyService, ConfigService],
+  }),
 ];
 
 @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 44754995f72..53a1c7dbd4c 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
@@ -127,8 +127,7 @@ describe("DesktopSetInitialPasswordService", () => {
         credentials.newPasswordHint,
         credentials.orgSsoIdentifier,
         keysRequest,
-        credentials.kdfConfig.kdfType,
-        credentials.kdfConfig.iterations,
+        credentials.kdfConfig,
       );
     });
 
diff --git a/apps/desktop/src/autofill/components/autotype-shortcut.component.html b/apps/desktop/src/autofill/components/autotype-shortcut.component.html
new file mode 100644
index 00000000000..774c299e0b6
--- /dev/null
+++ b/apps/desktop/src/autofill/components/autotype-shortcut.component.html
@@ -0,0 +1,33 @@
+<form [bitSubmit]="submit" [formGroup]="setShortcutForm">
+  <bit-dialog>
+    <div class="tw-font-semibold" bitDialogTitle>
+      {{ "typeShortcut" | i18n }}
+    </div>
+    <div bitDialogContent>
+      <p>
+        {{ "editAutotypeShortcutDescription" | i18n }}
+      </p>
+      <bit-form-field>
+        <bit-label>{{ "typeShortcut" | i18n }}</bit-label>
+        <input
+          class="tw-font-mono"
+          bitInput
+          type="text"
+          formControlName="shortcut"
+          (keydown)="onShortcutKeydown($event)"
+          autocomplete="off"
+          autocorrect="off"
+          autocapitalize="off"
+        />
+      </bit-form-field>
+    </div>
+    <ng-container bitDialogFooter>
+      <button type="submit" bitButton bitFormButton buttonType="primary">
+        <span>{{ "save" | i18n }}</span>
+      </button>
+      <button type="button" bitButton bitFormButton buttonType="secondary" bitDialogClose>
+        {{ "cancel" | i18n }}
+      </button>
+    </ng-container>
+  </bit-dialog>
+</form>
diff --git a/apps/desktop/src/autofill/components/autotype-shortcut.component.spec.ts b/apps/desktop/src/autofill/components/autotype-shortcut.component.spec.ts
new file mode 100644
index 00000000000..90aa493c596
--- /dev/null
+++ b/apps/desktop/src/autofill/components/autotype-shortcut.component.spec.ts
@@ -0,0 +1,281 @@
+import { AbstractControl, FormBuilder, ValidationErrors } from "@angular/forms";
+import { mock, MockProxy } from "jest-mock-extended";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+import { AutotypeShortcutComponent } from "./autotype-shortcut.component";
+
+describe("AutotypeShortcutComponent", () => {
+  let component: AutotypeShortcutComponent;
+  let validator: (control: AbstractControl) => ValidationErrors | null;
+  let formBuilder: MockProxy<FormBuilder>;
+  let i18nService: MockProxy<I18nService>;
+
+  beforeEach(() => {
+    formBuilder = mock<FormBuilder>();
+    i18nService = mock<I18nService>();
+    i18nService.t.mockReturnValue("Invalid shortcut");
+    component = new AutotypeShortcutComponent(null as any, formBuilder, i18nService);
+    validator = component["shortcutCombinationValidator"]();
+  });
+
+  describe("shortcutCombinationValidator", () => {
+    const createControl = (value: string | null): AbstractControl =>
+      ({
+        value,
+      }) as AbstractControl;
+
+    describe("valid shortcuts", () => {
+      it("should accept single modifier with letter", () => {
+        const validShortcuts = [
+          "Control+A",
+          "Alt+B",
+          "Shift+C",
+          "Win+D",
+          "control+e", // case insensitive
+          "ALT+F",
+          "SHIFT+G",
+          "WIN+H",
+        ];
+
+        validShortcuts.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toBeNull();
+        });
+      });
+
+      it("should accept two modifiers with letter", () => {
+        const validShortcuts = [
+          "Control+Alt+A",
+          "Control+Shift+B",
+          "Control+Win+C",
+          "Alt+Shift+D",
+          "Alt+Win+E",
+          "Shift+Win+F",
+        ];
+
+        validShortcuts.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toBeNull();
+        });
+      });
+
+      it("should accept modifiers in different orders", () => {
+        const validShortcuts = ["Alt+Control+A", "Shift+Control+B", "Win+Alt+C"];
+
+        validShortcuts.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toBeNull();
+        });
+      });
+    });
+
+    describe("invalid shortcuts", () => {
+      it("should reject shortcuts without modifiers", () => {
+        const invalidShortcuts = ["A", "B", "Z", "1", "9"];
+
+        invalidShortcuts.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toEqual({ invalidShortcut: { message: "Invalid shortcut" } });
+        });
+      });
+
+      it("should reject shortcuts with invalid base keys", () => {
+        const invalidShortcuts = [
+          "Control+1",
+          "Alt+2",
+          "Shift+3",
+          "Win+4",
+          "Control+!",
+          "Alt+@",
+          "Shift+#",
+          "Win+$",
+          "Control+Space",
+          "Alt+Enter",
+          "Shift+Tab",
+          "Win+Escape",
+        ];
+
+        invalidShortcuts.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toEqual({ invalidShortcut: { message: "Invalid shortcut" } });
+        });
+      });
+
+      it("should reject shortcuts with only modifiers", () => {
+        const invalidShortcuts = [
+          "Control",
+          "Alt",
+          "Shift",
+          "Win",
+          "Control+Alt",
+          "Control+Shift",
+          "Alt+Shift",
+          "Control+Alt+Shift",
+        ];
+
+        invalidShortcuts.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toEqual({ invalidShortcut: { message: "Invalid shortcut" } });
+        });
+      });
+
+      it("should reject shortcuts with invalid modifier names", () => {
+        const invalidShortcuts = ["Ctrl+A", "Command+A", "Super+A", "Meta+A", "Cmd+A", "Invalid+A"];
+
+        invalidShortcuts.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toEqual({ invalidShortcut: { message: "Invalid shortcut" } });
+        });
+      });
+
+      it("should reject shortcuts with multiple base keys", () => {
+        const invalidShortcuts = ["Control+A+B", "Alt+Ctrl+Shift"];
+
+        invalidShortcuts.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toEqual({ invalidShortcut: { message: "Invalid shortcut" } });
+        });
+      });
+
+      it("should reject shortcuts with more than two modifiers", () => {
+        const invalidShortcuts = [
+          "Control+Alt+Shift+A",
+          "Control+Alt+Win+B",
+          "Control+Shift+Win+C",
+          "Alt+Shift+Win+D",
+          "Control+Alt+Shift+Win+E",
+        ];
+
+        invalidShortcuts.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toEqual({ invalidShortcut: { message: "Invalid shortcut" } });
+        });
+      });
+
+      it("should reject shortcuts with extra characters", () => {
+        const invalidShortcuts = [
+          "Control+A+",
+          "+Control+A",
+          "Control++A",
+          "Control+A+Extra",
+          "Control A",
+          "Control-A",
+          "Control.A",
+        ];
+
+        invalidShortcuts.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toEqual({ invalidShortcut: { message: "Invalid shortcut" } });
+        });
+      });
+
+      it("should reject empty or whitespace shortcuts", () => {
+        // Empty string is handled by required validator
+        const controlEmpty = createControl("");
+        expect(validator(controlEmpty)).toBeNull();
+
+        // Whitespace strings are invalid shortcuts
+        const whitespaceShortcuts = [" ", "  ", "\t", "\n"];
+
+        whitespaceShortcuts.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toEqual({ invalidShortcut: { message: "Invalid shortcut" } });
+        });
+      });
+    });
+
+    describe("edge cases", () => {
+      it("should handle null and undefined values", () => {
+        const controlNull = createControl(null);
+        const controlUndefined = createControl(undefined as any);
+
+        expect(validator(controlNull)).toBeNull();
+        expect(validator(controlUndefined)).toBeNull();
+      });
+
+      it("should handle non-string values", () => {
+        const controlNumber = createControl(123 as any);
+        const controlObject = createControl({} as any);
+        const controlArray = createControl([] as any);
+
+        expect(validator(controlNumber)).toEqual({
+          invalidShortcut: { message: "Invalid shortcut" },
+        });
+        expect(validator(controlObject)).toEqual({
+          invalidShortcut: { message: "Invalid shortcut" },
+        });
+        // Empty array becomes empty string when converted to string, which is handled by required validator
+        expect(validator(controlArray)).toBeNull();
+      });
+
+      it("should handle very long strings", () => {
+        const longString = "Control+Alt+Shift+Win+A".repeat(100);
+        const control = createControl(longString);
+        const result = validator(control);
+        expect(result).toEqual({ invalidShortcut: { message: "Invalid shortcut" } });
+      });
+    });
+
+    describe("modifier combinations", () => {
+      it("should accept all possible single modifier combinations", () => {
+        const modifiers = ["Control", "Alt", "Shift", "Win"];
+
+        modifiers.forEach((modifier) => {
+          const control = createControl(`${modifier}+A`);
+          const result = validator(control);
+          expect(result).toBeNull();
+        });
+      });
+
+      it("should accept all possible two-modifier combinations", () => {
+        const combinations = [
+          "Control+Alt+A",
+          "Control+Shift+A",
+          "Control+Win+A",
+          "Alt+Shift+A",
+          "Alt+Win+A",
+          "Shift+Win+A",
+        ];
+
+        combinations.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toBeNull();
+        });
+      });
+
+      it("should reject all three-modifier combinations", () => {
+        const combinations = [
+          "Control+Alt+Shift+A",
+          "Control+Alt+Win+A",
+          "Control+Shift+Win+A",
+          "Alt+Shift+Win+A",
+        ];
+
+        combinations.forEach((shortcut) => {
+          const control = createControl(shortcut);
+          const result = validator(control);
+          expect(result).toEqual({ invalidShortcut: { message: "Invalid shortcut" } });
+        });
+      });
+
+      it("should reject all four modifiers combination", () => {
+        const control = createControl("Control+Alt+Shift+Win+A");
+        const result = validator(control);
+        expect(result).toEqual({ invalidShortcut: { message: "Invalid shortcut" } });
+      });
+    });
+  });
+});
diff --git a/apps/desktop/src/autofill/components/autotype-shortcut.component.ts b/apps/desktop/src/autofill/components/autotype-shortcut.component.ts
new file mode 100644
index 00000000000..5cf1d90cb79
--- /dev/null
+++ b/apps/desktop/src/autofill/components/autotype-shortcut.component.ts
@@ -0,0 +1,139 @@
+import { CommonModule } from "@angular/common";
+import { Component } from "@angular/core";
+import {
+  FormBuilder,
+  ReactiveFormsModule,
+  Validators,
+  ValidatorFn,
+  AbstractControl,
+  ValidationErrors,
+} from "@angular/forms";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import {
+  AsyncActionsModule,
+  ButtonModule,
+  DialogModule,
+  DialogRef,
+  DialogService,
+  FormFieldModule,
+  IconButtonModule,
+} from "@bitwarden/components";
+
+@Component({
+  templateUrl: "autotype-shortcut.component.html",
+  imports: [
+    DialogModule,
+    CommonModule,
+    JslibModule,
+    ButtonModule,
+    IconButtonModule,
+    ReactiveFormsModule,
+    AsyncActionsModule,
+    FormFieldModule,
+  ],
+})
+export class AutotypeShortcutComponent {
+  constructor(
+    private dialogRef: DialogRef,
+    private formBuilder: FormBuilder,
+    private i18nService: I18nService,
+  ) {}
+
+  private shortcutArray: string[] = [];
+
+  setShortcutForm = this.formBuilder.group({
+    shortcut: ["", [Validators.required, this.shortcutCombinationValidator()]],
+    requireMasterPasswordOnClientRestart: true,
+  });
+
+  submit = async () => {
+    const shortcutFormControl = this.setShortcutForm.controls.shortcut;
+
+    if (Utils.isNullOrWhitespace(shortcutFormControl.value) || shortcutFormControl.invalid) {
+      return;
+    }
+
+    this.dialogRef.close(this.shortcutArray);
+  };
+
+  static open(dialogService: DialogService) {
+    return dialogService.open<string[]>(AutotypeShortcutComponent);
+  }
+
+  onShortcutKeydown(event: KeyboardEvent): void {
+    event.preventDefault();
+
+    const shortcut = this.buildShortcutFromEvent(event);
+
+    if (shortcut != null) {
+      this.setShortcutForm.controls.shortcut.setValue(shortcut);
+      this.setShortcutForm.controls.shortcut.markAsDirty();
+      this.setShortcutForm.controls.shortcut.updateValueAndValidity();
+    }
+  }
+
+  private buildShortcutFromEvent(event: KeyboardEvent): string | null {
+    const hasCtrl = event.ctrlKey;
+    const hasAlt = event.altKey;
+    const hasShift = event.shiftKey;
+    const hasMeta = event.metaKey; // Windows key on Windows, Command on macOS
+
+    // Require at least one modifier (Control, Alt, Shift, or Super)
+    if (!hasCtrl && !hasAlt && !hasShift && !hasMeta) {
+      return null;
+    }
+
+    const key = event.key;
+
+    // Ignore pure modifier keys themselves
+    if (key === "Control" || key === "Alt" || key === "Shift" || key === "Meta") {
+      return null;
+    }
+
+    // Accept a single alphabetical letter as the base key
+    const isAlphabetical = typeof key === "string" && /^[a-z]$/i.test(key);
+    if (!isAlphabetical) {
+      return null;
+    }
+
+    const parts: string[] = [];
+    if (hasCtrl) {
+      parts.push("Control");
+    }
+    if (hasAlt) {
+      parts.push("Alt");
+    }
+    if (hasShift) {
+      parts.push("Shift");
+    }
+    if (hasMeta) {
+      parts.push("Super");
+    }
+    parts.push(key.toUpperCase());
+
+    this.shortcutArray = parts;
+
+    return parts.join("+").replace("Super", "Win");
+  }
+
+  private shortcutCombinationValidator(): ValidatorFn {
+    return (control: AbstractControl): ValidationErrors | null => {
+      const value = (control.value ?? "").toString();
+      if (value.length === 0) {
+        return null; // handled by required
+      }
+
+      // Must include exactly 1-2 modifiers and end with a single letter
+      // Valid examples: Ctrl+A, Shift+Z, Ctrl+Shift+X, Alt+Shift+Q
+      // Allow modifiers in any order, but only 1-2 modifiers total
+      const pattern =
+        /^(?=.*\b(Control|Alt|Shift|Win)\b)(?:Control\+|Alt\+|Shift\+|Win\+){1,2}[A-Z]$/i;
+      return pattern.test(value)
+        ? null
+        : { invalidShortcut: { message: this.i18nService.t("invalidShortcut") } };
+    };
+  }
+}
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 592d1e1b7a8..09f03d2ef8e 100644
--- a/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
+++ b/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
@@ -5,21 +5,45 @@ import { LogService } from "@bitwarden/logging";
 
 import { WindowMain } from "../../main/window.main";
 import { stringIsNotUndefinedNullAndEmpty } from "../../utils";
+import { AutotypeKeyboardShortcut } from "../models/main-autotype-keyboard-shortcut";
 
 export class MainDesktopAutotypeService {
-  keySequence: string = "Alt+CommandOrControl+I";
+  autotypeKeyboardShortcut: AutotypeKeyboardShortcut;
 
   constructor(
     private logService: LogService,
     private windowMain: WindowMain,
-  ) {}
+  ) {
+    this.autotypeKeyboardShortcut = new AutotypeKeyboardShortcut();
+  }
 
   init() {
     ipcMain.on("autofill.configureAutotype", (event, data) => {
-      if (data.enabled === true && !globalShortcut.isRegistered(this.keySequence)) {
-        this.enableAutotype();
-      } else if (data.enabled === false && globalShortcut.isRegistered(this.keySequence)) {
+      if (data.enabled) {
+        const newKeyboardShortcut = new AutotypeKeyboardShortcut();
+        const newKeyboardShortcutIsValid = newKeyboardShortcut.set(data.keyboardShortcut);
+
+        if (newKeyboardShortcutIsValid) {
+          this.disableAutotype();
+          this.autotypeKeyboardShortcut = newKeyboardShortcut;
+          this.enableAutotype();
+        } else {
+          this.logService.error(
+            "Attempting to configure autotype but the shortcut given is invalid.",
+          );
+        }
+      } else {
         this.disableAutotype();
+
+        // Deregister the incoming keyboard shortcut if needed
+        const setCorrectly = this.autotypeKeyboardShortcut.set(data.keyboardShortcut);
+        if (
+          setCorrectly &&
+          globalShortcut.isRegistered(this.autotypeKeyboardShortcut.getElectronFormat())
+        ) {
+          globalShortcut.unregister(this.autotypeKeyboardShortcut.getElectronFormat());
+          this.logService.info("Autotype disabled.");
+        }
       }
     });
 
@@ -30,34 +54,42 @@ export class MainDesktopAutotypeService {
         stringIsNotUndefinedNullAndEmpty(response.username) &&
         stringIsNotUndefinedNullAndEmpty(response.password)
       ) {
-        this.doAutotype(response.username, response.password);
+        this.doAutotype(
+          response.username,
+          response.password,
+          this.autotypeKeyboardShortcut.getArrayFormat(),
+        );
       }
     });
   }
 
   disableAutotype() {
-    if (globalShortcut.isRegistered(this.keySequence)) {
-      globalShortcut.unregister(this.keySequence);
+    // Deregister the current keyboard shortcut if needed
+    const formattedKeyboardShortcut = this.autotypeKeyboardShortcut.getElectronFormat();
+    if (globalShortcut.isRegistered(formattedKeyboardShortcut)) {
+      globalShortcut.unregister(formattedKeyboardShortcut);
+      this.logService.info("Autotype disabled.");
     }
-
-    this.logService.info("Autotype disabled.");
   }
 
   private enableAutotype() {
-    const result = globalShortcut.register(this.keySequence, () => {
-      const windowTitle = autotype.getForegroundWindowTitle();
+    const result = globalShortcut.register(
+      this.autotypeKeyboardShortcut.getElectronFormat(),
+      () => {
+        const windowTitle = autotype.getForegroundWindowTitle();
 
-      this.windowMain.win.webContents.send("autofill.listenAutotypeRequest", {
-        windowTitle,
-      });
-    });
+        this.windowMain.win.webContents.send("autofill.listenAutotypeRequest", {
+          windowTitle,
+        });
+      },
+    );
 
     result
       ? this.logService.info("Autotype enabled.")
       : this.logService.info("Enabling autotype failed.");
   }
 
-  private doAutotype(username: string, password: string) {
+  private doAutotype(username: string, password: string, keyboardShortcut: string[]) {
     const inputPattern = username + "\t" + password;
     const inputArray = new Array<number>(inputPattern.length);
 
@@ -65,6 +97,6 @@ export class MainDesktopAutotypeService {
       inputArray[i] = inputPattern.charCodeAt(i);
     }
 
-    autotype.typeInput(inputArray);
+    autotype.typeInput(inputArray, keyboardShortcut);
   }
 }
diff --git a/apps/desktop/src/autofill/models/main-autotype-keyboard-shortcut.ts b/apps/desktop/src/autofill/models/main-autotype-keyboard-shortcut.ts
new file mode 100644
index 00000000000..b26be92585e
--- /dev/null
+++ b/apps/desktop/src/autofill/models/main-autotype-keyboard-shortcut.ts
@@ -0,0 +1,98 @@
+import { defaultWindowsAutotypeKeyboardShortcut } from "../services/desktop-autotype.service";
+
+/*
+  This class provides the following:
+  - A way to get and set an AutotypeKeyboardShortcut value within the main process
+  - A way to set an AutotypeKeyboardShortcut with validation
+  - A way to "get" the value in string array format or a single string format for electron
+  - Default shortcut support
+
+  This is currently only supported for Windows operating systems.
+*/
+export class AutotypeKeyboardShortcut {
+  private autotypeKeyboardShortcut: string[];
+
+  constructor() {
+    this.autotypeKeyboardShortcut = defaultWindowsAutotypeKeyboardShortcut;
+  }
+
+  /*
+    Returns a boolean value indicating if the autotypeKeyboardShortcut
+    was valid and set or not.
+  */
+  set(newAutotypeKeyboardShortcut: string[]) {
+    if (!this.#keyboardShortcutIsValid(newAutotypeKeyboardShortcut)) {
+      return false;
+    }
+
+    this.autotypeKeyboardShortcut = newAutotypeKeyboardShortcut;
+    return true;
+  }
+
+  /*
+    Returns the autotype keyboard shortcut as a string array.
+  */
+  getArrayFormat() {
+    return this.autotypeKeyboardShortcut;
+  }
+
+  /*
+    Returns the autotype keyboard shortcut as a single string, as
+    Electron expects. Please note this does not reorder the keys.
+
+    See Electron keyboard shorcut docs for more info:
+    https://www.electronjs.org/docs/latest/tutorial/keyboard-shortcuts
+  */
+  getElectronFormat() {
+    return this.autotypeKeyboardShortcut.join("+");
+  }
+
+  /*
+    This private function validates the strArray input to make sure the array contains
+    valid, currently accepted shortcut keys for Windows.
+
+    Valid windows shortcut keys: Control, Alt, Super, Shift, letters A - Z
+    Valid macOS shortcut keys: Control, Alt, Command, Shift, letters A - Z (not yet supported)
+
+    See Electron keyboard shorcut docs for more info:
+    https://www.electronjs.org/docs/latest/tutorial/keyboard-shortcuts
+  */
+  #keyboardShortcutIsValid(strArray: string[]) {
+    const VALID_SHORTCUT_CONTROL_KEYS: string[] = ["Control", "Alt", "Super", "Shift"];
+    const UNICODE_LOWER_BOUND = 65; // unicode 'A'
+    const UNICODE_UPPER_BOUND = 90; // unicode 'Z'
+    const MIN_LENGTH: number = 2;
+    const MAX_LENGTH: number = 3;
+
+    // Ensure strArray is a string array of valid length
+    if (
+      strArray === undefined ||
+      strArray === null ||
+      strArray.length < MIN_LENGTH ||
+      strArray.length > MAX_LENGTH
+    ) {
+      return false;
+    }
+
+    // Ensure strArray is all modifier keys, and that the last key is a letter
+    for (let i = 0; i < strArray.length; i++) {
+      if (i < strArray.length - 1) {
+        if (!VALID_SHORTCUT_CONTROL_KEYS.includes(strArray[i])) {
+          return false;
+        }
+      } else {
+        const unicodeValue: number = strArray[i].charCodeAt(0);
+
+        if (
+          Number.isNaN(unicodeValue) ||
+          unicodeValue < UNICODE_LOWER_BOUND ||
+          unicodeValue > UNICODE_UPPER_BOUND
+        ) {
+          return false;
+        }
+      }
+    }
+
+    return true;
+  }
+}
diff --git a/apps/desktop/src/autofill/preload.ts b/apps/desktop/src/autofill/preload.ts
index 5bc0847bc75..d9f283b7d08 100644
--- a/apps/desktop/src/autofill/preload.ts
+++ b/apps/desktop/src/autofill/preload.ts
@@ -148,8 +148,8 @@ export default {
       },
     );
   },
-  configureAutotype: (enabled: boolean) => {
-    ipcRenderer.send("autofill.configureAutotype", { enabled });
+  configureAutotype: (enabled: boolean, keyboardShortcut: string[]) => {
+    ipcRenderer.send("autofill.configureAutotype", { enabled, keyboardShortcut });
   },
   listenAutotypeRequest: (
     fn: (
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
new file mode 100644
index 00000000000..555e6ceef5b
--- /dev/null
+++ b/apps/desktop/src/autofill/services/desktop-autotype-policy.service.spec.ts
@@ -0,0 +1,295 @@
+import { TestBed } from "@angular/core/testing";
+import { mock, MockProxy } from "jest-mock-extended";
+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";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { Account, UserId } from "@bitwarden/common/platform/models/domain/account";
+
+import { DesktopAutotypeDefaultSettingPolicy } from "./desktop-autotype-policy.service";
+
+describe("DesktopAutotypeDefaultSettingPolicy", () => {
+  let service: DesktopAutotypeDefaultSettingPolicy;
+  let accountService: MockProxy<AccountService>;
+  let authService: MockProxy<AuthService>;
+  let policyService: MockProxy<InternalPolicyService>;
+  let configService: MockProxy<ConfigService>;
+
+  let mockAccountSubject: BehaviorSubject<Account | null>;
+  let mockFeatureFlagSubject: BehaviorSubject<boolean>;
+  let mockAuthStatusSubject: BehaviorSubject<AuthenticationStatus>;
+  let mockPoliciesSubject: BehaviorSubject<Policy[]>;
+
+  const mockUserId = "user-123" as UserId;
+
+  beforeEach(() => {
+    mockAccountSubject = new BehaviorSubject<Account | null>({
+      id: mockUserId,
+      email: "test@example.com",
+      emailVerified: true,
+      name: "Test User",
+    });
+    mockFeatureFlagSubject = new BehaviorSubject<boolean>(true);
+    mockAuthStatusSubject = new BehaviorSubject<AuthenticationStatus>(
+      AuthenticationStatus.Unlocked,
+    );
+    mockPoliciesSubject = new BehaviorSubject<Policy[]>([]);
+
+    accountService = mock<AccountService>();
+    authService = mock<AuthService>();
+    policyService = mock<InternalPolicyService>();
+    configService = mock<ConfigService>();
+
+    accountService.activeAccount$ = mockAccountSubject.asObservable();
+    configService.getFeatureFlag$ = jest
+      .fn()
+      .mockReturnValue(mockFeatureFlagSubject.asObservable());
+    authService.authStatusFor$ = jest
+      .fn()
+      .mockImplementation((_: UserId) => mockAuthStatusSubject.asObservable());
+    policyService.policies$ = jest.fn().mockReturnValue(mockPoliciesSubject.asObservable());
+
+    TestBed.configureTestingModule({
+      providers: [
+        DesktopAutotypeDefaultSettingPolicy,
+        { provide: AccountService, useValue: accountService },
+        { provide: AuthService, useValue: authService },
+        { provide: InternalPolicyService, useValue: policyService },
+        { provide: ConfigService, useValue: configService },
+      ],
+    });
+
+    service = TestBed.inject(DesktopAutotypeDefaultSettingPolicy);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    mockAccountSubject.complete();
+    mockFeatureFlagSubject.complete();
+    mockAuthStatusSubject.complete();
+    mockPoliciesSubject.complete();
+  });
+
+  describe("autotypeDefaultSetting$", () => {
+    it("should emit null when feature flag is disabled", async () => {
+      mockFeatureFlagSubject.next(false);
+      const result = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+      expect(result).toBeNull();
+    });
+
+    it("does not emit until an account appears", async () => {
+      mockAccountSubject.next(null);
+
+      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 () => {
+      mockAuthStatusSubject.next(AuthenticationStatus.Locked);
+      const result = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+      expect(result).toBeNull();
+    });
+
+    it("should emit null when no autotype policy exists", async () => {
+      mockPoliciesSubject.next([]);
+      const policy = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+      expect(policy).toBeNull();
+    });
+
+    it("should emit true when autotype policy is enabled", async () => {
+      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 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 () => {
+      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).toBe(true);
+
+      // Expect null emission when locked
+      mockAuthStatusSubject.next(AuthenticationStatus.Locked);
+      const lockedResult = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+      expect(lockedResult).toBeNull();
+    });
+
+    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).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).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 () => {
+      mockPoliciesSubject.next([]);
+      const nullValue = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+      expect(nullValue).toBeNull();
+
+      mockPoliciesSubject.next([
+        {
+          type: PolicyType.AutotypeDefaultSetting,
+          enabled: true,
+        } as Policy,
+      ]);
+      const trueValue = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+      expect(trueValue).toBe(true);
+
+      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
new file mode 100644
index 00000000000..d3ae67d2c8d
--- /dev/null
+++ b/apps/desktop/src/autofill/services/desktop-autotype-policy.service.ts
@@ -0,0 +1,63 @@
+import { Injectable } from "@angular/core";
+import { Observable, of } from "rxjs";
+import { distinctUntilChanged, filter, map, shareReplay, switchMap } from "rxjs/operators";
+
+import { InternalPolicyService } 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 { 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 { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+
+@Injectable({ providedIn: "root" })
+export class DesktopAutotypeDefaultSettingPolicy {
+  constructor(
+    private readonly accountService: AccountService,
+    private readonly authService: AuthService,
+    private readonly policyService: InternalPolicyService,
+    private readonly configService: ConfigService,
+  ) {}
+
+  /**
+   * Emits the autotype policy enabled status when account is unlocked and WindowsDesktopAutotype is enabled.
+   * - true: autotype policy exists and is enabled
+   * - null: no autotype policy exists for the user's organization
+   */
+  readonly autotypeDefaultSetting$: Observable<boolean | null> = this.configService
+    .getFeatureFlag$(FeatureFlag.WindowsDesktopAutotype)
+    .pipe(
+      switchMap((autotypeFeatureEnabled) => {
+        if (!autotypeFeatureEnabled) {
+          return of(null);
+        }
+
+        return this.accountService.activeAccount$.pipe(
+          filter((account) => account != null && account.id != null),
+          getUserId,
+          distinctUntilChanged(),
+          switchMap((userId) => {
+            const isUnlocked$ = this.authService.authStatusFor$(userId).pipe(
+              map((status) => status === AuthenticationStatus.Unlocked),
+              distinctUntilChanged(),
+            );
+
+            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))));
+          }),
+        );
+      }),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+}
diff --git a/apps/desktop/src/autofill/services/desktop-autotype.service.ts b/apps/desktop/src/autofill/services/desktop-autotype.service.ts
index 434b79990a2..24ec3907a62 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,16 +17,38 @@ 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";
 
-export const AUTOTYPE_ENABLED = new KeyDefinition<boolean>(
+import { DesktopAutotypeDefaultSettingPolicy } from "./desktop-autotype-policy.service";
+
+export const defaultWindowsAutotypeKeyboardShortcut: string[] = ["Control", "Shift", "B"];
+
+export const AUTOTYPE_ENABLED = new KeyDefinition<boolean | null>(
   AUTOTYPE_SETTINGS_DISK,
   "autotypeEnabled",
   { deserializer: (b) => b },
 );
 
+/*
+  Valid windows shortcut keys: Control, Alt, Super, Shift, letters A - Z
+  Valid macOS shortcut keys: Control, Alt, Command, Shift, letters A - Z
+
+  See Electron keyboard shorcut docs for more info:
+  https://www.electronjs.org/docs/latest/tutorial/keyboard-shortcuts
+*/
+export const AUTOTYPE_KEYBOARD_SHORTCUT = new KeyDefinition<string[]>(
+  AUTOTYPE_SETTINGS_DISK,
+  "autotypeKeyboardShortcut",
+  { deserializer: (b) => b },
+);
+
 export class DesktopAutotypeService {
   private readonly autotypeEnabledState = this.globalStateProvider.get(AUTOTYPE_ENABLED);
+  private readonly autotypeKeyboardShortcut = this.globalStateProvider.get(
+    AUTOTYPE_KEYBOARD_SHORTCUT,
+  );
 
+  autotypeEnabledUserSetting$: Observable<boolean> = of(false);
   resolvedAutotypeEnabled$: Observable<boolean> = of(false);
+  autotypeKeyboardShortcut$: Observable<string[]> = of(defaultWindowsAutotypeKeyboardShortcut);
 
   constructor(
     private accountService: AccountService,
@@ -36,6 +58,7 @@ export class DesktopAutotypeService {
     private globalStateProvider: GlobalStateProvider,
     private platformUtilsService: PlatformUtilsService,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
+    private desktopAutotypePolicy: DesktopAutotypeDefaultSettingPolicy,
   ) {
     ipc.autofill.listenAutotypeRequest(async (windowTitle, callback) => {
       const possibleCiphers = await this.matchCiphersToWindowTitle(windowTitle);
@@ -49,7 +72,37 @@ export class DesktopAutotypeService {
   }
 
   async init() {
+    this.autotypeEnabledUserSetting$ = this.autotypeEnabledState.state$;
+    this.autotypeKeyboardShortcut$ = this.autotypeKeyboardShortcut.state$.pipe(
+      map((shortcut) => shortcut ?? defaultWindowsAutotypeKeyboardShortcut),
+    );
+
+    // Currently Autotype is only supported for Windows
     if (this.platformUtilsService.getDevice() === DeviceType.WindowsDesktop) {
+      // If `autotypeDefaultPolicy` is `true` for a user's organization, and the
+      // user has never changed their local autotype setting (`autotypeEnabledState`),
+      // we set their local setting to `true` (once the local user setting is changed
+      // by this policy or the user themselves, the default policy should
+      // never change the user setting again).
+      combineLatest([
+        this.autotypeEnabledState.state$,
+        this.desktopAutotypePolicy.autotypeDefaultSetting$,
+      ])
+        .pipe(
+          map(async ([autotypeEnabledState, autotypeDefaultPolicy]) => {
+            if (autotypeDefaultPolicy === true && autotypeEnabledState === null) {
+              await this.setAutotypeEnabledState(true);
+            }
+          }),
+        )
+        .subscribe();
+
+      // autotypeEnabledUserSetting$ publicly represents the value the
+      // user has set for autotyeEnabled in their local settings.
+      this.autotypeEnabledUserSetting$ = this.autotypeEnabledState.state$;
+
+      // resolvedAutotypeEnabled$ represents the final determination if the Autotype
+      // feature should be on or off.
       this.resolvedAutotypeEnabled$ = combineLatest([
         this.autotypeEnabledState.state$,
         this.configService.getFeatureFlag$(FeatureFlag.WindowsDesktopAutotype),
@@ -58,9 +111,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(
@@ -73,9 +126,11 @@ export class DesktopAutotypeService {
         ),
       );
 
-      this.resolvedAutotypeEnabled$.subscribe((enabled) => {
-        ipc.autofill.configureAutotype(enabled);
-      });
+      combineLatest([this.resolvedAutotypeEnabled$, this.autotypeKeyboardShortcut$]).subscribe(
+        ([resolvedAutotypeEnabled, autotypeKeyboardShortcut]) => {
+          ipc.autofill.configureAutotype(resolvedAutotypeEnabled, autotypeKeyboardShortcut);
+        },
+      );
     }
   }
 
@@ -85,8 +140,12 @@ export class DesktopAutotypeService {
     });
   }
 
+  async setAutotypeKeyboardShortcutState(keyboardShortcut: string[]): Promise<void> {
+    await this.autotypeKeyboardShortcut.update(() => keyboardShortcut);
+  }
+
   async matchCiphersToWindowTitle(windowTitle: string): Promise<CipherView[]> {
-    const URI_PREFIX = "APP:";
+    const URI_PREFIX = "apptitle://";
     windowTitle = windowTitle.toLowerCase();
 
     const ciphers = await firstValueFrom(
@@ -107,7 +166,7 @@ export class DesktopAutotypeService {
             return false;
           }
 
-          const uri = u.uri.substring(4).toLowerCase();
+          const uri = u.uri.substring(URI_PREFIX.length).toLowerCase();
 
           return windowTitle.indexOf(uri) > -1;
         })
diff --git a/apps/desktop/src/locales/af/messages.json b/apps/desktop/src/locales/af/messages.json
index 5622ec1e6eb..5da05806006 100644
--- a/apps/desktop/src/locales/af/messages.json
+++ b/apps/desktop/src/locales/af/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Plaas u beveilingsleutel in u rekenaar se USB-poort. Indien dit ’n knop het, druk dit dan."
   },
-  "recoveryCodeDesc": {
-    "message": "Het u toegang tot al u tweestapaanbieders verloor? Gebruik dan u terugstelkode om alle tweestapaanbieders op u rekening te deaktiveer."
-  },
   "recoveryCodeTitle": {
     "message": "Terugstelkode"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Wis gekopieerde waardes outomaties vanuit u knipbord.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimaliseer na stelsellaai"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/ar/messages.json b/apps/desktop/src/locales/ar/messages.json
index c143c50f9c8..2b1c70f30b6 100644
--- a/apps/desktop/src/locales/ar/messages.json
+++ b/apps/desktop/src/locales/ar/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "أدخل مفتاح الأمان الخاص بك في منفذ USB كمبيوترك، إذا كان يحتوي على زر، إلمسه."
   },
-  "recoveryCodeDesc": {
-    "message": "هل تفقد الوصول إلى جميع مزودي التحقق بعاملين؟ استخدم رمز الاسترداد الخاص بك لتعطيل جميع مزودي التحقق بعاملين من حسابك."
-  },
   "recoveryCodeTitle": {
     "message": "رمز الاسترداد"
   },
@@ -1225,6 +1222,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. هل تريد زيارة الموقع الآن؟"
   },
@@ -1305,11 +1311,8 @@
     "message": "مسح القيم المنسوخة تلقائيًا من حافظتك.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "تصغير إلى أيقونة شريط المهام"
@@ -2660,6 +2663,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": "مقفل"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/az/messages.json b/apps/desktop/src/locales/az/messages.json
index ddb16691a95..bdb3f89b422 100644
--- a/apps/desktop/src/locales/az/messages.json
+++ b/apps/desktop/src/locales/az/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Güvənlik açarını kompüterinizin USB portuna taxın. Düyməsi varsa toxunun."
   },
-  "recoveryCodeDesc": {
-    "message": "İki faktorlu provayderlərinizə erişə bilmirsiniz? Geri qaytarma kodunuzu istifadə edərək hesabınızdakı bütün iki faktorlu provayderləri söndürə bilərsiniz."
-  },
   "recoveryCodeTitle": {
     "message": "Bərpa kodu"
   },
@@ -1225,6 +1222,15 @@
   "invalidMasterPassword": {
     "message": "Yararsız ana parol"
   },
+  "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": "İ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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Kopyalanmış dəyərləri lövhədən avtomatik təmizlə.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Veb sayt ikonlarını göstər və parol dəyişdirmə URL-lərini al"
   },
   "enableMinToTray": {
     "message": "Bildiriş sahəsi ikonuna kiçilt"
@@ -2660,6 +2663,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": "Kilidli"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Riskli parolları dəyişdir"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Bu giriş risk altındadır və bir veb sayt əskikdir. Daha güclü təhlükəsizlik üçün bir veb sayt əlavə edin və parolu dəyişdirin."
+  },
+  "missingWebsite": {
+    "message": "Əskik veb sayt"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "\"Yalnız baxma\" icazələrinə sahib kolleksiyaları silə bilməzsiniz: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "Bu ayar barədə"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden, təcrübənizi təkmilləşdirmək üçün hansı ikonun və ya parol dəyişdirmə URL-sinin istifadə olunmalı olduğunu müəyyənləşdirmək məqsədilə saxlanılmış giriş URL-lərini istifadə edəcək. Bu xidməti istifadə etdiyiniz zaman heç bir məlumat yığılmır və ya saxlanılmır."
+  },
   "assignToCollections": {
     "message": "Kolleksiyalara təyin et"
   },
@@ -4074,14 +4107,20 @@
   "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": "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",
+    "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."
   },
   "next": {
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Təsdiqlə"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Avto-yazma qısayolunu fəallaşdır"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Arxivdən çıxart"
+  },
+  "itemsInArchive": {
+    "message": "Arxivdəki elementlər"
+  },
+  "noItemsInArchive": {
+    "message": "Arxivdə element yoxdur"
+  },
+  "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": {
+    "message": "Element arxivə göndərildi"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Element arxivdən çıxarıldı"
+  },
+  "archiveItem": {
+    "message": "Elementi arxivlə"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/be/messages.json b/apps/desktop/src/locales/be/messages.json
index 23c34a55864..0664c25d84e 100644
--- a/apps/desktop/src/locales/be/messages.json
+++ b/apps/desktop/src/locales/be/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Устаўце ваш ключ бяспекі ў порт USB камп'ютара. Калі на ім ёсць кнопка, націсніце на яе."
   },
-  "recoveryCodeDesc": {
-    "message": "Згубілі доступ да ўсіх варыянтаў доступу пастаўшчыкоў двухэтапнай аўтэнтыфікацыі? Скарыстайцеся кодам аднаўлення, каб адключыць праверку пастаўшчыкоў двухэтапнай аўтэнтыфікацыі для вашага ўліковага запісу."
-  },
   "recoveryCodeTitle": {
     "message": "Код аднаўлення"
   },
@@ -1225,6 +1222,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. Перайсці на вэб-сайт, каб зрабіць гэта?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Аўтаматычна ачышчаць скапіяваныя значэнні з вашага буфера абмену.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Згарнуць у вобласць апавяшчэнняў"
@@ -2660,6 +2663,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": "Заблакіравана"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/bg/messages.json b/apps/desktop/src/locales/bg/messages.json
index e288b2c59ac..091d91dc7d4 100644
--- a/apps/desktop/src/locales/bg/messages.json
+++ b/apps/desktop/src/locales/bg/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Поставете устройството за удостоверяване в USB порт на компютъра. Ако на устройството има бутон, натиснете го."
   },
-  "recoveryCodeDesc": {
-    "message": "Ако сте загубили достъп до двустепенното удостоверяване, може да използвате код за възстановяване, за да изключите двустепенното удостоверяване в абонамента си."
-  },
   "recoveryCodeTitle": {
     "message": "Код за възстановяване"
   },
@@ -1225,6 +1222,15 @@
   "invalidMasterPassword": {
     "message": "Грешна главна парола"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Грешна главна парола. Проверете дали е-пощата е правилна и дали акаунтът Ви е създаден в $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Двустепенното вписване защищава регистрацията ви като ви кара да потвърдите влизането си чрез устройство-ключ, приложение за идентификация, мобилно съобщение, телефонно обаждане или е-поща. Двустепенното вписване може да се включи чрез сайта bitwarden.com. Искате ли да го посетите?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Автоматично изчистване на буфера след поставяне на стойността.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Показване на иконките на уеб сайтовете"
-  },
-  "faviconDesc": {
-    "message": "Показване на разпознаваемо изображение до всеки запис."
+  "showIconsChangePasswordUrls": {
+    "message": "Показване на иконките на уеб сайтовете и извличане на адресите за смяна на паролата"
   },
   "enableMinToTray": {
     "message": "Смаляване в областта за уведомяване"
@@ -2660,6 +2663,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": "Заключено"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Промяна на парола в риск"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Този елемент за вписване е в риск и в него липсва уеб сайт. Добавете уеб сайт и сменете паролата, за по-добра сигурност."
+  },
+  "missingWebsite": {
+    "message": "Липсващ уеб сайт"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Не можете да премахвате колекции с права „Само за преглед“: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "Относно тази настройка"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Битуорден ще използва запазените адреси за вписване, за да определи коя иконка или адрес за смяна на паролата да се ползва, за да улесни работата Ви. Никакви данни не се събират или съхраняват, когато използвате тази услуга."
+  },
   "assignToCollections": {
     "message": "Свързване с колекции"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Потвърждаване"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Включване на клавишната комбинация за автоматично попълване"
+  "enableAutotypeShortcutPreview": {
+    "message": "Включване на комбинация за автоматично попълване (Функционалност в изпитание)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "message": "Уверете се, че сет в правилното поле, преди да използвате комбинацията, за да избегнете попълването на данните на грешното място."
   },
   "editShortcut": {
     "message": "Редактиране на комбинацията"
+  },
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архивиране",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Изваждане от архива"
+  },
+  "itemsInArchive": {
+    "message": "Елементи в архива"
+  },
+  "noItemsInArchive": {
+    "message": "Няма елементи в архива"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Архивираните елементи ще се показват тук и ще бъдат изключени от общите резултати при търсене и от предложенията за автоматично попълване."
+  },
+  "itemSentToArchive": {
+    "message": "Елементът е преместен в архива"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Елементът е изваден от архива"
+  },
+  "archiveItem": {
+    "message": "Архивиране на елемента"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Архивираните елементи са изключени от общите резултати при търсене и от предложенията за автоматично попълване. Наистина ли искате да архивирате този елемент?"
   }
 }
diff --git a/apps/desktop/src/locales/bn/messages.json b/apps/desktop/src/locales/bn/messages.json
index 8405aa6642e..da0ce08dca8 100644
--- a/apps/desktop/src/locales/bn/messages.json
+++ b/apps/desktop/src/locales/bn/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "আপনার কম্পিউটারের ইউএসবি পোর্টে আপনার সুরক্ষা কী ঢোকান। এটিতে যদি একটি বোতাম থাকে তবে তা স্পর্শ করুন।"
   },
-  "recoveryCodeDesc": {
-    "message": "আপনার সমস্ত দ্বি-গুণক সরবরাহকারীদের অ্যাক্সেস হারিয়েছেন? আপনার অ্যাকাউন্ট থেকে সমস্ত দ্বি-গুণক সরবরাহকারীদের অক্ষম করতে আপনার পুনরুদ্ধার কোডটি ব্যবহার করুন।"
-  },
   "recoveryCodeTitle": {
     "message": "পুনরুদ্ধার কোড"
   },
@@ -1225,6 +1222,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 ওয়েব ভল্টে দ্বি-পদক্ষেপের লগইন সক্ষম করা যাবে। আপনি কি এখনই ওয়েবসাইটটি দেখতে চান?"
   },
@@ -1305,11 +1311,8 @@
     "message": "আপনার ক্লিপবোর্ড থেকে অনুলিপিত মানগুলি স্বয়ংক্রিয়ভাবে সাফ করে।",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/bs/messages.json b/apps/desktop/src/locales/bs/messages.json
index afad9d9d456..41260bf2b11 100644
--- a/apps/desktop/src/locales/bs/messages.json
+++ b/apps/desktop/src/locales/bs/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Ubaci svoj sigurnosni ključ u USB slot kompjutera. Ako ima tipku, dodirni je."
   },
-  "recoveryCodeDesc": {
-    "message": "Izgubljen je pristup uređaju za dvostruku autentifikaciju? Koristi svoj kôd za oporavak za onemogućavanje svih pružatelja usluga dvostruke autentifikacije na tvom računu."
-  },
   "recoveryCodeTitle": {
     "message": "Kod za oporavak"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatski očistiti kopirane vrijednosti iz vaše međumemorije.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimiziraj kao ikonicu u sistemskoj traci"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/ca/messages.json b/apps/desktop/src/locales/ca/messages.json
index 46b7418784a..3f21a9d969d 100644
--- a/apps/desktop/src/locales/ca/messages.json
+++ b/apps/desktop/src/locales/ca/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Introduïu la vostra clau de seguretat al port USB de l'ordinador. Si té un botó, premeu-lo."
   },
-  "recoveryCodeDesc": {
-    "message": "Heu perdut l'accés a tots els vostres proveïdors de dos factors? Utilitzeu el vostre codi de recuperació per desactivar tots els proveïdors de dos factors del vostre compte."
-  },
   "recoveryCodeTitle": {
     "message": "Codi de recuperació"
   },
@@ -1225,6 +1222,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"
+      }
+    }
+  },
   "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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Esborra automàticament els valors copiats del porta-retalls.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Mostra icones de llocs web i recupera les URL de canvi de contrasenya"
   },
   "enableMinToTray": {
     "message": "Minimitza a icona en la safata"
@@ -2377,7 +2380,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..."
@@ -2422,16 +2425,16 @@
     "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."
   },
   "changePasswordWarning": {
-    "message": "En canviar la teva contrasenya, cal iniciar la sessió amb la nova contrasenya. Les sessions actives en altres dispositius es tancaran en una hora."
+    "message": "En canviar la contrasenya, cal iniciar la sessió amb la nova contrasenya. Les sessions actives en altres dispositius es tancaran en una hora."
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
-    "message": "Canvia la contrasenya mestra per completar el recobrament del compte."
+    "message": "Canvia la contrasenya mestra per completar la recuperació del compte."
   },
   "updateMasterPasswordSubtitle": {
-    "message": "La contrasenya mestra no s'ajusta als requisits de l'organització. Canvia't la contrasenya mestra per continuar."
+    "message": "La contrasenya mestra no s'ajusta als requisits de l'organització. Canvieu-la per continuar."
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "La teva organització ha desactivat l'encriptació de dispositius fiables. Fixa una contrasenya mestra per accedir a la teva caixa forta."
+    "message": "L'organització ha desactivat el xifratge de dispositius de confiança. Defineix una contrasenya mestra per accedir a la caixa forta."
   },
   "tryAgain": {
     "message": "Torneu-ho a provar"
@@ -2476,7 +2479,7 @@
     "message": "Minuts"
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ hora(es) i $MINUTES$ minut(s) màxim.",
+    "message": "$HOURS$ hores i $MINUTES$ minuts com a màxim.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2571,7 +2574,7 @@
     "message": "S'ha suprimit la contrasenya mestra."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "Ja no cal contrasenya mestra per als membres de la següent organització. Confirma'n el domini a sota amb l'administrador de la teva organització."
+    "message": "Ja no cal contrasenya mestra per als membres de la següent organització. Confirmeu el domini següent amb l'administrador de l'organització."
   },
   "organizationName": {
     "message": "Nom de l'organització"
@@ -2640,7 +2643,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Només els objectes individuals de la caixa forta, inclosos adjunts associats amb $EMAIL$, seran exportats. Els objectes de la caixa forta de l'organització no hi seran inclosos",
+    "message": "Només s'exportaran els elements individuals de la caixa forta, inclosos els fitxers adjunts associats amb $EMAIL$. No s'hi inclouran els elements de la caixa forta de l'organització",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2660,6 +2663,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"
   },
@@ -2766,7 +2787,7 @@
     "message": "Utilitzeu aquesta contrasenya"
   },
   "useThisPassphrase": {
-    "message": "Empra aquesta frase de pas"
+    "message": "Utilitzeu aquesta frase de contrasenya"
   },
   "useThisUsername": {
     "message": "Utilitzeu aquest nom d'usuari"
@@ -2835,7 +2856,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "API token de $SERVICENAME$ invàlid",
+    "message": "Token d'API $SERVICENAME$ no vàlid",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2893,7 +2914,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": {
@@ -2997,7 +3018,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ó?"
@@ -3114,7 +3135,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",
@@ -3126,7 +3147,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"
@@ -3459,10 +3480,10 @@
     "message": "Cal l'inici de sessió en dos passos de Duo al vostre compte. Seguiu els passos de sota per finalitzar l'inici de sessió."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Seguiu els passos de sota per finalitzar l'inici de sessió."
+    "message": "Seguiu els passos següents per finalitzar l'inici de sessió."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Seguiu els passos de sota per finalitzar l'inici de sessió amb la clau de seguretat."
+    "message": "Seguiu els passos següents per finalitzar l'inici de sessió amb la clau de seguretat."
   },
   "launchDuo": {
     "message": "Inicia Duo al navegador"
@@ -3633,7 +3654,7 @@
     "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
   },
   "uriMatchWarningDialogLink": {
-    "message": "Més sobre la detecció de coincidències",
+    "message": "Més informació sobre la detecció de coincidències",
     "description": "Link to match detection docs on warning dialog for advance match strategy"
   },
   "uriAdvancedOption": {
@@ -3777,7 +3798,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"
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assigna a col·leccions"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/cs/messages.json b/apps/desktop/src/locales/cs/messages.json
index 6e5e69fb3b2..cd77dcd1d06 100644
--- a/apps/desktop/src/locales/cs/messages.json
+++ b/apps/desktop/src/locales/cs/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Vložte svůj bezpečnostní klíč do USB portu Vašeho počítače a pokud má tlačítko, tak jej stiskněte."
   },
-  "recoveryCodeDesc": {
-    "message": "Ztratili jste přístup ke všem nastaveným poskytovatelům dvoufázového přihlášení? Použijte obnovovací kód pro vypnutí dvoufázového přihlášení."
-  },
   "recoveryCodeTitle": {
     "message": "Kód pro obnovení"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automaticky vymaže zkopírované hodnoty z Vaší schránky.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Zobrazit ikony webových stránek"
-  },
-  "faviconDesc": {
-    "message": "Zobrazí rozeznatelný obrázek vedle každého přihlášení."
+  "showIconsChangePasswordUrls": {
+    "message": "Zobrazit ikony webových stránek a načíst URL adresy pro změnu hesla"
   },
   "enableMinToTray": {
     "message": "Minimalizovat do systémové lišty"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Změnit ohrožené heslo"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Tyto přihlašovací údaje jsou ohrožené a chybí jim webová stránka. Přidejte webovou stránku a změňte heslo pro větší bezpečnost."
+  },
+  "missingWebsite": {
+    "message": "Chybějící webová stránka"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Nemůžete odebrat sbírky s oprávněními jen pro zobrazení: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "O tomto nastavení"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden bude používat uložené přihlašovací URI k identifikaci, která ikona nebo změna adresy URL by měla být použita pro zlepšení Vašeho zážitku. Při používání této služby nejsou shromažďovány ani ukládány žádné informace."
+  },
   "assignToCollections": {
     "message": "Přiřadit ke sbírkám"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Potvrdit"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Povolit zkratku automatického psaní"
+  "enableAutotypeShortcutPreview": {
+    "message": "Povolit zkratku Autotype (náhled funkce)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "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"
+  },
+  "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": {
+    "message": "Položka byla přesunuta do archivu"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Položka byla odebrána z archivu"
+  },
+  "archiveItem": {
+    "message": "Archivovat položku"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/cy/messages.json b/apps/desktop/src/locales/cy/messages.json
index 9546bdb1bf2..616673932ca 100644
--- a/apps/desktop/src/locales/cy/messages.json
+++ b/apps/desktop/src/locales/cy/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/da/messages.json b/apps/desktop/src/locales/da/messages.json
index 984268a2c67..9d46c37eea2 100644
--- a/apps/desktop/src/locales/da/messages.json
+++ b/apps/desktop/src/locales/da/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Indsæt din sikkerhedsnøgle i din computers USB-port. Hvis den har en knap, tryk på den."
   },
-  "recoveryCodeDesc": {
-    "message": "Mistet adgang til alle dine tofaktorudbydere? Brug din genoprettelseskode til at deaktivere alle tofaktorudbydere på din konto."
-  },
   "recoveryCodeTitle": {
     "message": "Gendannelseskode"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Ryd automatisk kopierede data fra udklipsholderen.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimér som bakkeikon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/de/messages.json b/apps/desktop/src/locales/de/messages.json
index 9128148a5af..56f45e04c08 100644
--- a/apps/desktop/src/locales/de/messages.json
+++ b/apps/desktop/src/locales/de/messages.json
@@ -703,10 +703,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"
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Stecke deinen Sicherheitsschlüssel in einen USB-Anschluss deines Computers. Falls er einen Knopf hat, drücke diesen."
   },
-  "recoveryCodeDesc": {
-    "message": "Zugang zu allen Zwei-Faktor-Anbietern verloren? Benutze deinen Wiederherstellungscode, um alle Zwei-Faktor-Anbieter in deinem Konto zu deaktivieren."
-  },
   "recoveryCodeTitle": {
     "message": "Wiederherstellungscode"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Kopierten Inhalt automatisch aus der Zwischenablage löschen.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Website-Symbole anzeigen und URLs zum Ändern von Passwörtern abrufen"
   },
   "enableMinToTray": {
     "message": "In Infobereich-Symbol minimieren"
@@ -2660,6 +2663,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"
   },
@@ -3492,10 +3513,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."
@@ -3592,10 +3613,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",
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Gefährdetes Passwort ändern"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "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 Website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Du kannst Sammlungen mit Leseberechtigung nicht entfernen: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "Über diese Einstellung"
+  },
+  "permitCipherDetailsDescription": {
+    "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"
   },
@@ -4074,32 +4107,70 @@
   "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."
+    "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"
+  },
+  "archiveNoun": {
+    "message": "Archiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archivieren",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Archivierung aufheben"
+  },
+  "itemsInArchive": {
+    "message": "Einträge im Archiv"
+  },
+  "noItemsInArchive": {
+    "message": "Keine Einträge im Archiv"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archivierte Einträge werden hier angezeigt und von allgemeinen Suchergebnissen sowie Auto-Ausfüllen-Vorschlägen ausgeschlossen."
+  },
+  "itemSentToArchive": {
+    "message": "Eintrag an das Archiv gesendet"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Eintrag aus dem Archiv entfernt"
+  },
+  "archiveItem": {
+    "message": "Eintrag archivieren"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/el/messages.json b/apps/desktop/src/locales/el/messages.json
index 586a23069dc..da30273ec93 100644
--- a/apps/desktop/src/locales/el/messages.json
+++ b/apps/desktop/src/locales/el/messages.json
@@ -42,7 +42,7 @@
     "message": "Αναζήτηση κρύπτης"
   },
   "resetSearch": {
-    "message": "Reset search"
+    "message": "Επαναφορά αναζήτησης"
   },
   "addItem": {
     "message": "Προσθήκη στοιχείου"
@@ -431,7 +431,7 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Ο ιστότοπος προστέθηκε"
   },
   "addWebsite": {
     "message": "Προσθήκη ιστοτόπου"
@@ -576,7 +576,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 +703,10 @@
     "message": "Το συνημμένο αποθηκεύτηκε"
   },
   "addAttachment": {
-    "message": "Add attachment"
+    "message": "Προσθήκη συνημμένου"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "Maximum file size is 500 MB"
+    "message": "Το μέγιστο μέγεθος αρχείου είναι 500 MB"
   },
   "file": {
     "message": "Αρχείο"
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Εισάγετε το κλειδί ασφαλείας στη θύρα USB του υπολογιστή σας. Αν έχει κουμπί, πατήστε το."
   },
-  "recoveryCodeDesc": {
-    "message": "Έχετε χάσει την πρόσβαση σε όλους τους παρόχους δύο παραγόντων; Χρησιμοποιήστε τον κωδικό ανάκτησης σας για να απενεργοποιήσετε όλους τους παρόχους δύο παραγόντων από τον λογαριασμό σας."
-  },
   "recoveryCodeTitle": {
     "message": "Κωδικός ανάκτησης"
   },
@@ -1225,6 +1222,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. Θέλετε να επισκεφθείτε την ιστοσελίδα τώρα;"
   },
@@ -1305,11 +1311,8 @@
     "message": "Αυτόματη εκκαθάριση αντιγραμμένων τιμών προχείρου.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Ελαχιστοποίηση σε εικονίδιο περιοχής ειδοποιήσεων"
@@ -2015,13 +2018,13 @@
     "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",
@@ -2660,6 +2663,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": "Κλειδωμένο"
   },
@@ -3075,7 +3096,7 @@
     "description": "Software Development Kit"
   },
   "server": {
-    "message": "Server"
+    "message": "Διακομιστής"
   },
   "loginRequest": {
     "message": "Login request"
@@ -3641,7 +3662,7 @@
     "description": "Advanced option placeholder for uri option component"
   },
   "warningCapitalized": {
-    "message": "Warning",
+    "message": "Προειδοποίηση",
     "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "success": {
@@ -3789,7 +3810,7 @@
     "message": "ζητά πρόσβαση σε"
   },
   "sshkeyApprovalMessageSuffix": {
-    "message": "in order to"
+    "message": "προκειμένου να"
   },
   "sshActionLogin": {
     "message": "authenticate to a server"
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 347dbdc9800..afe69682f98 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -966,9 +966,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1231,6 +1228,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?"
   },
@@ -1311,11 +1317,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2666,6 +2669,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"
   },
@@ -4015,6 +4036,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4155,12 +4182,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."
@@ -4174,13 +4207,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/en_GB/messages.json b/apps/desktop/src/locales/en_GB/messages.json
index 48181d5a803..22e2c375561 100644
--- a/apps/desktop/src/locales/en_GB/messages.json
+++ b/apps/desktop/src/locales/en_GB/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognisable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimise to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/en_IN/messages.json b/apps/desktop/src/locales/en_IN/messages.json
index 01c2881f6a0..269feba18d5 100644
--- a/apps/desktop/src/locales/en_IN/messages.json
+++ b/apps/desktop/src/locales/en_IN/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to disable all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognisable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimise to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/eo/messages.json b/apps/desktop/src/locales/eo/messages.json
index 0e6e6d20197..540503079fa 100644
--- a/apps/desktop/src/locales/eo/messages.json
+++ b/apps/desktop/src/locales/eo/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Rehaviga kodo"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Aŭtomate forviŝi la kopiitajn valorojn el via tondujo.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/es/messages.json b/apps/desktop/src/locales/es/messages.json
index 2f4559d3fa2..0c61da97f10 100644
--- a/apps/desktop/src/locales/es/messages.json
+++ b/apps/desktop/src/locales/es/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Inserta tu llave de seguridad en el puerto USB de tu equipo. Si tiene un botón, púlsalo."
   },
-  "recoveryCodeDesc": {
-    "message": "¿Has perdido el acceso a todos tus métodos de autenticación en dos pasos? Utiliza tu código de recuperación para deshabilitar todos los métodos de autenticación en dos pasos de tu cuenta."
-  },
   "recoveryCodeTitle": {
     "message": "Código de recuperación"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Borrar automáticamente los valores copiados de su portapapeles.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimizar a icono en la bandeja"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Cambiar contraseña en riesgo"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "No puedes eliminar colecciones con permisos de solo Visualización: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Asignar a colecciones"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/et/messages.json b/apps/desktop/src/locales/et/messages.json
index c6a25016a57..a4a36241e9f 100644
--- a/apps/desktop/src/locales/et/messages.json
+++ b/apps/desktop/src/locales/et/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Sisesta oma turvaline võti arvuti USB porti. Kui sellel on nupp, siis vajuta seda."
   },
-  "recoveryCodeDesc": {
-    "message": "Puudub ligipääs kaheastmelise kinnitamise teenusele? Kasuta Taastamise koodi, et kaheastmeline kinnitamine oma kontol välja lülitada."
-  },
   "recoveryCodeTitle": {
     "message": "Taastamise kood"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Puhastab automaatselt lõikelauale kopeeritud sisu.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimeeri tegumiribale"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/eu/messages.json b/apps/desktop/src/locales/eu/messages.json
index cbc2b6ff42a..55f02f7d7d2 100644
--- a/apps/desktop/src/locales/eu/messages.json
+++ b/apps/desktop/src/locales/eu/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Sartu zure segurtasun-gakoa ordenagailuaren USB atakan. Botoia badu, sakatu ezazu."
   },
-  "recoveryCodeDesc": {
-    "message": "Bi urratseko egiaztatzeko modu guztietarako sarbidea galdu duzu? Erabili zure berreskuratze-kodea zure kontuko bi urratseko egiaztatze hornitzaile guztiak desaktibatzeko."
-  },
   "recoveryCodeTitle": {
     "message": "Berreskuratze-kodea"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Ezabatu automatikoki arbelean kopiatutako balioak.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimizatu erretiluko ikonora"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/fa/messages.json b/apps/desktop/src/locales/fa/messages.json
index 43af55b02dc..bb82558cc04 100644
--- a/apps/desktop/src/locales/fa/messages.json
+++ b/apps/desktop/src/locales/fa/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "کلید امنیتی خود را وارد پورت USB رایانه کنید، اگر دکمه‌ای دارد آن را بفشارید."
   },
-  "recoveryCodeDesc": {
-    "message": "دسترسی به تمامی ارائه‌دهندگان دو مرحله‌ای را از دست داده‌اید؟ از کد بازیابی خود برای غیرفعال‌سازی ارائه‌دهندگان دو مرحله‌ای حسابتان استفاده کنید."
-  },
   "recoveryCodeTitle": {
     "message": "کد بازیابی"
   },
@@ -1225,6 +1222,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 راه‌اندازی شود. آیا می‌خواهید از سایت بازدید کنید؟"
   },
@@ -1305,11 +1311,8 @@
     "message": "به صورت خودکار، مقادیر کپی شده را از حافظه موقت پاک کن.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "کوچک کردن به نماد سینی"
@@ -2660,6 +2663,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": "قفل شد"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "تغییر کلمه عبور در معرض خطر"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "نمی‌توانید مجموعه‌هایی را که فقط دسترسی مشاهده دارند حذف کنید: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "اختصاص به مجموعه‌ها"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/fi/messages.json b/apps/desktop/src/locales/fi/messages.json
index 38a266c90a7..2d764ce69b3 100644
--- a/apps/desktop/src/locales/fi/messages.json
+++ b/apps/desktop/src/locales/fi/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Kytke suojausavaimesi tietokoneen USB-porttiin ja jos laitteessa on painike, paina sitä."
   },
-  "recoveryCodeDesc": {
-    "message": "Etkö pysty käyttämään kaksivaiheisen kirjautumisen todentajiasi? Poista kaikki tilillesi määritetyt todentajat käytöstä palautuskoodillasi."
-  },
   "recoveryCodeTitle": {
     "message": "Palautuskoodi"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Poista kopioidut arvot leikepöydältä automaattisesti.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Pienennä ilmoitusalueelle"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Vaihda vaarantunut salasana"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/fil/messages.json b/apps/desktop/src/locales/fil/messages.json
index b824145e001..2ce70f049e1 100644
--- a/apps/desktop/src/locales/fil/messages.json
+++ b/apps/desktop/src/locales/fil/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Ipasok ang iyong key ng seguridad sa USB port ng iyong computer. Kung may butones ito, hawakan ito."
   },
-  "recoveryCodeDesc": {
-    "message": "Nawala ang access sa lahat ng iyong dalawang-factor provider? Gamitin ang iyong recovery code para patayin ang lahat ng dalawang-factor provider sa iyong account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Awtomatikong linisin ang mga kopya mula sa iy.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "I-minimise sa icon ng tray"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/fr/messages.json b/apps/desktop/src/locales/fr/messages.json
index 6a7697de8f4..6c1a081926b 100644
--- a/apps/desktop/src/locales/fr/messages.json
+++ b/apps/desktop/src/locales/fr/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insérez votre clé de sécurité dans le port USB de votre ordinateur. S'il dispose d'un bouton, appuyez dessus."
   },
-  "recoveryCodeDesc": {
-    "message": "Accès perdu à tous vos services d'authentification à double facteurs ? Utilisez votre code de récupération pour désactiver tous les services de double authentifications sur votre compte."
-  },
   "recoveryCodeTitle": {
     "message": "Code de récupération"
   },
@@ -1225,6 +1222,15 @@
   "invalidMasterPassword": {
     "message": "Mot de passe principal invalide"
   },
+  "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'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 ?"
   },
@@ -1232,7 +1238,7 @@
     "message": "Authentification à deux facteurs"
   },
   "vaultTimeoutHeader": {
-    "message": "Vault timeout"
+    "message": "Délai d'expiration du coffre"
   },
   "vaultTimeout": {
     "message": "Délai d'expiration du coffre"
@@ -1241,7 +1247,7 @@
     "message": "Délai dépassé"
   },
   "vaultTimeoutAction1": {
-    "message": "Timeout action"
+    "message": "Expiration de l'action"
   },
   "vaultTimeoutDesc": {
     "message": "Choisissez quand votre coffre réalisera l'action d'expiration."
@@ -1305,11 +1311,8 @@
     "message": "Effacer automatiquement de votre presse-papiers les valeurs copiées.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Affiche les icônes du site web et récupère les URL de changement de mot de passe"
   },
   "enableMinToTray": {
     "message": "Réduire dans la zone de notification"
@@ -2518,10 +2521,10 @@
     "message": "Le délai d'expiration de votre coffre dépasse les restrictions définies par votre organisation."
   },
   "vaultTimeoutPolicyAffectingOptions": {
-    "message": "Enterprise policy requirements have been applied to your timeout options"
+    "message": "Les exigences de la politique de sécurité d'Entreprise ont été appliquées à vos options de délai d'expiration"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
+    "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": {
       "hours": {
         "content": "$1",
@@ -2534,7 +2537,7 @@
     }
   },
   "vaultTimeoutPolicyMaximumError": {
-    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "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",
@@ -2660,6 +2663,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": "Verrouillé"
   },
@@ -3037,7 +3058,7 @@
     }
   },
   "loginRequestApprovedForEmailOnDevice": {
-    "message": "Login request approved for $EMAIL$ on $DEVICE$",
+    "message": "Demande de connexion approuvée pour $EMAIL$ sur $DEVICE$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3050,10 +3071,10 @@
     }
   },
   "youDeniedLoginAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this was you, try to log in with the device again."
+    "message": "Vous avez refusé une tentative de connexion depuis un autre appareil. Si c'était vous, essayez de vous reconnecter avec l'appareil."
   },
   "webApp": {
-    "message": "Web app"
+    "message": "Application web"
   },
   "mobile": {
     "message": "Mobile",
@@ -3064,7 +3085,7 @@
     "description": "Browser extension/addon"
   },
   "desktop": {
-    "message": "Desktop",
+    "message": "Bureau",
     "description": "Desktop app"
   },
   "cli": {
@@ -3075,10 +3096,10 @@
     "description": "Software Development Kit"
   },
   "server": {
-    "message": "Server"
+    "message": "Serveur"
   },
   "loginRequest": {
-    "message": "Login request"
+    "message": "Demande de connexion"
   },
   "deviceType": {
     "message": "Type d'appareil"
@@ -3492,10 +3513,10 @@
     "message": "Sélectionnez une collection"
   },
   "importTargetHintCollection": {
-    "message": "Select this option if you want the imported file contents moved to a collection"
+    "message": "Sélectionnez cette option si vous voulez que le contenu du fichier importé soit déplacé vers une collection"
   },
   "importTargetHintFolder": {
-    "message": "Select this option if you want the imported file contents moved to a folder"
+    "message": "Sélectionnez cette option si vous voulez que le contenu du fichier importé soit déplacé vers un dossier"
   },
   "importUnassignedItemsError": {
     "message": "Le fichier contient des éléments non assignés."
@@ -3592,10 +3613,10 @@
     "message": "Veuillez continuer à vous connecter en utilisant les identifiants de votre entreprise."
   },
   "importDirectlyFromBrowser": {
-    "message": "Import directly from browser"
+    "message": "Importer directement du navigateur"
   },
   "browserProfile": {
-    "message": "Browser Profile"
+    "message": "Profil du navigateur"
   },
   "seeDetailedInstructions": {
     "message": "Consultez les instructions détaillées sur notre site d'aide à",
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Changer le mot de passe à risque"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "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": "Site Web manquant"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Vous ne pouvez pas supprimer des collections avec les autorisations d'affichage uniquement : $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "À propos de ce paramètre"
+  },
+  "permitCipherDetailsDescription": {
+    "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."
+  },
   "assignToCollections": {
     "message": "Assigner aux collections"
   },
@@ -4069,37 +4102,75 @@
     }
   },
   "showMore": {
-    "message": "Show more"
+    "message": "Afficher plus"
   },
   "showLess": {
-    "message": "Show less"
-  },
-  "enableAutotype": {
-    "message": "Activer le type automatique"
+    "message": "Afficher moins"
   },
   "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": "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",
+    "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."
   },
   "next": {
-    "message": "Next"
+    "message": "Suivant"
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Confirmez le domaine de Key Connector"
   },
   "confirm": {
-    "message": "Confirm"
+    "message": "Confirmer"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
-    "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
+    "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": "Edit shortcut"
+    "message": "Modifier le raccourci"
+  },
+  "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"
+  },
+  "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"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Élément retiré de l'archive"
+  },
+  "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 ?"
   }
 }
diff --git a/apps/desktop/src/locales/gl/messages.json b/apps/desktop/src/locales/gl/messages.json
index a0df0343dbc..9afc8066572 100644
--- a/apps/desktop/src/locales/gl/messages.json
+++ b/apps/desktop/src/locales/gl/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/he/messages.json b/apps/desktop/src/locales/he/messages.json
index b9e8b04a5e0..fc4c4854d65 100644
--- a/apps/desktop/src/locales/he/messages.json
+++ b/apps/desktop/src/locales/he/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "הכנס את מפתח האבטחה שלך אל כניסת ה-USB במחשבך. אם יש לו כפתור, גע בו."
   },
-  "recoveryCodeDesc": {
-    "message": "איבדת גישה לכל ספקי האימות הדו-שלבי שלך? השתמש בקוד שחזור כדי לבטל את כל הספקים הקיימים בחשבונך."
-  },
   "recoveryCodeTitle": {
     "message": "קוד שחזור"
   },
@@ -1225,6 +1222,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. האם ברצונך לפתוח את האתר כעת?"
   },
@@ -1305,11 +1311,8 @@
     "message": "נקה אוטומטית ערכים שהועתקו ללוח ההעתקות (clipboard).",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "הצג סמלי אתר אינטרנט"
-  },
-  "faviconDesc": {
-    "message": "הצג תמונה מוכרת ליד כל כניסה."
+  "showIconsChangePasswordUrls": {
+    "message": "הצג סמלי אתרי אינטרנט ואחזר כתובות URL לשינוי סיסמה"
   },
   "enableMinToTray": {
     "message": "מזער למגש המערכת"
@@ -2660,6 +2663,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": "נעול"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "שנה סיסמה בסיכון"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "כניסה זו נמצאת בסיכון וחסר בה אתר אינטרנט. הוסף אתר אינטרנט ושנה את הסיסמה לאבטחה חזקה יותר."
+  },
+  "missingWebsite": {
+    "message": "לא נמצא אתר אינטרנט"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "אינך יכול להסיר אוספים עם הרשאות הצגה בלבד: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "אודות הגדרה זו"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden ישתמש בכתובות URI של כניסות שמורות כדי לזהות באיזה סמל או URL לשינוי סיסמה יש להשתמש על מנת לשפר את החוויה שלך. לא נאסף או נשמר מידע כלשהו כאשר אתה משתמש בשירות זה."
+  },
   "assignToCollections": {
     "message": "הקצה לאוספים"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "אשר"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "הפעל קיצור דרך להקלדה אוטומטית"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "message": "וודא שאתה נמצא בשדה הנכון לפני השימוש בקיצור הדרך כדי להימנע ממילוי נתונים במקום הלא נכון."
   },
   "editShortcut": {
     "message": "ערוך קיצור דרך"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/hi/messages.json b/apps/desktop/src/locales/hi/messages.json
index 70b8b2c63bf..f62a31c2635 100644
--- a/apps/desktop/src/locales/hi/messages.json
+++ b/apps/desktop/src/locales/hi/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/hr/messages.json b/apps/desktop/src/locales/hr/messages.json
index ae48290fbfa..11ab8b7d223 100644
--- a/apps/desktop/src/locales/hr/messages.json
+++ b/apps/desktop/src/locales/hr/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Umetni svoj sigurnosni ključ u USB priključak računala. Ako ima tipku, dodirni ju."
   },
-  "recoveryCodeDesc": {
-    "message": "Izgubljen je pristup uređaju za dvostruku autentifikaciju? Koristi svoj kôd za oporavak za onemogućavanje svih pružatelja usluga dvostruke autentifikacije na tvojem računu."
-  },
   "recoveryCodeTitle": {
     "message": "Kôd za oporavak"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatski očisti kopirane vrijednosti iz međuspremnika.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Prikaži ikone mrežnih mjesta"
-  },
-  "faviconDesc": {
-    "message": "Prikaži prepoznatljivu sliku pored svake prijave."
+  "showIconsChangePasswordUrls": {
+    "message": "Prikaži ikonu web mjesta i dohvati URL za promjenu lozinke"
   },
   "enableMinToTray": {
     "message": "Minimiziraj u područje obavijesti"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Promijeni rizičnu lozinku"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Ova prijava je ugrožena i nedostaje joj web-stranica. Dodaj web-stranicu i promijeni lozinku za veću sigurnost."
+  },
+  "missingWebsite": {
+    "message": "Nedostaje web-stranica"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "S dopuštenjima samo za prikaz ne možeš ukloniti zbirke: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "O ovoj postavci"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden će koristiti spremljene URI-je za prijavu kako bi identificirao ikonu ili URL za promjenu lozinke koji treba koristiti za poboljšanje tvojeg iskustva. Nikakvi podaci se ne prikupljaju, niti spremaju kada koristiš ovu uslugu."
+  },
   "assignToCollections": {
     "message": "Dodijeli zbirkama"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "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."
   },
   "editShortcut": {
     "message": "Uredi prečac"
+  },
+  "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"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Arhivirane stavke biti će prikazane ovdje i biti će izuzete iz rezultata općih pretraga i preporuka auto-ispune."
+  },
+  "itemSentToArchive": {
+    "message": "Stavka poslana u arhivu"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Stavka maknute 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?"
   }
 }
diff --git a/apps/desktop/src/locales/hu/messages.json b/apps/desktop/src/locales/hu/messages.json
index 74c822c757d..393340a6dfb 100644
--- a/apps/desktop/src/locales/hu/messages.json
+++ b/apps/desktop/src/locales/hu/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "A biztonsági kulcs beillesztése a számítógép USB portjába. Ha van rajta gomb, nyomjuk meg."
   },
-  "recoveryCodeDesc": {
-    "message": "Elveszett a hozzáférés az összes kétlépcsős szolgáltatóhoz? A visszaállítókód használatával letilthatók fiókból a kétlépcsős szolgáltatók."
-  },
   "recoveryCodeTitle": {
     "message": "Helyreállító kód"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatikusan törli a vágólapra másolt értékeket.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Webhelyikonok megjelenítése és jelszó webcímek módosításának lekérése"
   },
   "enableMinToTray": {
     "message": "Kicsinyítés tálcaikonná"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Kockázatos jelszó megváltoztatása"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Ez a bejelentkezés veszélyben van és hiányzik egy webhely. Adjunk hozzá egy webhelyet és módosítsuk a jelszót az erősebb biztonság érdekében."
+  },
+  "missingWebsite": {
+    "message": "Hiányzó webhely"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Nem távolíthatók el a csak megtekintési engedéllyel bíró gyűjtemények: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "Információ erről a beállításról"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "A Bitwarden mentett bejelentkezési webcímeket használ annak azonosítására, hogy melyik ikont vagy jelszó webcímet kell használni az élmény javítása érdekében. A szolgáltatás használatakor nincs információ gyűjtés vagy mentés."
+  },
   "assignToCollections": {
     "message": "Hozzárendelés gyűjteményekhez"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Megerősítés"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Automatikus típusú parancsikon engedélyezése"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archívum",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archívum",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Visszavétel archívumból"
+  },
+  "itemsInArchive": {
+    "message": "Archívum elemek száma"
+  },
+  "noItemsInArchive": {
+    "message": "Nincs elem az archívumban."
+  },
+  "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"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Az elem kikerült az archívumbó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?"
   }
 }
diff --git a/apps/desktop/src/locales/id/messages.json b/apps/desktop/src/locales/id/messages.json
index bff06071eee..445f999ca6d 100644
--- a/apps/desktop/src/locales/id/messages.json
+++ b/apps/desktop/src/locales/id/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Masukkan kunci keamanan ke port USB komputer Anda. Jika ada tombolnya, tekanlah."
   },
-  "recoveryCodeDesc": {
-    "message": "Kehilangan akses ke semua penyedia dua faktor Anda? Gunakan kode pemulihan untuk menonaktifkan semua penyedia dua faktor dari akun Anda."
-  },
   "recoveryCodeTitle": {
     "message": "Kode Pemulihan"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Secara otomatis menghapus nilai yang disalin dari clipboard Anda.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Kecilkan ke Ikon Baki"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/it/messages.json b/apps/desktop/src/locales/it/messages.json
index 153b9cfe28b..97a00443f4d 100644
--- a/apps/desktop/src/locales/it/messages.json
+++ b/apps/desktop/src/locales/it/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Inserisci la tua chiave di sicurezza nella porta USB del tuo computer. Se dispone di un pulsante, premilo."
   },
-  "recoveryCodeDesc": {
-    "message": "Hai perso l'accesso a tutti i tuoi metodi di verifica in due passaggi? Usa il tuo codice di recupero per disattivarli tutti dal tuo account."
-  },
   "recoveryCodeTitle": {
     "message": "Codice di recupero"
   },
@@ -1225,6 +1222,15 @@
   "invalidMasterPassword": {
     "message": "Password principale errata"
   },
+  "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 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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Cancella automaticamente i valori copiati dagli appunti.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimizza nell'area di notifica"
@@ -2660,6 +2663,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": "Bloccato"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "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."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Non puoi rimuovere raccolte con i soli permessi di visualizzazione: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assegna a una raccolta"
   },
@@ -4074,12 +4107,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": "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": "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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Conferma"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/ja/messages.json b/apps/desktop/src/locales/ja/messages.json
index 27bf6a3c9ca..7c1cd89dd61 100644
--- a/apps/desktop/src/locales/ja/messages.json
+++ b/apps/desktop/src/locales/ja/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "セキュリティキーを USB ポートに挿入し、ボタンがある場合はボタンをタッチしてください。"
   },
-  "recoveryCodeDesc": {
-    "message": "すべての2段階認証プロパイダにアクセスできなくなったときは、リカバリーコードを使用するとアカウントの2段階認証を無効化できます。"
-  },
   "recoveryCodeTitle": {
     "message": "リカバリーコード"
   },
@@ -1225,6 +1222,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 ウェブ保管庫で有効化できます。ウェブサイトを開きますか？"
   },
@@ -1305,11 +1311,8 @@
     "message": "選択した時間が経過した後、自動的にクリップボードを消去します。",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "トレイアイコンに最小化"
@@ -2660,6 +2663,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": "ロック中"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "危険なパスワードの変更"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/ka/messages.json b/apps/desktop/src/locales/ka/messages.json
index 6133b34a007..4095eccade0 100644
--- a/apps/desktop/src/locales/ka/messages.json
+++ b/apps/desktop/src/locales/ka/messages.json
@@ -262,7 +262,7 @@
     "message": "Remember until vault is locked"
   },
   "premiumRequired": {
-    "message": "Premium required"
+    "message": "საჭიროა პრემიუმი"
   },
   "premiumRequiredDesc": {
     "message": "A Premium membership is required to use this feature."
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -1607,7 +1610,7 @@
     "message": "ყველაფრის ჩვენება"
   },
   "quitBitwarden": {
-    "message": "Quit Bitwarden"
+    "message": "გამოდით Bitwarden-იდან"
   },
   "valueCopied": {
     "message": "$VALUE$ copied",
@@ -2660,6 +2663,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": "დაბლოკილია"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3852,7 +3879,7 @@
     "message": "Move"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "ახალი საქაღალდე"
   },
   "folderName": {
     "message": "Folder Name"
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/km/messages.json b/apps/desktop/src/locales/km/messages.json
index a0df0343dbc..9afc8066572 100644
--- a/apps/desktop/src/locales/km/messages.json
+++ b/apps/desktop/src/locales/km/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/kn/messages.json b/apps/desktop/src/locales/kn/messages.json
index ea7ed12b821..54909553293 100644
--- a/apps/desktop/src/locales/kn/messages.json
+++ b/apps/desktop/src/locales/kn/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್‌ನ ಯುಎಸ್‌ಬಿ ಪೋರ್ಟ್ಗೆ ನಿಮ್ಮ ಭದ್ರತಾ ಕೀಲಿಯನ್ನು ಸೇರಿಸಿ. ಅದು ಬಟನ್ ಹೊಂದಿದ್ದರೆ, ಅದನ್ನು ಸ್ಪರ್ಶಿಸಿ."
   },
-  "recoveryCodeDesc": {
-    "message": "ನಿಮ್ಮ ಎಲ್ಲಾ ಎರಡು ಅಂಶ ಪೂರೈಕೆದಾರರಿಗೆ ಪ್ರವೇಶವನ್ನು ಕಳೆದುಕೊಂಡಿದ್ದೀರಾ? ನಿಮ್ಮ ಖಾತೆಯಿಂದ ಎಲ್ಲಾ ಎರಡು ಅಂಶ ಪೂರೈಕೆದಾರರನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ನಿಮ್ಮ ಮರುಪಡೆಯುವಿಕೆ ಕೋಡ್ ಬಳಸಿ."
-  },
   "recoveryCodeTitle": {
     "message": "ಮರುಪಡೆಯುವಿಕೆ ಕೋಡ್"
   },
@@ -1225,6 +1222,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": "ಭದ್ರತಾ ಕೀ, ದೃಢೀಕರಣ ಅಪ್ಲಿಕೇಶನ್, ಎಸ್‌ಎಂಎಸ್, ಫೋನ್ ಕರೆ ಅಥವಾ ಇಮೇಲ್‌ನಂತಹ ಮತ್ತೊಂದು ಸಾಧನದೊಂದಿಗೆ ನಿಮ್ಮ ಲಾಗಿನ್ ಅನ್ನು ಪರಿಶೀಲಿಸುವ ಅಗತ್ಯವಿರುವ ಎರಡು ಹಂತದ ಲಾಗಿನ್ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಹೆಚ್ಚು ಸುರಕ್ಷಿತಗೊಳಿಸುತ್ತದೆ. ಬಿಟ್ವಾರ್ಡೆನ್.ಕಾಮ್ ವೆಬ್ ವಾಲ್ಟ್ನಲ್ಲಿ ಎರಡು-ಹಂತದ ಲಾಗಿನ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬಹುದು. ನೀವು ಈಗ ವೆಬ್‌ಸೈಟ್‌ಗೆ ಭೇಟಿ ನೀಡಲು ಬಯಸುವಿರಾ?"
   },
@@ -1305,11 +1311,8 @@
     "message": "ನಿಮ್ಮ ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ನಿಂದ ನಕಲಿಸಿದ ಮೌಲ್ಯಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತೆರವುಗೊಳಿಸಿ.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "ಟ್ರೇ ಐಕಾನ್‌ಗೆ ಕಡಿಮೆ ಮಾಡಿ"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/ko/messages.json b/apps/desktop/src/locales/ko/messages.json
index fa50520635b..f210b5b5cae 100644
--- a/apps/desktop/src/locales/ko/messages.json
+++ b/apps/desktop/src/locales/ko/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "보안 키를 컴퓨터의 USB 포트에 삽입하고 버튼이 있는 경우 누르세요."
   },
-  "recoveryCodeDesc": {
-    "message": "모든 2단계 인증을 사용할 수 없는 상황인가요? 복구 코드를 사용하여 계정의 모든 2단계 인증을 비활성화할 수 있습니다."
-  },
   "recoveryCodeTitle": {
     "message": "복구 코드"
   },
@@ -1225,6 +1222,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 웹 보관함에서 활성화할 수 있습니다. 지금 웹 사이트를 방문하시겠습니까?"
   },
@@ -1305,11 +1311,8 @@
     "message": "자동으로 클립보드에 복사된 값을 제거합니다.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "알림 영역으로 최소화"
@@ -2660,6 +2663,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": "잠김"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/lt/messages.json b/apps/desktop/src/locales/lt/messages.json
index 655ff38e251..e03c9dcd0f8 100644
--- a/apps/desktop/src/locales/lt/messages.json
+++ b/apps/desktop/src/locales/lt/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Įkiškite savo saugos raktą į kompiuterio USB prievadą. Jei jame yra mygtukas, palieskite jį."
   },
-  "recoveryCodeDesc": {
-    "message": "Praradote prieigą prie visų savo dviejų faktorių tiekėjų? Naudokite atkūrimo kodą, kad iš savo paskyros išjungtumėte visus dviejų faktorių tiekėjus."
-  },
   "recoveryCodeTitle": {
     "message": "Atkūrimo kodas"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatiškai išvalyti nukopijuotas reikšmes iškarpinėje.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Sumažinti į užduočių juostos piktogramą"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/lv/messages.json b/apps/desktop/src/locales/lv/messages.json
index 1fcd6ba599e..4ad26552858 100644
--- a/apps/desktop/src/locales/lv/messages.json
+++ b/apps/desktop/src/locales/lv/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Ievieto savu drošības atslēgu datora USB ligzdā! Ja tai ir poga, pieskaries tai!"
   },
-  "recoveryCodeDesc": {
-    "message": "Zaudēta piekļuve visiem divpakāpju nodrošinātājiem? Izmanto atkopes kodus, lai atspējotu visus sava konta divpakāpju nodrošinātājus!"
-  },
   "recoveryCodeTitle": {
     "message": "Atkopes kods"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automātiski noņemt starpliktuvē ievietotās vērtības.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Rādīt tīmekļvietņu ikonas"
-  },
-  "faviconDesc": {
-    "message": "Attēlot atpazīstamu attēlu pie katra pieteikšanās vienuma."
+  "showIconsChangePasswordUrls": {
+    "message": "Rādīt tīmekļvietņu ikonas un iegūt paroles nomaiņas URL"
   },
   "enableMinToTray": {
     "message": "Samazināt ikonjoslā"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Mainīt riskam pakļautu paroli"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Šis pieteikšanās vienums ir pakļauts riskam, un tam nav norādīta tīmekļvietne. Lielākai drošībai jāpievieno tīmekļvietne un jānomaina parole."
+  },
+  "missingWebsite": {
+    "message": "Nav norādīta tīmekļvietne"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Nevar noņemt krājumus ar tiesībām \"Tikai skatīt\": $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "Par šo iestatījumu"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden izmantos saglabātos pieteikšanās vienuma URI, lai noteiktu, kuru ikonu vai paroles nomaiņas URL izmantot, lai uzlabotu pieredzi. Šī pakalpojuma izmantošanas laikā nekāda informācija netiek ievākta vai saglabāta."
+  },
   "assignToCollections": {
     "message": "Piešķirt krājumiem"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "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": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Atcelt arhivēšanu"
+  },
+  "itemsInArchive": {
+    "message": "Vienumi arhīvā"
+  },
+  "noItemsInArchive": {
+    "message": "Arhīvā nav vienumu"
+  },
+  "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ā"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Vienums 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?"
   }
 }
diff --git a/apps/desktop/src/locales/me/messages.json b/apps/desktop/src/locales/me/messages.json
index badf50b2ab6..6f6086ebc57 100644
--- a/apps/desktop/src/locales/me/messages.json
+++ b/apps/desktop/src/locales/me/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Priključi svoj sigurnonosni ključ u USB port na kompjuteru. Ako ima dugme, takni ga."
   },
-  "recoveryCodeDesc": {
-    "message": "Izgubili ste pristup svim dobavljačima prijave u dva koraka? Upotrijebite sigurnonosni kod kako biste onemogućili sve prijave u dva koraka na vaš račun."
-  },
   "recoveryCodeTitle": {
     "message": "Sigurnosni kod"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatsko brisanje kopiranih vrijednosti iz vašeg međuspremnika.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "MInimiziraj u sistemsku traku"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/ml/messages.json b/apps/desktop/src/locales/ml/messages.json
index 420103c8f8e..4bc82a9a543 100644
--- a/apps/desktop/src/locales/ml/messages.json
+++ b/apps/desktop/src/locales/ml/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "നിങ്ങളുടെ കമ്പ്യൂട്ടറിന്റെ യുഎസ്ബി പോർട്ടിൽ സുരക്ഷാ കീ ഇടുക. അതിന് ഒരു ബട്ടൺ ഉണ്ടെങ്കിൽ അത് അമർത്തുക."
   },
-  "recoveryCodeDesc": {
-    "message": "നിങ്ങളുടെ രണ്ട്-ഘടക ദാതാക്കളിലേക്കുള്ള ആക്‌സസ്സ് നഷ്‌ടപ്പെട്ടോ? നിങ്ങളുടെ അക്കൗണ്ടിൽ നിന്ന് രണ്ട്-ഘടക ദാതാക്കളെ പ്രവർത്തനരഹിതമാക്കാൻ നിങ്ങളുടെ റിക്കവറി കോഡ് ഉപയോഗിക്കുക."
-  },
   "recoveryCodeTitle": {
     "message": "റിക്കവറി കോഡ്"
   },
@@ -1225,6 +1222,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 വെബ് വാൾട്ടിൽ രണ്ട്-ഘട്ട ലോഗിൻ പ്രവർത്തനക്ഷമമാക്കാനാകും.തങ്ങള്ക്കു ഇപ്പോൾ വെബ്സൈറ്റ് സന്ദർശിക്കാൻ ആഗ്രഹമുണ്ടോ?"
   },
@@ -1305,11 +1311,8 @@
     "message": "നിങ്ങളുടെ ക്ലിപ്പ്ബോർഡിൽ നിന്ന് പകർത്തിയ മൂല്യങ്ങൾ സ്വയം മായ്‌ക്കുക.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "ട്രേ ഐക്കണിലേക്ക് ചെറുതാക്കുക"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/mr/messages.json b/apps/desktop/src/locales/mr/messages.json
index a0df0343dbc..9afc8066572 100644
--- a/apps/desktop/src/locales/mr/messages.json
+++ b/apps/desktop/src/locales/mr/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/my/messages.json b/apps/desktop/src/locales/my/messages.json
index a98853e9db8..cb01bd340b5 100644
--- a/apps/desktop/src/locales/my/messages.json
+++ b/apps/desktop/src/locales/my/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/nb/messages.json b/apps/desktop/src/locales/nb/messages.json
index 38b6b40745b..3e7d5a646eb 100644
--- a/apps/desktop/src/locales/nb/messages.json
+++ b/apps/desktop/src/locales/nb/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Sett din sikkerhetsnøkkel inn i din datamaskins USB-uttak. Dersom den har en knapp, trykk på den."
   },
-  "recoveryCodeDesc": {
-    "message": "Har du mistet tilgang til alle dine 2-trinnsleverandører? Bruk din gjenopprettingskode til å fjerne alle 2-trinnsleverandører fra din konto."
-  },
   "recoveryCodeTitle": {
     "message": "Gjenopprettingskode"
   },
@@ -1225,6 +1222,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å?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Slett automatisk kopierte verdier fra utklippstavlen.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimer til oppgavelinjen"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Legg til i samlinger"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/ne/messages.json b/apps/desktop/src/locales/ne/messages.json
index d476f9d9c52..12edd751bff 100644
--- a/apps/desktop/src/locales/ne/messages.json
+++ b/apps/desktop/src/locales/ne/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/nl/messages.json b/apps/desktop/src/locales/nl/messages.json
index cfcc110bb03..a3896955162 100644
--- a/apps/desktop/src/locales/nl/messages.json
+++ b/apps/desktop/src/locales/nl/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Plaats je beveilingssleutel in de USB-poort van je computer. Als het een knop heeft, druk deze dan in."
   },
-  "recoveryCodeDesc": {
-    "message": "Ben je de toegang tot al je tweestapsaanbieders verloren? Gebruik dan je herstelcode om alle tweestapsaanbieders op je account uit te schakelen."
-  },
   "recoveryCodeTitle": {
     "message": "Herstelcode"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Gekopieerde waarden automatisch van het klembord wissen.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Toon website-pictogrammen"
-  },
-  "faviconDesc": {
-    "message": "Een herkenbare afbeelding naast iedere login weergeven."
+  "showIconsChangePasswordUrls": {
+    "message": "Websitepictogrammen weergeven en URL's voor wachtwoordwijzigingen ophalen"
   },
   "enableMinToTray": {
     "message": "Minimaliseren naar systeemvak"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Risicovol wachtwoord wijzigen"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Deze login is in gevaar en mist een website. Voeg een website toe en verander het wachtwoord voor een sterkere beveiliging."
+  },
+  "missingWebsite": {
+    "message": "Ontbrekende website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Je kunt verzamelingen niet verwijderen met alleen rechten voor weergeven: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "Over deze instelling"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden gebruikt opgeslagen login-URI's om te bepalen welk pictogram of URL voor het wijzigen van het wachtwoord moet worden gebruikt om je ervaring te verbeteren. Er wordt geen informatie verzameld of opgeslagen wanneer je deze service gebruikt."
+  },
   "assignToCollections": {
     "message": "Aan collecties toewijzen"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "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."
   },
   "editShortcut": {
     "message": "Snelkoppeling bewerken"
+  },
+  "archiveNoun": {
+    "message": "Archief",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archiveren",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Dearchiveren"
+  },
+  "itemsInArchive": {
+    "message": "Items in archief"
+  },
+  "noItemsInArchive": {
+    "message": "Geen items in archief"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Gearchiveerde items verschijnen hier en worden uitgesloten van algemene zoekresultaten en automatisch invulsuggesties."
+  },
+  "itemSentToArchive": {
+    "message": "Item naar archief verzonden"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item verwijderd uit archief"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/nn/messages.json b/apps/desktop/src/locales/nn/messages.json
index bda98fa2b50..f33379eed7b 100644
--- a/apps/desktop/src/locales/nn/messages.json
+++ b/apps/desktop/src/locales/nn/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Gjenopprettingskode"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/or/messages.json b/apps/desktop/src/locales/or/messages.json
index 8eb7dbf8d52..54971e9edc0 100644
--- a/apps/desktop/src/locales/or/messages.json
+++ b/apps/desktop/src/locales/or/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/pl/messages.json b/apps/desktop/src/locales/pl/messages.json
index 639a8c266c6..243cae0be72 100644
--- a/apps/desktop/src/locales/pl/messages.json
+++ b/apps/desktop/src/locales/pl/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Włóż klucz bezpieczeństwa do portu USB urządzenia. Jeśli klucz ma przycisk, dotknij go."
   },
-  "recoveryCodeDesc": {
-    "message": "Nie masz dostępu do logowania dwustopniowego? Użyj kodu odzyskiwania, aby je wyłączyć."
-  },
   "recoveryCodeTitle": {
     "message": "Kod odzyskiwania"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatycznie wyczyść skopiowaną wartość ze schowka.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Pokaż ikony stron internetowych i pobierz adresy URL do zmiany hasła"
   },
   "enableMinToTray": {
     "message": "Minimalizuj do zasobnika systemowego"
@@ -2660,6 +2663,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": "Zablokowane"
   },
@@ -3015,7 +3036,7 @@
     "message": "Logowanie za pomocą urządzenia musi być włączone w ustawieniach aplikacji Bitwarden. Potrzebujesz innej opcji?"
   },
   "viewAllLogInOptions": {
-    "message": "Zobacz wszystkie sposoby logowania"
+    "message": "Pokaż wszystkie metody logowania"
   },
   "viewAllLoginOptions": {
     "message": "Pokaż wszystkie metody logowania"
@@ -3592,10 +3613,10 @@
     "message": "Kontynuuj logowanie przy użyciu danych firmowych."
   },
   "importDirectlyFromBrowser": {
-    "message": "Import directly from browser"
+    "message": "Importuj bezpośrednio z przeglądarki"
   },
   "browserProfile": {
-    "message": "Browser Profile"
+    "message": "Profil przeglądarki"
   },
   "seeDetailedInstructions": {
     "message": "Zobacz szczegółowe instrukcje na naszej stronie pomocy pod adresem",
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Zmień zagrożone hasło"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Dane logowania są zagrożone i nie zawierają strony internetowej. Dodaj stronę internetową i zmień hasło."
+  },
+  "missingWebsite": {
+    "message": "Brak strony internetowej"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Nie możesz usunąć następujących kolekcji z uprawnieniami tylko do odczytu: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "O ustawieniu"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden użyje zapisanych adresów URL danych logowania, aby określić, która ikona lub adres URL zmiany hasła powinien zostać użyty w celu poprawy komfortu użytkowania. Usługa nie zapisuje żadnych danych."
+  },
   "assignToCollections": {
     "message": "Przypisz do kolekcji"
   },
@@ -4074,32 +4107,70 @@
   "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": "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": "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."
   },
   "next": {
-    "message": "Next"
+    "message": "Dalej"
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Potwierdź domenę Key Connector"
   },
   "confirm": {
-    "message": "Confirm"
+    "message": "Potwierdź"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+    "message": "Edytuj skrót"
+  },
+  "archiveNoun": {
+    "message": "Archiwum",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archiwizuj",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Usuń z archiwum"
+  },
+  "itemsInArchive": {
+    "message": "Elementy w archiwum"
+  },
+  "noItemsInArchive": {
+    "message": "Brak elementów w archiwum"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Zarchiwizowane elementy pojawią się tutaj i zostaną wykluczone z wyników wyszukiwania i sugestii autouzupełniania."
+  },
+  "itemSentToArchive": {
+    "message": "Element został przeniesiony do archiwum"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Element został usunięty z archiwum"
+  },
+  "archiveItem": {
+    "message": "Archiwizuj element"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Zarchiwizowane elementy są wykluczone z wyników wyszukiwania i sugestii autouzupełniania. Czy na pewno chcesz archiwizować element?"
   }
 }
diff --git a/apps/desktop/src/locales/pt_BR/messages.json b/apps/desktop/src/locales/pt_BR/messages.json
index 7397eb1a0ed..0731e7f6bc8 100644
--- a/apps/desktop/src/locales/pt_BR/messages.json
+++ b/apps/desktop/src/locales/pt_BR/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insira a sua chave de segurança na porta USB do seu computador. Se ele tiver um botão, toque nele."
   },
-  "recoveryCodeDesc": {
-    "message": "Perdeu o acesso a todos os seus provedores de duas etapas? Utilize o seu código de recuperação para desativar todos os provedores de duas etapas da sua conta."
-  },
   "recoveryCodeTitle": {
     "message": "Código de Recuperação"
   },
@@ -1225,6 +1222,15 @@
   "invalidMasterPassword": {
     "message": "Senha mestra invá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": "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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Limpar automaticamente os valores copiados da sua área de transferência.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimizar para ícone da bandeja"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Alterar senhas vulneráveis"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Você não pode remover coleções com permissões de Apenas visualização: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Atribuído a coleções"
   },
@@ -4074,12 +4107,18 @@
   "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."
   },
+  "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": "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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/pt_PT/messages.json b/apps/desktop/src/locales/pt_PT/messages.json
index c9b17299179..74c4e3077d2 100644
--- a/apps/desktop/src/locales/pt_PT/messages.json
+++ b/apps/desktop/src/locales/pt_PT/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Introduza a sua chave de segurança na porta USB do seu computador. Se tiver um botão, toque no mesmo."
   },
-  "recoveryCodeDesc": {
-    "message": "Perdeu o acesso a todos os seus fornecedores de verificação de dois passos? Utilize o seu código de recuperação para desativar todos os fornecedores de verificação de dois passos da sua conta."
-  },
   "recoveryCodeTitle": {
     "message": "Código de recuperação"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Limpar automaticamente os valores copiados da sua área de transferência.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Mostrar ícones do site"
-  },
-  "faviconDesc": {
-    "message": "Mostrar uma imagem reconhecível junto a cada credencial."
+  "showIconsChangePasswordUrls": {
+    "message": "Mostrar ícones de sites e recuperar URLs de alteração de palavra-passe"
   },
   "enableMinToTray": {
     "message": "Minimizar para ícone de bandeja"
@@ -1375,13 +1378,13 @@
     "message": "Idioma"
   },
   "languageDesc": {
-    "message": "Alterar o idioma utilizado pela aplicação. É necessário reiniciar."
+    "message": "Altere o idioma utilizado pela aplicação. É necessário reiniciar."
   },
   "theme": {
     "message": "Tema"
   },
   "themeDesc": {
-    "message": "Altere o tema de cores da aplicação."
+    "message": "Altere o tema da aplicação."
   },
   "dark": {
     "message": "Escuro",
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Alterar palavra-passe em risco"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Esta credencial está em risco e não tem um site. Adicione um site e altere a palavra-passe para uma segurança mais forte."
+  },
+  "missingWebsite": {
+    "message": "Site em falta"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Não é possível remover coleções com permissões de Apenas visualização: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "Acerca desta definição"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "O Bitwarden utilizará os URIs de credenciais guardadas para identificar qual o ícone ou URL de alteração de palavra-passe que deve ser utilizado para melhorar a sua experiência. Nenhuma informação é recolhida ou guardada quando utiliza este serviço."
+  },
   "assignToCollections": {
     "message": "Atribuir às coleções"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "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": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Arquivo",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arquivar",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Desarquivar"
+  },
+  "itemsInArchive": {
+    "message": "Itens no arquivo"
+  },
+  "noItemsInArchive": {
+    "message": "Nenhum item no arquivo"
+  },
+  "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"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removido do arquivo"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/ro/messages.json b/apps/desktop/src/locales/ro/messages.json
index d1717dce4c5..5d72560fabb 100644
--- a/apps/desktop/src/locales/ro/messages.json
+++ b/apps/desktop/src/locales/ro/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Introduceți cheia de securitate în portul USB al computerului. Dacă are un buton, apăsați-l."
   },
-  "recoveryCodeDesc": {
-    "message": "Ați pierdut accesul la toți furnizorii dvs. cu doi factori? Folosiți codul de recuperare pentru a dezactiva toți furnizorii cu doi factori din contul dvs."
-  },
   "recoveryCodeTitle": {
     "message": "Cod de recuperare"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Se șterg automat valorile copiate din clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Se minimizează în zona de notificare"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/ru/messages.json b/apps/desktop/src/locales/ru/messages.json
index 284cc8d5b85..c1c2cee8bf5 100644
--- a/apps/desktop/src/locales/ru/messages.json
+++ b/apps/desktop/src/locales/ru/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Вставьте ключ безопасности в USB-порт компьютера. Если у ключа есть кнопка, нажмите ее."
   },
-  "recoveryCodeDesc": {
-    "message": "Потеряли доступ ко всем вариантам двухэтапной аутентификации? Используйте код восстановления, чтобы отключить двухэтапную аутентификацию для вашего аккаунта."
-  },
   "recoveryCodeTitle": {
     "message": "Код восстановления"
   },
@@ -1225,6 +1222,15 @@
   "invalidMasterPassword": {
     "message": "Неверный мастер-пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неверный мастер-пароль. Подтвердите, что ваш адрес email указан верно и ваш аккаунт был создан на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Двухэтапная аутентификация делает аккаунт более защищенным, поскольку требуется подтверждение входа при помощи другого устройства, например, ключа безопасности, приложения-аутентификатора, SMS, телефонного звонка или электронной почты. Двухэтапная аутентификация включается на bitwarden.com. Перейти на сайт сейчас?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Автоматически удалять скопированные значения из буфера обмена.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Показать значки сайтов"
-  },
-  "faviconDesc": {
-    "message": "Отображать узнаваемое изображение рядом с каждым логином."
+  "showIconsChangePasswordUrls": {
+    "message": "Показывать значки сайтов и извлекать URL изменения пароля"
   },
   "enableMinToTray": {
     "message": "Сворачивать в область уведомлений"
@@ -2660,6 +2663,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": "Заблокировано"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Изменить пароль, подверженный риску"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Этот логин находится под угрозой и у него отсутствует веб-сайт. Добавьте веб-сайт и смените пароль для большей безопасности."
+  },
+  "missingWebsite": {
+    "message": "Отсутствует сайт"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Вы не можете удалить коллекции с правами только на просмотр: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "Об этой настройке"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden будет использовать сохраненные URI логинов, чтобы определить, какой значок или URL для смены пароля следует использовать для улучшения вашего взаимодействия. При использовании этого сервиса никакая информация не собирается и не сохраняется."
+  },
   "assignToCollections": {
     "message": "Назначить коллекциям"
   },
@@ -4074,14 +4107,20 @@
   "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": "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": {
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Подтвердить"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Включить ярлык автоввода"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "message": "Прежде чем использовать ярлык, убедитесь, что вы поставили курсор в нужное поле, чтобы избежать ввода данных в неправильное место."
   },
   "editShortcut": {
     "message": "Изменить ярлык"
+  },
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архивировать",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Разархивировать"
+  },
+  "itemsInArchive": {
+    "message": "Элементы в архиве"
+  },
+  "noItemsInArchive": {
+    "message": "В архиве нет элементов"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Архивированные элементы появятся здесь и будут исключены из общих результатов поиска и предложений автозаполнения."
+  },
+  "itemSentToArchive": {
+    "message": "Элемент отправлен в архив"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Элемент удален из архива"
+  },
+  "archiveItem": {
+    "message": "Архивировать элемент"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Архивированные элементы исключены из общих результатов поиска и предложений автозаполнения. Вы уверены, что хотите архивировать этот элемент?"
   }
 }
diff --git a/apps/desktop/src/locales/si/messages.json b/apps/desktop/src/locales/si/messages.json
index 0dd892fdad5..65cd68c9d53 100644
--- a/apps/desktop/src/locales/si/messages.json
+++ b/apps/desktop/src/locales/si/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "ප්‍රතිසාධන කේතය"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/sk/messages.json b/apps/desktop/src/locales/sk/messages.json
index 1c5caa51d4c..491d91913f9 100644
--- a/apps/desktop/src/locales/sk/messages.json
+++ b/apps/desktop/src/locales/sk/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Vložte váš bezpečnostný kľúč do USB portu počítača. Ak má tlačidlo, stlačte ho."
   },
-  "recoveryCodeDesc": {
-    "message": "Stratili ste prístup ku všetkým vašim dvojstupňovým poskytovateľom? Použite váš záchranný kód pre vypnutie všetkých poskytovateľov vo vašom účte."
-  },
   "recoveryCodeTitle": {
     "message": "Kód na obnovenie"
   },
@@ -1225,6 +1222,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"
+      }
+    }
+  },
   "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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automaticky vymazať skopírované hodnoty zo schránky.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Zobraziť favikony stránok"
-  },
-  "faviconDesc": {
-    "message": "Pri každom prihlásení zobrazí rozpoznateľný obrázok."
+  "showIconsChangePasswordUrls": {
+    "message": "Zobraziť ikony webových stránok a načítať adresy URL na zmenu hesla"
   },
   "enableMinToTray": {
     "message": "Minimalizovať do systémovej lišty"
@@ -2660,6 +2663,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ý"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Zmeniť rizikové heslá"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Toto prihlásenie je v ohrození a chýba mu webová stránka. Pridajte webovú stránku a zmeňte heslo na silnejšie zabezpečenie."
+  },
+  "missingWebsite": {
+    "message": "Chýbajúca webová stránka"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Zbierky, ktoré môžete len zobraziť nemôžete odstrániť: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "O tomto nastavení"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden použije uložené prihlasovacie URI na určenie ikony alebo adresy URL na zmenu hesla, ktoré by sa mali použiť na zlepšenie vášho zážitku. Pri používaní tejto služby sa nezbierajú ani neukladajú žiadne informácie."
+  },
   "assignToCollections": {
     "message": "Priradiť ku zbierkam"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Potvrdiť"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Povoliť skratku automatického písania"
+  "enableAutotypeShortcutPreview": {
+    "message": "Povoliť skratku pre automatické vpisovanie (náhľad funkcie)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "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"
+  },
+  "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": {
+    "message": "Položka bola archivovaná"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Položka bola odobraná z archívu"
+  },
+  "archiveItem": {
+    "message": "Archivovať položku"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/sl/messages.json b/apps/desktop/src/locales/sl/messages.json
index 529b52f5bae..dc1585c2431 100644
--- a/apps/desktop/src/locales/sl/messages.json
+++ b/apps/desktop/src/locales/sl/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Koda za obnovitev"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Samodejno počisti kopirane vrednosti iz odložišča.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Pomanjšaj v orodno vrstico"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/sr/messages.json b/apps/desktop/src/locales/sr/messages.json
index d6fbeb37981..8e68918ff5b 100644
--- a/apps/desktop/src/locales/sr/messages.json
+++ b/apps/desktop/src/locales/sr/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Убаците свој сигурносни кључ у УСБ порт рачунара, и ако има дугме , додирните га."
   },
-  "recoveryCodeDesc": {
-    "message": "Изгубили сте приступ свим својим двофакторским добављачима? Употребите код за опоравак да онемогућите све двофакторске добављаче из налога."
-  },
   "recoveryCodeTitle": {
     "message": "Шифра за опоравак"
   },
@@ -1225,6 +1222,15 @@
   "invalidMasterPassword": {
     "message": "Погрешна главна лозинка"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неисправна главна лозинка. Потврдите да је адреса ваше е-поште исправна и да је ваш налог направљен на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Пријава у два корака чини ваш налог сигурнијим захтевом да верификујете своје податке помоћу другог уређаја, као што су безбедносни кључ, апликација, СМС-а, телефонски позив или имејл. Пријављивање у два корака може се омогућити на веб сефу. Да ли желите да посетите веб страницу сада?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Аутоматски обришите копиране вредности из привремене меморије.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Прикажи иконе веб локација и преузмите линкове промене лозинке"
   },
   "enableMinToTray": {
     "message": "Минимизирај као иконицу у системској траци"
@@ -2660,6 +2663,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": "Закључано"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Променити ризичну лозинку"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Ова пријава је ризична и недостаје веб локација. Додајте веб страницу и промените лозинку за јачу сигурност."
+  },
+  "missingWebsite": {
+    "message": "Недостаје веб страница"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Не можете уклонити колекције са дозволама само за приказ: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "О овом подешавању"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden ће користити сачуване URI-јеве за пријаву да би одредио коју икону или URL за промену лозинке треба користити како би побољшао ваше искуство. Никакви подаци нису сакупљени нити сачувани приликом коришћења ове услуге."
+  },
   "assignToCollections": {
     "message": "Додели колекцијама"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "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."
+    "message": "Будите сигурни да сте у исправном пољу пре употребе пречице да бисте избегли попуњавање података на погрешно место."
   },
   "editShortcut": {
-    "message": "Edit shortcut"
+    "message": "Уреди пречицу"
+  },
+  "archiveNoun": {
+    "message": "Архива",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архивирај",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Врати из архиве"
+  },
+  "itemsInArchive": {
+    "message": "Ставке у архиви"
+  },
+  "noItemsInArchive": {
+    "message": "Нема ставка у архиви"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Архивиране ставке ће се овде појавити и бити искључени из општих резултата претраге и сугестија о ауто-пуњењу."
+  },
+  "itemSentToArchive": {
+    "message": "Ставка је послата у архиву"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Ставка је уклоњена из архиве"
+  },
+  "archiveItem": {
+    "message": "Архивирај ставку"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Архивиране ставке су искључене из општих резултата претраге и предлога за ауто попуњавање. Јесте ли сигурни да желите да архивирате ову ставку?"
   }
 }
diff --git a/apps/desktop/src/locales/sv/messages.json b/apps/desktop/src/locales/sv/messages.json
index b8ad3f49d35..45caa056055 100644
--- a/apps/desktop/src/locales/sv/messages.json
+++ b/apps/desktop/src/locales/sv/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Anslut din säkerhetsnyckel till datorns USB-port. Om den har en knapp, tryck på den."
   },
-  "recoveryCodeDesc": {
-    "message": "Förlorat åtkomst till alla dina metoder för tvåstegsverifiering? Använd din återställningskod för att inaktivera tvåstegsverifiering på ditt konto."
-  },
   "recoveryCodeTitle": {
     "message": "Återställningskod"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Rensa automatiskt kopierade värden från urklipp.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Visa webbplatsikoner"
-  },
-  "faviconDesc": {
-    "message": "Visa en igenkännbar bild bredvid varje inloggning."
+  "showIconsChangePasswordUrls": {
+    "message": "Visa webbplatsikoner och URLer för lösenordsändringar"
   },
   "enableMinToTray": {
     "message": "Minimera till systemfältsikon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Ändra lösenord för riskgrupper"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Denna inloggning är utsatt för risk och saknar en webbplats. Lägg till en webbplats och ändra lösenordet för ökad säkerhet."
+  },
+  "missingWebsite": {
+    "message": "Saknar webbplats"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Du kan inte ta bort samlingar med behörigheten Visa endast: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "Om denna inställning"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden använder sparade inloggnings-URI: er för att identifiera vilken ikon eller URL för lösenordsändring som ska användas för att förbättra din upplevelse. Ingen information samlas in eller sparas när du använder denna tjänst."
+  },
   "assignToCollections": {
     "message": "Tilldela till samlingar"
   },
@@ -4074,12 +4107,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": "Type shortcut"
+  },
+  "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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Bekräfta"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Aktivera genväg för automatisk inmatning"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Arkiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arkivera",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Packa upp"
+  },
+  "itemsInArchive": {
+    "message": "Objekt i arkivet"
+  },
+  "noItemsInArchive": {
+    "message": "Inga objekt i arkivet"
+  },
+  "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"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Objekt borttaget från arkiv"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/ta/messages.json b/apps/desktop/src/locales/ta/messages.json
index 19cf1ddb5cb..1fb449c891f 100644
--- a/apps/desktop/src/locales/ta/messages.json
+++ b/apps/desktop/src/locales/ta/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "உங்கள் கணினியின் USB போர்ட்டில் உங்கள் பாதுகாப்பு விசையைச் செருகவும். அதற்கு ஒரு பொத்தான் இருந்தால், அதைத் தொடவும்."
   },
-  "recoveryCodeDesc": {
-    "message": "உங்கள் இரண்டு-காரணி வழங்குநர்கள் அனைத்திற்கான அணுகலை இழந்தீர்களா? உங்கள் கணக்கில் உள்ள அனைத்து இரண்டு-காரணி வழங்குநர்களையும் முடக்க உங்கள் மீட்புக் குறியீட்டைப் பயன்படுத்தவும்."
-  },
   "recoveryCodeTitle": {
     "message": "மீட்புக் குறியீடு"
   },
@@ -1225,6 +1222,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 இணைய பெட்டகத்தில் இரண்டு-படி உள்நுழைவை அமைக்கலாம். இப்போது இணையதளத்திற்குச் செல்ல விரும்புகிறீர்களா?"
   },
@@ -1305,11 +1311,8 @@
     "message": "உங்கள் கிளிப்போர்டில் இருந்து நகலெடுக்கப்பட்ட மதிப்புகளை தானாக அழிக்கவும்.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "வலைத்தள ஐகான்களைக் காட்டு"
-  },
-  "faviconDesc": {
-    "message": "ஒவ்வொரு உள்நுழைவுக்கும் அருகில் அடையாளம் காணக்கூடிய படத்தைக் காட்டு."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "ட்ராய் ஐகானுக்கு சுருக்கவும்"
@@ -2660,6 +2663,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": "பூட்டப்பட்டது"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "ஆபத்தில் உள்ள கடவுச்சொல்லை மாற்று"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "காட்சி மட்டும் அனுமதிகளுடன் உள்ள தொகுப்புகளை உங்களால் அகற்ற முடியாது: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "தொகுப்புகளுக்கு ஒதுக்கு"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "உறுதிப்படுத்து"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "தானியங்கு வகை குறுக்குவழியை இயக்கு"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "message": "தவறான இடத்தில் தரவை நிரப்புவதைத் தவிர்க்க, குறுக்குவழியைப் பயன்படுத்துவதற்கு முன்பு நீங்கள் சரியான புலத்தில் இருப்பதை உறுதிப்படுத்திக் கொள்ளுங்கள்."
   },
   "editShortcut": {
     "message": "குறுக்குவழியைத் திருத்து"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/te/messages.json b/apps/desktop/src/locales/te/messages.json
index a0df0343dbc..9afc8066572 100644
--- a/apps/desktop/src/locales/te/messages.json
+++ b/apps/desktop/src/locales/te/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers on your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to tray icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/th/messages.json b/apps/desktop/src/locales/th/messages.json
index eabbd7b007c..1a66578c55c 100644
--- a/apps/desktop/src/locales/th/messages.json
+++ b/apps/desktop/src/locales/th/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "เสียบคีย์ความปลอดภัยเข้ากับพอร์ต USB ของคอมพิวเตอร์ หากมีปุ่ม ให้แตะปุ่มนั้น"
   },
-  "recoveryCodeDesc": {
-    "message": "สูญเสียการเข้าถึงผู้ให้บริการแบบสองปัจจัยทั้งหมดของคุณหรือไม่ ใช้รหัสกู้คืนของคุณเพื่อปิดผู้ให้บริการแบบสองปัจจัยทั้งหมดในบัญชีของคุณ"
-  },
   "recoveryCodeTitle": {
     "message": "รหัสกู้คืน"
   },
@@ -1225,6 +1222,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 คุณต้องการเยี่ยมชมเว็บไซต์เดี๋ยวนี้หรือไม่"
   },
@@ -1305,11 +1311,8 @@
     "message": "ล้างค่าที่คัดลอกโดยอัตโนมัติจากคลิปบอร์ดของคุณ",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Minimize to Tray Icon"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/tr/messages.json b/apps/desktop/src/locales/tr/messages.json
index 761e552930d..542e5b07ace 100644
--- a/apps/desktop/src/locales/tr/messages.json
+++ b/apps/desktop/src/locales/tr/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Güvenlik anahtarınızı bilgisayarınızın USB portuna takın. Bir düğmesi varsa dokunun."
   },
-  "recoveryCodeDesc": {
-    "message": "İki aşamalı doğrulama sağlayıcılarınıza ulaşamıyor musunuz? Kurtarma kodunuzu kullanarak hesabınızdaki tüm iki aşamalı giriş sağlayıcılarını devre dışı bırakabilirsiniz."
-  },
   "recoveryCodeTitle": {
     "message": "Kurtarma kodu"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Kopyalanan değerleri otomatik olarak panodan sil.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Web sitesi simgelerini göster"
-  },
-  "faviconDesc": {
-    "message": "Hesapların yanında tanıdık görseller göster."
+  "showIconsChangePasswordUrls": {
+    "message": "Web sitesi simgelerini göster ve parola değiştirme URL'lerini al"
   },
   "enableMinToTray": {
     "message": "Tepsi simgesine küçült"
@@ -2660,6 +2663,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"
   },
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Risk altındaki parolayı değiştirin"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Bu hesap risk altında ve web sitesi eksik. Bir web sitesi ekleyin ve güvenliğinizi artırmak için parolayı değiştirin."
+  },
+  "missingWebsite": {
+    "message": "Web sitesi eksik"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Yalnızca Görüntüleme izinlerine sahip koleksiyonları kaldıramazsınız: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "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."
+  },
   "assignToCollections": {
     "message": "Koleksiyonlara ata"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Onayla"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Otomatik yazma kısayolunu etkinleştir"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Arşiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arşivle",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Arşivden çıkar"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/uk/messages.json b/apps/desktop/src/locales/uk/messages.json
index 2119189594d..3a38ad2666e 100644
--- a/apps/desktop/src/locales/uk/messages.json
+++ b/apps/desktop/src/locales/uk/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Вставте свій ключ безпеки в USB порт комп'ютера. Якщо в нього є кнопка, натисніть її."
   },
-  "recoveryCodeDesc": {
-    "message": "Втратили доступ до всіх провайдерів двоетапної перевірки? Скористайтеся кодом відновлення, щоб вимкнути двоетапну перевірку для свого облікового запису."
-  },
   "recoveryCodeTitle": {
     "message": "Код відновлення"
   },
@@ -1225,6 +1222,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. Хочете перейти на вебсайт зараз?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Автоматично очищати скопійовані значення з буфера обміну.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "Згортати до системного лотка"
@@ -2660,6 +2663,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": "Заблоковано"
   },
@@ -2757,7 +2778,7 @@
     "message": "Адреса е-пошти Catch-all"
   },
   "catchallEmailDesc": {
-    "message": "Використовуйте свою скриньку вхідних Catch-All власного домену."
+    "message": "Використовуйте можливості Catch-All власного домену."
   },
   "useThisEmail": {
     "message": "Використати цю е-пошту"
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Змінити ризикований пароль"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Ви не можете вилучати збірки, маючи дозвіл лише на перегляд: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Призначити до збірок"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/locales/vi/messages.json b/apps/desktop/src/locales/vi/messages.json
index 2bdf42df372..c044d36b47f 100644
--- a/apps/desktop/src/locales/vi/messages.json
+++ b/apps/desktop/src/locales/vi/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "Cắm khóa bảo mật vào cổng USB của máy tính. Nếu có nút bấm, hãy nhấn vào nó."
   },
-  "recoveryCodeDesc": {
-    "message": "Bạn đã mất quyền truy cập vào tất cả các dịch vụ xác thực 2 lớp? Sử dụng mã khôi phục để tắt tất cả các phương pháp xác thực hai lớp trong tài khoản của bạn."
-  },
   "recoveryCodeTitle": {
     "message": "Mã khôi phục"
   },
@@ -1225,6 +1222,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?"
   },
@@ -1305,11 +1311,8 @@
     "message": "Tự động xóa mọi thứ đã sao chép khỏi bảng nhớ tạm.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Hiển thị biểu tượng trang web và truy xuất các URL đổi mật khẩu"
   },
   "enableMinToTray": {
     "message": "Thu nhỏ vào khay hệ thống"
@@ -2660,6 +2663,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"
   },
@@ -3592,10 +3613,10 @@
     "message": "Vui lòng tiếp tục đăng nhập bằng thông tin đăng nhập của công ty bạn."
   },
   "importDirectlyFromBrowser": {
-    "message": "Import directly from browser"
+    "message": "Nhập trực tiếp từ trình duyệt"
   },
   "browserProfile": {
-    "message": "Browser Profile"
+    "message": "Hồ sơ trình duyệt"
   },
   "seeDetailedInstructions": {
     "message": "Xem hướng dẫn chi tiết trên trang trợ giúp của chúng tôi tại",
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Thay đổi mật khẩu có rủi ro"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Thông tin đăng nhập này có rủi ro và thiếu một trang web. Hãy thêm trang web và đổi mật khẩu để tăng cường bảo mật."
+  },
+  "missingWebsite": {
+    "message": "Thiếu trang web"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "Bạn không thể xóa các bộ sưu tập với quyền chỉ xem: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "Về cài đặt này"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden sẽ sử dụng URI đăng nhập đã lưu để xác định biểu tượng hoặc URL đổi mật khẩu nào cần dùng nhằm cải thiện trải nghiệm của bạn. Không có thông tin nào được thu thập hay lưu lại khi bạn sử dụng dịch vụ này."
+  },
   "assignToCollections": {
     "message": "Gán vào bộ sưu tập"
   },
@@ -4074,32 +4107,70 @@
   "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."
   },
   "next": {
-    "message": "Next"
+    "message": "Tiếp theo"
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Xác nhận tên miền Key Connector"
   },
   "confirm": {
-    "message": "Confirm"
+    "message": "Xác nhận"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Bật phím tắt tự động nhập (Xem trước tính năng)"
   },
   "enableAutotypeDescriptionTransitionKey": {
-    "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
+    "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."
   },
   "editShortcut": {
-    "message": "Edit shortcut"
+    "message": "Chỉnh sửa phím tắt"
+  },
+  "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ữ"
+  },
+  "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ữ"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Mục đã được gỡ khỏi kho 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?"
   }
 }
diff --git a/apps/desktop/src/locales/zh_CN/messages.json b/apps/desktop/src/locales/zh_CN/messages.json
index 3849979360a..974e3d39101 100644
--- a/apps/desktop/src/locales/zh_CN/messages.json
+++ b/apps/desktop/src/locales/zh_CN/messages.json
@@ -576,7 +576,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": {
@@ -897,7 +897,7 @@
     "message": "您已登录！"
   },
   "masterPassSent": {
-    "message": "我们已经为您发送了包含主密码提示的电子邮件。"
+    "message": "我们已经向您发送了一封包含主密码提示的电子邮件。"
   },
   "unexpectedError": {
     "message": "发生意外错误。"
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "将您的安全密钥插入计算机的 USB 端口。如果它有按钮，请触摸它。"
   },
-  "recoveryCodeDesc": {
-    "message": "无法访问您所有的双重身份提供程序吗？请使用您的恢复代码来停用您账户中所有的双重身份提供程序。"
-  },
   "recoveryCodeTitle": {
     "message": "恢复代码"
   },
@@ -1225,6 +1222,15 @@
   "invalidMasterPassword": {
     "message": "无效的主密码"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "无效的主密码。请确认您的电子邮箱正确无误，以及您的账户是在 $HOST$ 上创建的。",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "两步登录要求您从其他设备（例如安全密钥、验证器 App、短信、电话或者电子邮件）来验证您的登录，这能使您的账户更加安全。两步登录需要在 bitwarden.com 网页版密码库中设置。现在访问此网站吗？"
   },
@@ -1305,11 +1311,8 @@
     "message": "自动清除复制到剪贴板的值。",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "显示网站图标"
-  },
-  "faviconDesc": {
-    "message": "在每个登录项目旁边显示一个可识别的图像。"
+  "showIconsChangePasswordUrls": {
+    "message": "显示网站图标并获取更改密码的 URL"
   },
   "enableMinToTray": {
     "message": "最小化到托盘图标"
@@ -1369,7 +1372,7 @@
     "message": "确认隐藏到托盘"
   },
   "confirmTrayDesc": {
-    "message": "关闭此设置也将关闭其他与托盘相关的设置。"
+    "message": "停用此设置也将停用其他与托盘相关的设置。"
   },
   "language": {
     "message": "语言"
@@ -2660,6 +2663,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": "已锁定"
   },
@@ -2946,10 +2967,10 @@
     "message": "需要高级版订阅"
   },
   "organizationIsDisabled": {
-    "message": "组织已停用"
+    "message": "组织已暂停"
   },
   "disabledOrganizationFilterError": {
-    "message": "无法访问已停用组织中的项目。请联系您的组织所有者寻求帮助。"
+    "message": "无法访问已暂停组织中的项目。请联系您的组织所有者寻求帮助。"
   },
   "neverLockWarning": {
     "message": "确定要使用「从不」选项吗？将锁定选项设置为「从不」会将密码库的加密密钥存储在您的设备上。如果使用此选项，您必须确保您的设备安全。"
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "更改有风险的密码"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "此登录存在风险且缺少网站。请添加网站并更改密码以增强安全性。"
+  },
+  "missingWebsite": {
+    "message": "缺少网站"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "您无法移除仅具有「查看」权限的集合：$COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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": "关于此设置"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden 将使用已保存的登录 URI 来识别应使用哪个图标或更改密码的 URL 来改善您的体验。当您使用此服务时，不会收集或保存任何信息。"
+  },
   "assignToCollections": {
     "message": "分配到集合"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "确认"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "启用自动输入快捷键"
+  "enableAutotypeShortcutPreview": {
+    "message": "启用自动输入快捷键（功能预览）"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "message": "在使用快捷键之前，请确保您位于正确的字段中，以避免将数据填入错误的地方。"
   },
   "editShortcut": {
     "message": "编辑快捷键"
+  },
+  "archiveNoun": {
+    "message": "归档",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "归档",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "取消归档"
+  },
+  "itemsInArchive": {
+    "message": "归档中的项目"
+  },
+  "noItemsInArchive": {
+    "message": "归档中没有项目"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "已归档的项目将显示在此处，并将被排除在一般搜索结果和自动填充建议之外。"
+  },
+  "itemSentToArchive": {
+    "message": "项目已归档"
+  },
+  "itemRemovedFromArchive": {
+    "message": "项目已取消归档"
+  },
+  "archiveItem": {
+    "message": "归档项目"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "已归档的项目将被排除在一般搜索结果和自动填充建议之外。确定要归档此项目吗？"
   }
 }
diff --git a/apps/desktop/src/locales/zh_TW/messages.json b/apps/desktop/src/locales/zh_TW/messages.json
index b2a4ad91fce..60bf5cae265 100644
--- a/apps/desktop/src/locales/zh_TW/messages.json
+++ b/apps/desktop/src/locales/zh_TW/messages.json
@@ -960,9 +960,6 @@
   "insertU2f": {
     "message": "將您的安全鑰匙插入電腦的 USB 連接埠，然後觸摸其按鈕（如有的話）。"
   },
-  "recoveryCodeDesc": {
-    "message": "無法使用任何雙因素提供程式嗎？請使用您的復原碼以停用您帳戶的所有雙因素提供程式。"
-  },
   "recoveryCodeTitle": {
     "message": "復原代碼"
   },
@@ -1024,16 +1021,16 @@
     "message": "選取兩步驟登入方式"
   },
   "selfHostedEnvironment": {
-    "message": "自我裝載環境"
+    "message": "自行部署環境"
   },
   "selfHostedBaseUrlHint": {
-    "message": "指定您自建的 Bitwarden 伺服器的網域 URL。例如：https://bitwarden.company.com"
+    "message": "指定您自架的 Bitwarden 伺服器的網域 URL。例如：https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
     "message": "適用於進階設定。您可以單獨指定各個服務的網域 URL。"
   },
   "selfHostedEnvFormInvalid": {
-    "message": "您必須新增伺服器網域 URL 或至少一個自定義環境。"
+    "message": "您必須新增伺服器網域 URL 或至少一個自訂環境。"
   },
   "customEnvironment": {
     "message": "自訂環境"
@@ -1048,7 +1045,7 @@
     "message": "驗證工作階段因時間過久已逾時。請重試登入。"
   },
   "selfHostBaseUrl": {
-    "message": "自建伺服器 URL",
+    "message": "自架伺服器 URL",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
@@ -1225,6 +1222,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 網頁版密碼庫啟用。現在要前往嗎？"
   },
@@ -1305,11 +1311,8 @@
     "message": "自動清除剪貼簿中複製的值。",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "enableMinToTray": {
     "message": "最小化至系統匣圖示"
@@ -2660,6 +2663,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": "已鎖定"
   },
@@ -3081,7 +3102,7 @@
     "message": "Login request"
   },
   "deviceType": {
-    "message": "裝置類別"
+    "message": "裝置類型"
   },
   "ipAddress": {
     "message": "IP 位址"
@@ -3839,6 +3860,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
     "placeholders": {
@@ -3934,6 +3961,12 @@
     "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"
+  },
+  "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."
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -4074,12 +4107,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."
@@ -4093,13 +4132,45 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
   "enableAutotypeDescriptionTransitionKey": {
     "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"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "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?"
   }
 }
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index c027b867d8f..706ad67aa2a 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.0",
+  "version": "2025.9.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.9.0",
+      "version": "2025.9.1",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-napi": "file:../desktop_native/napi"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index 2ea98725682..7d8d0cc18a2 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.0",
+  "version": "2025.9.1",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
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 23fb29e932a..de63c6b28aa 100644
--- a/apps/desktop/src/platform/services/electron-platform-utils.service.ts
+++ b/apps/desktop/src/platform/services/electron-platform-utils.service.ts
@@ -55,6 +55,10 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
     return false;
   }
 
+  isChromium(): boolean {
+    return true;
+  }
+
   isMacAppStore(): boolean {
     return ipc.platform.isMacAppStore;
   }
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/scss/box.scss b/apps/desktop/src/scss/box.scss
index 8c15aa91c62..c3f7e373820 100644
--- a/apps/desktop/src/scss/box.scss
+++ b/apps/desktop/src/scss/box.scss
@@ -429,21 +429,6 @@
     width: calc(100% - 25px);
   }
 
-  .row-sub-icon {
-    @include themify($themes) {
-      color: themed("disabledIconColor");
-    }
-  }
-
-  .row-sub-label {
-    margin: 0 15px;
-    white-space: nowrap;
-
-    @include themify($themes) {
-      color: themed("mutedColor");
-    }
-  }
-
   .progress {
     display: flex;
     height: 5px;
diff --git a/apps/desktop/src/scss/misc.scss b/apps/desktop/src/scss/misc.scss
index 3c3d4ff508c..c70eb823213 100644
--- a/apps/desktop/src/scss/misc.scss
+++ b/apps/desktop/src/scss/misc.scss
@@ -360,6 +360,18 @@ form,
   }
 }
 
+.help-block a.settings-link {
+  text-decoration: none;
+  @include themify($themes) {
+    color: themed("primaryColor");
+
+    &:hover,
+    &:focus {
+      color: darken(themed("primaryColor"), 6%);
+    }
+  }
+}
+
 app-root > #loading,
 .loading {
   display: flex;
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 c41bf254c80..162335d03bb 100644
--- a/apps/desktop/src/vault/app/vault/item-footer.component.html
+++ b/apps/desktop/src/vault/app/vault/item-footer.component.html
@@ -4,16 +4,12 @@
       #submitBtn
       form="cipherForm"
       type="submit"
-      *ngIf="action !== 'view'"
+      [hidden]="action === 'view'"
+      bitButton
       class="primary"
       appA11yTitle="{{ 'save' | i18n }}"
     >
-      <span [hidden]="isSubmitting">{{ "save" | i18n }}</span>
-      <i
-        class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-        [hidden]="!isSubmitting"
-        aria-hidden="true"
-      ></i>
+      {{ "save" | i18n }}
     </button>
     <button
       type="button"
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 18dcec1ac3d..fef58d80a39 100644
--- a/apps/desktop/src/vault/app/vault/item-footer.component.ts
+++ b/apps/desktop/src/vault/app/vault/item-footer.component.ts
@@ -24,7 +24,6 @@ export class ItemFooterComponent implements OnInit {
   @Input({ required: true }) cipher: CipherView = new CipherView();
   @Input() collectionId: string | null = null;
   @Input({ required: true }) action: string = "view";
-  @Input() isSubmitting: boolean = false;
   @Input() masterPasswordAlreadyPrompted: boolean = false;
   @Output() onEdit = new EventEmitter<CipherView>();
   @Output() onClone = new EventEmitter<CipherView>();
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-v2.component.html b/apps/desktop/src/vault/app/vault/vault-v2.component.html
index 4a66abaf909..a3f55f0ec63 100644
--- a/apps/desktop/src/vault/app/vault/vault-v2.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-v2.component.html
@@ -19,7 +19,6 @@
       (onClone)="cloneCipher($event)"
       (onDelete)="deleteCipher()"
       (onCancel)="cancelCipher($event)"
-      [isSubmitting]="isSubmitting"
       [masterPasswordAlreadyPrompted]="cipherRepromptId === cipherId"
     ></app-vault-item-footer>
     <div class="content">
@@ -33,7 +32,6 @@
             formId="cipherForm"
             [config]="config"
             (cipherSaved)="savedCipher($event)"
-            [beforeSubmit]="onSubmit"
             [submitBtn]="footer?.submitBtn"
             (formStatusChange$)="formStatusChanged($event)"
           >
@@ -44,17 +42,10 @@
                 (click)="openAttachmentsDialog()"
                 [disabled]="formDisabled"
               >
-                <p class="tw-m-0">
+                <div class="tw-flex tw-items-center tw-gap-2">
                   {{ "attachments" | i18n }}
-                  <span
-                    *ngIf="!(canAccessAttachments$ | async)"
-                    bitBadge
-                    variant="success"
-                    class="tw-ml-2"
-                  >
-                    {{ "premium" | i18n }}
-                  </span>
-                </p>
+                  <app-premium-badge></app-premium-badge>
+                </div>
                 <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
               </button>
             </bit-item>
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 256276cad81..3fdb14aa154 100644
--- a/apps/desktop/src/vault/app/vault/vault-v2.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
@@ -13,6 +13,7 @@ import { firstValueFrom, Subject, takeUntil, switchMap, lastValueFrom, Observabl
 import { filter, map, take } from "rxjs/operators";
 
 import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { VaultViewPasswordHistoryService } from "@bitwarden/angular/services/view-password-history.service";
 import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { AuthRequestServiceAbstraction } from "@bitwarden/auth/common";
@@ -24,7 +25,6 @@ import { Account, AccountService } from "@bitwarden/common/auth/abstractions/acc
 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";
@@ -101,6 +101,7 @@ const BroadcasterSubscriptionId = "VaultComponent";
     I18nPipe,
     ItemModule,
     ButtonModule,
+    PremiumBadgeComponent,
     NavComponent,
     VaultFilterModule,
     VaultItemsV2Component,
@@ -161,7 +162,6 @@ export class VaultV2Component<C extends CipherViewLike>
   cipher: CipherView | null = new CipherView();
   collections: CollectionView[] | null = null;
   config: CipherFormConfig | null = null;
-  isSubmitting = false;
 
   /** Tracks the disabled status of the edit cipher form */
   protected formDisabled: boolean = false;
@@ -318,26 +318,13 @@ 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(
@@ -456,7 +443,6 @@ export class VaultV2Component<C extends CipherViewLike>
 
   async openAttachmentsDialog() {
     if (!this.userHasPremiumAccess) {
-      await this.premiumUpgradePromptService.promptForPremium();
       return;
     }
     const dialogRef = AttachmentsV2Component.open(this.dialogService, {
@@ -741,7 +727,6 @@ export class VaultV2Component<C extends CipherViewLike>
     await this.vaultItemsComponent?.load(this.activeFilter.buildFilter()).catch(() => {});
     await this.go().catch(() => {});
     await this.vaultItemsComponent?.refresh().catch(() => {});
-    this.isSubmitting = false;
   }
 
   async deleteCipher() {
@@ -903,9 +888,7 @@ export class VaultV2Component<C extends CipherViewLike>
           title: undefined,
           message: this.i18nService.t("valueCopied", this.i18nService.t(labelI18nKey)),
         });
-        if (this.action === "view") {
-          this.messagingService.send("minimizeOnCopy");
-        }
+        this.messagingService.send("minimizeOnCopy");
       })().catch(() => {});
     });
   }
@@ -917,11 +900,6 @@ export class VaultV2Component<C extends CipherViewLike>
     });
   }
 
-  protected onSubmit = async () => {
-    this.isSubmitting = true;
-    return Promise.resolve(true);
-  };
-
   private prefillCipherFromFilter() {
     if (this.activeFilter.selectedCollectionId != null && this.vaultFilterComponent != null) {
       const collections = this.vaultFilterComponent.collections?.fullList.filter(
@@ -933,17 +911,22 @@ export class VaultV2Component<C extends CipherViewLike>
       }
     } else if (this.activeFilter.selectedOrganizationId) {
       this.addOrganizationId = this.activeFilter.selectedOrganizationId;
+    } else {
+      // clear out organizationId when the user switches to a personal vault filter
+      this.addOrganizationId = null;
     }
     if (this.activeFilter.selectedFolderId && this.activeFilter.selectedFolder) {
       this.folderId = this.activeFilter.selectedFolderId;
     }
 
-    if (this.addOrganizationId && this.config) {
-      this.config.initialValues = {
-        ...this.config.initialValues,
-        organizationId: this.addOrganizationId as OrganizationId,
-      };
+    if (this.config == null) {
+      return;
     }
+
+    this.config.initialValues = {
+      ...this.config.initialValues,
+      organizationId: this.addOrganizationId as OrganizationId,
+    };
   }
 
   private async canNavigateAway(action: string, cipher?: CipherView) {
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/package.json b/apps/web/package.json
index 551eb1c5e86..517b8aa8004 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/web-vault",
-  "version": "2025.9.0",
+  "version": "2025.9.1",
   "scripts": {
     "build:oss": "webpack",
     "build:bit": "webpack -c ../../bitwarden_license/bit-web/webpack.config.js",
@@ -18,6 +18,7 @@
     "build:bit:selfhost:watch": "cross-env ENV=selfhosted npm run build:bit:watch",
     "build:oss:selfhost:prod": "cross-env ENV=selfhosted NODE_ENV=production npm run build:oss",
     "build:bit:selfhost:prod": "cross-env ENV=selfhosted NODE_ENV=production npm run build:bit",
+    "build:bit:selfhost:dev": "cross-env ENV=selfhosted NODE_ENV=production npm run build:bit",
     "build:bit:ee": "cross-env NODE_ENV=production ENV=ee npm run build:bit",
     "clean:l10n": "git push origin --delete l10n_master",
     "dist:bit:cloud": "npm run build:bit:cloud",
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 6fc0a70a8c8..21c52949254 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
@@ -208,7 +208,7 @@ export abstract class BaseMembersComponent<UserView extends UserViewTypes> {
         const dialogRef = UserConfirmComponent.open(this.dialogService, {
           data: {
             name: this.userNamePipe.transform(user),
-            userId: user.id,
+            userId: user.userId,
             publicKey: publicKey,
             confirmUser: () => confirmUser(publicKey),
           },
diff --git a/apps/web/src/app/admin-console/core/policy-list.service.ts b/apps/web/src/app/admin-console/core/policy-list.service.ts
deleted file mode 100644
index bb207006906..00000000000
--- a/apps/web/src/app/admin-console/core/policy-list.service.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { BasePolicy } from "../organizations/policies";
-
-export class PolicyListService {
-  private policies: BasePolicy[] = [];
-
-  addPolicies(policies: BasePolicy[]) {
-    this.policies.push(...policies);
-  }
-
-  getPolicies(): BasePolicy[] {
-    return this.policies;
-  }
-}
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 1122f10e8f7..00000000000
--- a/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<app-organization-free-trial-warning
-  *ngIf="useOrganizationWarningsService$ | async"
-  [organization]="organization"
-  (clicked)="navigateToPaymentMethod()"
->
-</app-organization-free-trial-warning>
-<app-organization-reseller-renewal-warning
-  *ngIf="useOrganizationWarningsService$ | async"
-  [organization]="organization"
->
-</app-organization-reseller-renewal-warning>
-<ng-container *ngIf="freeTrialWhenWarningsServiceDisabled$ | async as freeTrial">
-  <bit-banner
-    id="free-trial-banner"
-    class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
-    icon="bwi-billing"
-    bannerType="premium"
-    [showClose]="false"
-    *ngIf="!refreshing && freeTrial.shownBanner"
-  >
-    {{ freeTrial.message }}
-    <a
-      bitLink
-      linkType="secondary"
-      (click)="navigateToPaymentMethod()"
-      class="tw-cursor-pointer"
-      rel="noreferrer noopener"
-    >
-      {{ "clickHereToAddPaymentMethod" | i18n }}
-    </a>
-  </bit-banner>
-</ng-container>
-<ng-container *ngIf="resellerWarningWhenWarningsServiceDisabled$ | async as resellerWarning">
-  <bit-banner
-    id="reseller-warning-banner"
-    class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
-    icon="bwi-billing"
-    bannerType="info"
-    [showClose]="false"
-    *ngIf="!refreshing"
-  >
-    {{ resellerWarning?.message }}
-  </bit-banner>
-</ng-container>
-
-<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 42900a0b941..00000000000
--- a/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.ts
+++ /dev/null
@@ -1,1491 +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,
-  from,
-  lastValueFrom,
-  Observable,
-  of,
-  Subject,
-} from "rxjs";
-import {
-  catchError,
-  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 { Search } from "@bitwarden/assets/svg";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-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 { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";
-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 { BillingNotificationService } from "../../../billing/services/billing-notification.service";
-import {
-  ResellerWarning,
-  ResellerWarningService,
-} from "../../../billing/services/reseller-warning.service";
-import { TrialFlowService } from "../../../billing/services/trial-flow.service";
-import { FreeTrial } from "../../../billing/types/free-trial";
-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 = Search;
-  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;
-  private hasSubscription$ = new BehaviorSubject<boolean>(false);
-  protected currentSearchText$: Observable<string>;
-  protected useOrganizationWarningsService$: Observable<boolean>;
-  protected freeTrialWhenWarningsServiceDisabled$: Observable<FreeTrial>;
-  protected resellerWarningWhenWarningsServiceDisabled$: Observable<ResellerWarning | null>;
-  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>;
-
-  private readonly unpaidSubscriptionDialog$ = this.accountService.activeAccount$.pipe(
-    map((account) => account?.id),
-    switchMap((id) =>
-      this.organizationService.organizations$(id).pipe(
-        filter((organizations) => organizations.length === 1),
-        map(([organization]) => organization),
-        switchMap((organization) =>
-          from(this.billingApiService.getOrganizationBillingMetadata(organization.id)).pipe(
-            tap((organizationMetaData) => {
-              this.hasSubscription$.next(organizationMetaData.hasSubscription);
-            }),
-            switchMap((organizationMetaData) =>
-              from(
-                this.trialFlowService.handleUnpaidSubscriptionDialog(
-                  organization,
-                  organizationMetaData,
-                ),
-              ),
-            ),
-          ),
-        ),
-      ),
-    ),
-  );
-
-  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,
-    private organizationApiService: OrganizationApiServiceAbstraction,
-    private trialFlowService: TrialFlowService,
-    protected billingApiService: BillingApiServiceAbstraction,
-    private organizationBillingService: OrganizationBillingServiceAbstraction,
-    private resellerWarningService: ResellerWarningService,
-    private accountService: AccountService,
-    private billingNotificationService: BillingNotificationService,
-    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
-    this.useOrganizationWarningsService$ = this.configService.getFeatureFlag$(
-      FeatureFlag.UseOrganizationWarningsService,
-    );
-
-    this.useOrganizationWarningsService$
-      .pipe(
-        switchMap((enabled) =>
-          enabled
-            ? this.organizationWarningsService.showInactiveSubscriptionDialog$(this.organization)
-            : this.unpaidSubscriptionDialog$,
-        ),
-        takeUntil(this.destroy$),
-      )
-      .subscribe();
-
-    organization$
-      .pipe(
-        switchMap((organization) =>
-          this.organizationWarningsService.showSubscribeBeforeFreeTrialEndsDialog$(organization),
-        ),
-        takeUntil(this.destroy$),
-      )
-      .subscribe();
-
-    const freeTrial$ = combineLatest([
-      organization$,
-      this.hasSubscription$.pipe(filter((hasSubscription) => hasSubscription !== null)),
-    ]).pipe(
-      filter(
-        ([org, hasSubscription]) => org.isOwner && hasSubscription && org.canViewBillingHistory,
-      ),
-      switchMap(([org]) =>
-        combineLatest([
-          of(org),
-          this.organizationApiService.getSubscription(org.id),
-          from(this.organizationBillingService.getPaymentSource(org.id)).pipe(
-            catchError((error: unknown) => {
-              this.billingNotificationService.handleError(error);
-              return of(null);
-            }),
-          ),
-        ]),
-      ),
-      map(([org, sub, paymentSource]) =>
-        this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(org, sub, paymentSource),
-      ),
-      filter((result) => result !== null),
-    );
-
-    this.freeTrialWhenWarningsServiceDisabled$ = this.useOrganizationWarningsService$.pipe(
-      filter((enabled) => !enabled),
-      switchMap(() => freeTrial$),
-    );
-
-    const resellerWarning$ = organization$.pipe(
-      filter((org) => org.isOwner),
-      switchMap((org) =>
-        from(this.billingApiService.getOrganizationBillingMetadata(org.id)).pipe(
-          map((metadata) => ({ org, metadata })),
-        ),
-      ),
-      map(({ org, metadata }) => this.resellerWarningService.getWarning(org, metadata)),
-    );
-
-    this.resellerWarningWhenWarningsServiceDisabled$ = this.useOrganizationWarningsService$.pipe(
-      filter((enabled) => !enabled),
-      switchMap(() => resellerWarning$),
-    );
-    // 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/vault-filter/vault-filter.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.component.ts
index bf0df14c8c6..3341a428970 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
@@ -7,9 +7,9 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 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/billing-api.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 { 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";
@@ -51,10 +51,10 @@ export class VaultFilterComponent
     protected toastService: ToastService,
     protected billingApiService: BillingApiServiceAbstraction,
     protected dialogService: DialogService,
-    protected configService: ConfigService,
     protected accountService: AccountService,
     protected restrictedItemTypesService: RestrictedItemTypesService,
     protected cipherService: CipherService,
+    protected cipherArchiveService: CipherArchiveService,
   ) {
     super(
       vaultFilterService,
@@ -64,10 +64,10 @@ export class VaultFilterComponent
       toastService,
       billingApiService,
       dialogService,
-      configService,
       accountService,
       restrictedItemTypesService,
       cipherService,
+      cipherArchiveService,
     );
   }
 
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.html b/apps/web/src/app/admin-console/organizations/collections/vault.component.html
index 44a01308bc8..5d05e703fd4 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault.component.html
+++ b/apps/web/src/app/admin-console/organizations/collections/vault.component.html
@@ -5,54 +5,16 @@
 @let loading = loading$ | async;
 
 @if (organization) {
-  @if (useOrganizationWarningsService$ | async) {
+  @if (!refreshing) {
     <app-organization-free-trial-warning
       [organization]="organization"
       (clicked)="navigateToPaymentMethod()"
     >
     </app-organization-free-trial-warning>
-  }
-
-  @if (useOrganizationWarningsService$ | async) {
     <app-organization-reseller-renewal-warning [organization]="organization">
     </app-organization-reseller-renewal-warning>
   }
 
-  @let freeTrial = freeTrialWhenWarningsServiceDisabled$ | async;
-  @if (!refreshing && freeTrial?.shownBanner) {
-    <bit-banner
-      id="free-trial-banner"
-      class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
-      icon="bwi-billing"
-      bannerType="premium"
-      [showClose]="false"
-    >
-      {{ freeTrial.message }}
-      <a
-        bitLink
-        linkType="secondary"
-        (click)="navigateToPaymentMethod()"
-        class="tw-cursor-pointer"
-        rel="noreferrer noopener"
-      >
-        {{ "clickHereToAddPaymentMethod" | i18n }}
-      </a>
-    </bit-banner>
-  }
-
-  @let resellerWarning = resellerWarningWhenWarningsServiceDisabled$ | async;
-  @if (!refreshing && resellerWarning) {
-    <bit-banner
-      id="reseller-warning-banner"
-      class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
-      icon="bwi-billing"
-      bannerType="info"
-      [showClose]="false"
-    >
-      {{ resellerWarning?.message }}
-    </bit-banner>
-  }
-
   @if (filter) {
     <app-org-vault-header
       [filter]="filter"
@@ -147,7 +109,7 @@
               filter &&
               filter.type !== "trash" &&
               filter.collectionId !== Unassigned &&
-              selectedCollection?.node?.canEditItems(organization)
+              (!selectedCollection || selectedCollection.node?.canEditItems(organization))
             ) {
               <button
                 slot="button"
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 3c389a05405..3aab02b3b49 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
@@ -5,8 +5,8 @@ import {
   BehaviorSubject,
   combineLatest,
   firstValueFrom,
-  from,
   lastValueFrom,
+  merge,
   Observable,
   of,
   Subject,
@@ -25,7 +25,6 @@ import {
   switchMap,
   take,
   takeUntil,
-  tap,
 } from "rxjs/operators";
 
 import {
@@ -36,20 +35,16 @@ import {
   Unassigned,
 } from "@bitwarden/admin-console/common";
 import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
-import { Search } from "@bitwarden/assets/svg";
+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 { 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 { 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 { 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";
@@ -66,6 +61,7 @@ import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-repromp
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import {
   CipherViewLike,
   CipherViewLikeUtils,
@@ -93,13 +89,6 @@ import {
 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 { BillingNotificationService } from "../../../billing/services/billing-notification.service";
-import {
-  ResellerWarning,
-  ResellerWarningService,
-} from "../../../billing/services/reseller-warning.service";
-import { TrialFlowService } from "../../../billing/services/trial-flow.service";
-import { FreeTrial } from "../../../billing/types/free-trial";
 import { SharedModule } from "../../../shared";
 import { AssignCollectionsWebComponent } from "../../../vault/components/assign-collections";
 import {
@@ -171,7 +160,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(
@@ -183,7 +172,7 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
   activeFilter: VaultFilter = new VaultFilter();
 
   protected showAddAccessToggle = false;
-  protected noItemIcon = Search;
+  protected noItemIcon = NoResults;
   protected loading$: Observable<boolean>;
   protected processingEvent$ = new BehaviorSubject<boolean>(false);
   protected organization$: Observable<Organization>;
@@ -193,10 +182,6 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
   protected showCollectionAccessRestricted$: Observable<boolean>;
 
   protected isEmpty$: Observable<boolean> = of(false);
-  private hasSubscription$ = new BehaviorSubject<boolean>(false);
-  protected useOrganizationWarningsService$: Observable<boolean>;
-  protected freeTrialWhenWarningsServiceDisabled$: Observable<FreeTrial>;
-  protected resellerWarningWhenWarningsServiceDisabled$: Observable<ResellerWarning | null>;
   protected prevCipherId: string | null = null;
   protected userId$: Observable<UserId>;
 
@@ -226,31 +211,6 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
     | VaultItemsComponent<CipherView>
     | undefined;
 
-  private readonly unpaidSubscriptionDialog$ = this.accountService.activeAccount$.pipe(
-    getUserId,
-    switchMap((id) =>
-      this.organizationService.organizations$(id).pipe(
-        filter((organizations) => organizations.length === 1),
-        map(([organization]) => organization),
-        switchMap((organization) =>
-          from(this.billingApiService.getOrganizationBillingMetadata(organization.id)).pipe(
-            tap((organizationMetaData) => {
-              this.hasSubscription$.next(organizationMetaData.hasSubscription);
-            }),
-            switchMap((organizationMetaData) =>
-              from(
-                this.trialFlowService.handleUnpaidSubscriptionDialog(
-                  organization,
-                  organizationMetaData,
-                ),
-              ),
-            ),
-          ),
-        ),
-      ),
-    ),
-  );
-
   constructor(
     private route: ActivatedRoute,
     private organizationService: OrganizationService,
@@ -277,17 +237,12 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
     private totpService: TotpService,
     private apiService: ApiService,
     private toastService: ToastService,
-    private configService: ConfigService,
     private cipherFormConfigService: CipherFormConfigService,
-    private organizationApiService: OrganizationApiServiceAbstraction,
-    private trialFlowService: TrialFlowService,
     protected billingApiService: BillingApiServiceAbstraction,
-    private organizationBillingService: OrganizationBillingServiceAbstraction,
-    private resellerWarningService: ResellerWarningService,
     private accountService: AccountService,
-    private billingNotificationService: BillingNotificationService,
     private organizationWarningsService: OrganizationWarningsService,
     private collectionService: CollectionService,
+    private restrictedItemTypesService: RestrictedItemTypesService,
   ) {
     this.userId$ = this.accountService.activeAccount$.pipe(getUserId);
     this.filter$ = this.routedVaultFilterService.filter$;
@@ -357,9 +312,10 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
     this.allCiphers$ = combineLatest([
       this.organization$,
       this.userId$,
+      this.restrictedItemTypesService.restricted$,
       this.refreshingSubject$,
     ]).pipe(
-      switchMap(async ([organization, userId]) => {
+      switchMap(async ([organization, userId, restricted]) => {
         // If user swaps organization reset the addAccessToggle
         if (!this.showAddAccessToggle || organization) {
           this.addAccessToggle(0);
@@ -381,6 +337,11 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
           ciphers = await this.cipherService.getManyFromApiForOrganization(organization.id);
         }
 
+        // Filter out restricted ciphers before indexing
+        ciphers = ciphers.filter(
+          (cipher) => !this.restrictedItemTypesService.isCipherRestricted(cipher, restricted),
+        );
+
         await this.searchService.indexCiphers(userId, ciphers, organization.id);
         return ciphers;
       }),
@@ -453,68 +414,17 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
     );
 
     // Billing Warnings
-    this.useOrganizationWarningsService$ = this.configService.getFeatureFlag$(
-      FeatureFlag.UseOrganizationWarningsService,
-    );
-
-    const freeTrial$ = combineLatest([
-      this.organization$,
-      this.hasSubscription$.pipe(filter((hasSubscription) => hasSubscription !== null)),
-    ]).pipe(
-      filter(
-        ([org, hasSubscription]) => org.isOwner && hasSubscription && org.canViewBillingHistory,
-      ),
-      switchMap(([org]) =>
-        combineLatest([
-          of(org),
-          this.organizationApiService.getSubscription(org.id),
-          from(this.organizationBillingService.getPaymentSource(org.id)).pipe(
-            map((paymentSource) => {
-              if (paymentSource == null) {
-                throw new Error("Payment source not found.");
-              }
-              return paymentSource;
-            }),
-          ),
-        ]),
-      ),
-      map(([org, sub, paymentSource]) =>
-        this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(org, sub, paymentSource),
-      ),
-      filter((result) => result !== null),
-      catchError((error: unknown) => {
-        this.billingNotificationService.handleError(error);
-        return of();
-      }),
-    );
-
-    this.freeTrialWhenWarningsServiceDisabled$ = this.useOrganizationWarningsService$.pipe(
-      filter((enabled) => !enabled),
-      switchMap(() => freeTrial$),
-    );
-
-    this.resellerWarningWhenWarningsServiceDisabled$ = combineLatest([
-      this.organization$,
-      this.useOrganizationWarningsService$,
-    ]).pipe(
-      filter(([org, enabled]) => !enabled && org.isOwner),
-      switchMap(([org]) =>
-        from(this.billingApiService.getOrganizationBillingMetadata(org.id)).pipe(
-          map((metadata) => ({ org, metadata })),
-        ),
-      ),
-      map(({ org, metadata }) => this.resellerWarningService.getWarning(org, metadata)),
-    );
-
     this.organization$
       .pipe(
         switchMap((organization) =>
-          this.organizationWarningsService.showSubscribeBeforeFreeTrialEndsDialog$(organization),
+          merge(
+            this.organizationWarningsService.showInactiveSubscriptionDialog$(organization),
+            this.organizationWarningsService.showSubscribeBeforeFreeTrialEndsDialog$(organization),
+          ),
         ),
         takeUntilDestroyed(),
       )
       .subscribe();
-
     // End Billing Warnings
 
     this.editableCollections$ = combineLatest([
@@ -773,17 +683,6 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
       )
       .subscribe();
 
-    combineLatest([this.useOrganizationWarningsService$, this.organization$])
-      .pipe(
-        switchMap(([enabled, organization]) =>
-          enabled
-            ? this.organizationWarningsService.showInactiveSubscriptionDialog$(organization)
-            : this.unpaidSubscriptionDialog$,
-        ),
-        takeUntil(this.destroy$),
-      )
-      .subscribe();
-
     // Handle last of initial setup - workaround for some state issues where we need to manually
     // push the collections we've loaded back into the VaultFilterService.
     // FIXME: figure out how we can remove this.
@@ -808,14 +707,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) {
@@ -1033,6 +931,12 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
       this.refresh();
     }
 
+    // When the dialog is closed for a premium upgrade, return early as the user
+    // should be navigated to the subscription settings elsewhere
+    if (result === VaultItemDialogResult.PremiumUpgrade) {
+      return;
+    }
+
     // Clear the query params when the dialog closes
     await this.go({ cipherId: null, itemId: null, action: null });
   }
@@ -1224,7 +1128,7 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
       const selectedCollection = await firstValueFrom(this.selectedCollection$);
       if (selectedCollection?.node.id === collection.id) {
         void this.router.navigate([], {
-          queryParams: { collectionId: selectedCollection.parent.node.id ?? null },
+          queryParams: { collectionId: selectedCollection?.parent?.node.id ?? null },
           queryParamsHandling: "merge",
           replaceUrl: true,
         });
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..1a093ff8352 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
@@ -6,10 +6,9 @@ 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,7 +19,6 @@ import { vNextVaultComponent } from "./vault.component";
     OrganizationBadgeModule,
     CollectionDialogComponent,
     VaultComponent,
-    vNextVaultComponent,
     ViewComponent,
   ],
 })
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 b937cc5526a..e5af0faa164 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
@@ -71,10 +71,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>
@@ -140,11 +139,7 @@
   </app-side-nav>
 
   <ng-container *ngIf="organization$ | async as organization">
-    <bit-banner
-      *ngIf="organization.isProviderUser"
-      [showClose]="false"
-      class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
-    >
+    <bit-banner *ngIf="organization.isProviderUser" [showClose]="false">
       {{ "accessingUsingProvider" | i18n: organization.providerName }}
     </bit-banner>
     <app-tax-id-warning
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 6b2f6261454..b9d44c125ad 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";
@@ -70,11 +67,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 +74,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,
   ) {}
 
@@ -121,8 +111,13 @@ export class OrganizationLayoutComponent implements OnInit {
       switchMap((userId) => this.policyService.policyAppliesToUser$(PolicyType.SingleOrg, userId)),
     );
 
-    const provider$ = this.organization$.pipe(
-      switchMap((organization) => this.providerService.get$(organization.providerId)),
+    const provider$ = combineLatest([
+      this.organization$,
+      this.accountService.activeAccount$.pipe(getUserId),
+    ]).pipe(
+      switchMap(([organization, userId]) =>
+        this.providerService.get$(organization.providerId, userId),
+      ),
     );
 
     this.organizationIsUnmanaged$ = combineLatest([this.organization$, provider$]).pipe(
@@ -136,16 +131,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..b4c5a273ac7 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;
@@ -174,6 +174,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.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
index 58f7fc2563d..966499c0bee 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, firstValueFrom, lastValueFrom, takeUntil } from "rxjs";
+import { concatMap, filter, firstValueFrom, lastValueFrom, map, switchMap, takeUntil } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
@@ -136,22 +136,24 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
 
     if (this.organization.providerId != null) {
       try {
-        const provider = await this.providerService.get(this.organization.providerId);
-        if (
-          provider != null &&
-          (await this.providerService.get(this.organization.providerId)).canManageUsers
-        ) {
-          const providerUsersResponse = await this.apiService.getProviderUsers(
-            this.organization.providerId,
-          );
-          providerUsersResponse.data.forEach((u) => {
-            const name = this.userNamePipe.transform(u);
-            this.orgUsersUserIdMap.set(u.userId, {
-              name: `${name} (${this.organization.providerName})`,
-              email: u.email,
-            });
-          });
-        }
+        await firstValueFrom(
+          this.accountService.activeAccount$.pipe(
+            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,
+                });
+              }),
+            ),
+          ),
+        );
       } catch (e) {
         this.logService.warning(e);
       }
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..b31f1cbf358 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
@@ -975,12 +975,11 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
   }
 
   async navigateToPaymentMethod(organization: Organization) {
-    const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
-      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
+    await this.router.navigate(
+      ["organizations", `${organization.id}`, "billing", "payment-details"],
+      {
+        state: { launchPaymentModalAutomatically: true },
+      },
     );
-    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/organization-routing.module.ts b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts
index ab32a0b1eef..230ddbdf860 100644
--- a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts
+++ b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts
@@ -19,7 +19,6 @@ import { deepLinkGuard } from "../../auth/guards/deep-link/deep-link.guard";
 import { VaultModule } from "./collections/vault.module";
 import { organizationPermissionsGuard } from "./guards/org-permissions.guard";
 import { organizationRedirectGuard } from "./guards/org-redirect.guard";
-import { AdminConsoleIntegrationsComponent } from "./integrations/integrations.component";
 import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
 import { GroupsComponent } from "./manage/groups.component";
 
@@ -39,14 +38,6 @@ const routes: Routes = [
         path: "vault",
         loadChildren: () => VaultModule,
       },
-      {
-        path: "integrations",
-        canActivate: [organizationPermissionsGuard(canAccessIntegrations)],
-        component: AdminConsoleIntegrationsComponent,
-        data: {
-          titleId: "integrations",
-        },
-      },
       {
         path: "settings",
         loadChildren: () =>
@@ -103,10 +94,6 @@ function getOrganizationRoute(organization: Organization): string {
   return undefined;
 }
 
-function canAccessIntegrations(organization: Organization) {
-  return organization.canAccessIntegrations;
-}
-
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/README.md b/apps/web/src/app/admin-console/organizations/policies/README.md
new file mode 100644
index 00000000000..e3b4efdbbf7
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/README.md
@@ -0,0 +1,234 @@
+# Adding a New Policy in Admin Console
+
+This README explains how to add a new policy type to the Admin Console. Policies are used to control organizational behavior and security settings for their members.
+
+This README does not cover checking the policy status in order to enforce it in the domain code.
+
+## Overview
+
+Each policy consists of three main components:
+
+1. **Policy Type Enum** - Defines the policy type identifier
+2. **Policy Definition & Component** - Implements the UI and business logic
+3. **Registration** - Registers the policy in the application
+
+## Step 1: Adding the Enum
+
+Add your new policy type to the `PolicyType` enum.
+
+**Important**: You must also add the corresponding PolicyType enum value on the server.
+
+Example:
+
+```typescript
+export enum PolicyType {
+  // ... existing policies
+  YourNewPolicy = 21, // Use the next available number
+}
+```
+
+## Step 2: Creating the Policy Definition and Component
+
+### Policy Licensing and Location
+
+The location where you create your policy depends on its licensing:
+
+- **Open Source (OSS) Policies**: Create in `apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/`
+- **Bitwarden Licensed Policies**: Create in `bitwarden_license/bit-web/src/app/admin-console/policies/`
+
+Most policies should be OSS licensed unless they specifically relate to premium/enterprise features that are part of Bitwarden's commercial offerings.
+
+Create a new component file in the appropriate `policy-edit-definitions/` folder following the naming pattern `your-policy-name.component.ts`.
+
+**Note:** you may also create the policy files in your own team's code if you prefer to own your own definition. The same licensing considerations apply.
+
+### Basic Structure
+
+```typescript
+import { Component } from "@angular/core";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
+
+// Policy Definition Class
+export class YourNewPolicy extends BasePolicyEditDefinition {
+  name = "yourPolicyNameTitle"; // i18n key for title
+  description = "yourPolicyNameDesc"; // i18n key for description
+  type = PolicyType.YourNewPolicy; // Reference to enum
+  component = YourNewPolicyComponent; // Reference to component
+}
+
+// Policy Component Class
+@Component({
+  templateUrl: "your-policy-name.component.html",
+  imports: [SharedModule],
+})
+export class YourNewPolicyComponent extends BasePolicyEditComponent {
+  // Component implementation
+}
+```
+
+### Common Use Cases
+
+#### Simple Toggle Policy (No Additional Configuration)
+
+For policies that only need an enabled/disabled state:
+
+```typescript
+export class SimpleTogglePolicy extends BasePolicyEditDefinition {
+  name = "simpleTogglePolicyTitle";
+  description = "simpleTogglePolicyDesc";
+  type = PolicyType.SimpleToggle;
+  component = SimpleTogglePolicyComponent;
+}
+
+@Component({
+  templateUrl: "simple-toggle.component.html",
+  imports: [SharedModule],
+})
+export class SimpleTogglePolicyComponent extends BasePolicyEditComponent {}
+```
+
+Template (`simple-toggle.component.html`):
+
+```html
+<bit-form-control>
+  <input type="checkbox" bitCheckbox [formControl]="enabled" id="enabled" />
+  <bit-label>{{ "turnOn" | i18n }}</bit-label>
+</bit-form-control>
+```
+
+#### Policy with Configuration Data
+
+For policies requiring additional settings beyond just enabled/disabled, you'll need to define a custom `data` FormGroup to handle the policy's configuration options:
+
+```typescript
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { ControlsOf } from "@bitwarden/angular/types/controls-of";
+
+interface YourPolicyOptions {
+  minLength: number;
+  requireSpecialChar: boolean;
+}
+
+@Component({
+  templateUrl: "your-policy.component.html",
+  imports: [SharedModule],
+})
+export class YourPolicyComponent extends BasePolicyEditComponent implements OnInit {
+  data: FormGroup<ControlsOf<YourPolicyOptions>> = this.formBuilder.group({
+    minLength: [8, [Validators.min(1)]],
+    requireSpecialChar: [false],
+  });
+
+  constructor(private formBuilder: FormBuilder) {
+    super();
+  }
+
+  async ngOnInit() {
+    super.ngOnInit();
+    // Additional initialization logic
+  }
+}
+```
+
+Template (`your-policy.component.html`):
+
+```html
+<bit-form-control>
+  <input type="checkbox" bitCheckbox [formControl]="enabled" id="enabled" />
+  <bit-label>{{ "turnOn" | i18n }}</bit-label>
+</bit-form-control>
+
+<ng-container [formGroup]="data">
+  <bit-form-field>
+    <bit-label>{{ "minimumLength" | i18n }}</bit-label>
+    <input bitInput type="number" formControlName="minLength" />
+  </bit-form-field>
+
+  <bit-form-control>
+    <input type="checkbox" bitCheckbox formControlName="requireSpecialChar" />
+    <bit-label>{{ "requireSpecialCharacter" | i18n }}</bit-label>
+  </bit-form-control>
+</ng-container>
+```
+
+#### Feature Flagged Policy
+
+To hide a policy behind a feature flag using ConfigService:
+
+```typescript
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+
+export class NewPolicyBeta extends BasePolicyEditDefinition {
+  name = "newPolicyTitle";
+  description = "newPolicyDesc";
+  type = PolicyType.NewPolicy;
+  component = NewPolicyComponent;
+
+  // Only show if feature flag is enabled
+  display$(organization: Organization, configService: ConfigService) {
+    return configService.getFeatureFlag$(FeatureFlag.YourNewPolicyFeature);
+  }
+}
+```
+
+#### Policy related to Organization Features
+
+To show a policy only when the organization has a specific plan feature:
+
+```typescript
+import { of } from "rxjs";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+
+export class RequireSsoPolicy extends BasePolicyEditDefinition {
+  name = "requireSsoTitle";
+  description = "requireSsoDesc";
+  type = PolicyType.RequireSso;
+  component = RequireSsoPolicyComponent;
+
+  // Only show if organization has SSO enabled
+  display$(organization: Organization, configService: ConfigService) {
+    return of(organization.useSso);
+  }
+}
+```
+
+## Step 3: Registering the Policy
+
+### Export from Index File
+
+Add your policy to the barrel file in its folder:
+
+```typescript
+export { YourNewPolicy } from "./your-policy-name.component";
+```
+
+### Register in Policy Register
+
+Add your policy to the appropriate register in `policy-edit-register.ts`:
+
+```typescript
+import {
+  // ... existing imports
+  YourNewPolicy,
+} from "./policy-edit-definitions";
+
+export const ossPolicyEditRegister: BasePolicyEditDefinition[] = [
+  // ... existing policies
+  new YourNewPolicy(),
+];
+```
+
+**Note**: Use `ossPolicyEditRegister` for open-source policies and `bitPolicyEditRegister` for Bitwarden Licensed policies.
+
+## Testing Your Policy
+
+1. Build and run the application
+2. Navigate to Admin Console → Policies
+3. Verify your policy appears in the list
+4. Test the policy configuration UI
+5. Verify policy data saves correctly
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
new file mode 100644
index 00000000000..2e5faea4702
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/base-policy-edit.component.ts
@@ -0,0 +1,119 @@
+import { Directive, Input, OnInit } from "@angular/core";
+import { FormControl, UntypedFormGroup } from "@angular/forms";
+import { Observable, of } from "rxjs";
+import { Constructor } from "type-fest";
+
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
+import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+
+/**
+ * A metadata class that defines how a policy is displayed in the Admin Console Policies page for editing.
+ * Add this to the `ossPolicyRegister` or `bitPolicyRegister` file to register it in the application.
+ */
+export abstract class BasePolicyEditDefinition {
+  /**
+   * i18n string for the policy name.
+   */
+  abstract name: string;
+  /**
+   * i18n string for the policy description.
+   * This is shown in the list of policies.
+   */
+  abstract description: string;
+  /**
+   * The PolicyType enum that this policy represents.
+   */
+  abstract type: PolicyType;
+  /**
+   * The component used to edit this policy. See {@link BasePolicyEditComponent}.
+   */
+  abstract component: Constructor<BasePolicyEditComponent>;
+
+  /**
+   * 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.
+   **/
+  showDescription: boolean = true;
+
+  /**
+   * A method that determines whether to display this policy in the Admin Console Policies page.
+   * The default implementation will always display the policy.
+   * This can be used to hide the policy based on the organization's plan features or a feature flag value.
+   * Note: this only hides the policy for editing in Admin Console, it does not affect its enforcement
+   * if it has already been turned on. Enforcement should be feature flagged separately.
+   */
+  display$(organization: Organization, configService: ConfigService): Observable<boolean> {
+    return of(true);
+  }
+}
+
+/**
+ * A component used to edit the policy settings in Admin Console. It is rendered inside the PolicyEditDialogComponent.
+ * This should contain the form controls used to edit the policy (including the Enabled checkbox) and any additional
+ * warnings or callouts.
+ * See existing implementations as a guide.
+ */
+@Directive()
+export abstract class BasePolicyEditComponent implements OnInit {
+  @Input() policyResponse: PolicyResponse | undefined;
+  @Input() policy: BasePolicyEditDefinition | undefined;
+
+  /**
+   * Whether the policy is enabled.
+   */
+  enabled = new FormControl(false);
+
+  /**
+   * An optional FormGroup for additional policy configuration. Required for more complex policies only.
+   */
+  data: UntypedFormGroup | undefined;
+
+  ngOnInit(): void {
+    this.enabled.setValue(this.policyResponse?.enabled ?? false);
+
+    if (this.policyResponse?.data != null) {
+      this.loadData();
+    }
+  }
+
+  buildRequest() {
+    if (!this.policy) {
+      throw new Error("Policy was not found");
+    }
+
+    const request: PolicyRequest = {
+      type: this.policy.type,
+      enabled: this.enabled.value ?? false,
+      data: this.buildRequestData(),
+    };
+
+    return Promise.resolve(request);
+  }
+
+  /**
+   * This is called before the policy is saved. If it returns false, it will not be saved
+   * and the user will remain on the policy edit dialog.
+   * This can be used to trigger an additional confirmation modal before saving.
+   * */
+  confirm(): Promise<boolean> | boolean {
+    return true;
+  }
+
+  protected loadData() {
+    this.data?.patchValue(this.policyResponse?.data ?? {});
+  }
+
+  /**
+   * Transforms the {@link data} FormGroup to the policy data model for saving.
+   */
+  protected buildRequestData() {
+    if (this.data != null) {
+      return this.data.value;
+    }
+
+    return null;
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts b/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts
deleted file mode 100644
index 3af99644dd2..00000000000
--- a/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Directive, Input, OnInit } from "@angular/core";
-import { UntypedFormControl, UntypedFormGroup } from "@angular/forms";
-import { Observable, of } from "rxjs";
-
-import { PolicyType } from "@bitwarden/common/admin-console/enums";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
-import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-
-export abstract class BasePolicy {
-  abstract name: string;
-  abstract description: string;
-  abstract type: PolicyType;
-  abstract component: any;
-
-  /**
-   * If true, the description will be reused in the policy edit modal. Set this to false if you
-   * have more complex requirements that you will implement in your template instead.
-   **/
-  showDescription: boolean = true;
-
-  display(organization: Organization, configService: ConfigService): Observable<boolean> {
-    return of(true);
-  }
-}
-
-@Directive()
-export abstract class BasePolicyComponent implements OnInit {
-  @Input() policyResponse: PolicyResponse | undefined;
-  @Input() policy: BasePolicy | undefined;
-
-  enabled = new UntypedFormControl(false);
-  data: UntypedFormGroup | undefined;
-
-  ngOnInit(): void {
-    this.enabled.setValue(this.policyResponse?.enabled);
-
-    if (this.policyResponse?.data != null) {
-      this.loadData();
-    }
-  }
-
-  buildRequest() {
-    if (!this.policy) {
-      throw new Error("Policy was not found");
-    }
-
-    const request: PolicyRequest = {
-      type: this.policy.type,
-      enabled: this.enabled.value,
-      data: this.buildRequestData(),
-    };
-
-    return Promise.resolve(request);
-  }
-
-  /**
-   * Enable optional validation before sumitting a respose for policy submission
-   * */
-  confirm(): Promise<boolean> | boolean {
-    return true;
-  }
-
-  protected loadData() {
-    this.data?.patchValue(this.policyResponse?.data ?? {});
-  }
-
-  protected buildRequestData() {
-    if (this.data != null) {
-      return this.data.value;
-    }
-
-    return null;
-  }
-}
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 6b6b2303b2f..624e5132faf 100644
--- a/apps/web/src/app/admin-console/organizations/policies/index.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/index.ts
@@ -1,15 +1,4 @@
-export * from "./policies.module";
-export { BasePolicy, BasePolicyComponent } from "./base-policy.component";
-export { DisableSendPolicy } from "./disable-send.component";
-export { MasterPasswordPolicy } from "./master-password.component";
-export { PasswordGeneratorPolicy } from "./password-generator.component";
-export { vNextOrganizationDataOwnershipPolicy } from "./vnext-organization-data-ownership.component";
-export { OrganizationDataOwnershipPolicy } from "./organization-data-ownership.component";
-export { RequireSsoPolicy } from "./require-sso.component";
-export { ResetPasswordPolicy } from "./reset-password.component";
-export { SendOptionsPolicy } from "./send-options.component";
-export { SingleOrgPolicy } from "./single-org.component";
-export { TwoFactorAuthenticationPolicy } from "./two-factor-authentication.component";
 export { PoliciesComponent } from "./policies.component";
-export { RemoveUnlockWithPinPolicy } from "./remove-unlock-with-pin.component";
-export { RestrictedItemTypesPolicy } from "./restricted-item-types.component";
+export { ossPolicyEditRegister } from "./policy-edit-register";
+export { BasePolicyEditDefinition, BasePolicyEditComponent } from "./base-policy-edit.component";
+export { POLICY_EDIT_REGISTER } from "./policy-register-token";
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 843d1d18d59..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 094f0262629..e2c51b77d45 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
@@ -2,8 +2,17 @@
 // @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { firstValueFrom, lastValueFrom, Observable } from "rxjs";
-import { first, map } from "rxjs/operators";
+import {
+  combineLatest,
+  firstValueFrom,
+  lastValueFrom,
+  Observable,
+  of,
+  switchMap,
+  first,
+  map,
+  withLatestFrom,
+} from "rxjs";
 
 import {
   getOrganizationById,
@@ -11,27 +20,34 @@ import {
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.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 { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { DialogService } from "@bitwarden/components";
+import { safeProvider } from "@bitwarden/ui-common";
 
-import { PolicyListService } from "../../core/policy-list.service";
-import { BasePolicy } from "../policies";
+import { HeaderModule } from "../../../layouts/header/header.module";
+import { SharedModule } from "../../../shared";
 
-import { PolicyEditComponent, PolicyEditDialogResult } from "./policy-edit.component";
+import { BasePolicyEditDefinition } 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";
 
 @Component({
-  selector: "app-org-policies",
   templateUrl: "policies.component.html",
-  standalone: false,
+  imports: [SharedModule, HeaderModule],
+  providers: [
+    safeProvider({
+      provide: PolicyListService,
+      deps: [POLICY_EDIT_REGISTER],
+    }),
+  ],
 })
 export class PoliciesComponent implements OnInit {
   loading = true;
   organizationId: string;
-  policies: BasePolicy[];
-  organization$: Observable<Organization>;
+  policies$: Observable<BasePolicyEditDefinition[]>;
 
   private orgPolicies: PolicyResponse[];
   protected policiesEnabledMap: Map<PolicyType, boolean> = new Map<PolicyType, boolean>();
@@ -54,28 +70,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;
                   }
                 }
@@ -97,8 +126,8 @@ export class PoliciesComponent implements OnInit {
     this.loading = false;
   }
 
-  async edit(policy: BasePolicy) {
-    const dialogRef = PolicyEditComponent.open(this.dialogService, {
+  async edit(policy: BasePolicyEditDefinition) {
+    const dialogRef = PolicyEditDialogComponent.open(this.dialogService, {
       data: {
         policy: policy,
         organizationId: this.organizationId,
@@ -106,7 +135,7 @@ export class PoliciesComponent implements OnInit {
     });
 
     const result = await lastValueFrom(dialogRef.closed);
-    if (result === PolicyEditDialogResult.Saved) {
+    if (result == "saved") {
       await this.load();
     }
   }
diff --git a/apps/web/src/app/admin-console/organizations/policies/policies.module.ts b/apps/web/src/app/admin-console/organizations/policies/policies.module.ts
deleted file mode 100644
index 95b22497eba..00000000000
--- a/apps/web/src/app/admin-console/organizations/policies/policies.module.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { HeaderModule } from "../../../layouts/header/header.module";
-import { SharedModule } from "../../../shared";
-
-import { DisableSendPolicyComponent } from "./disable-send.component";
-import { MasterPasswordPolicyComponent } from "./master-password.component";
-import { OrganizationDataOwnershipPolicyComponent } from "./organization-data-ownership.component";
-import { PasswordGeneratorPolicyComponent } from "./password-generator.component";
-import { PoliciesComponent } from "./policies.component";
-import { PolicyEditComponent } from "./policy-edit.component";
-import { RemoveUnlockWithPinPolicyComponent } from "./remove-unlock-with-pin.component";
-import { RequireSsoPolicyComponent } from "./require-sso.component";
-import { ResetPasswordPolicyComponent } from "./reset-password.component";
-import { RestrictedItemTypesPolicyComponent } from "./restricted-item-types.component";
-import { SendOptionsPolicyComponent } from "./send-options.component";
-import { SingleOrgPolicyComponent } from "./single-org.component";
-import { TwoFactorAuthenticationPolicyComponent } from "./two-factor-authentication.component";
-
-@NgModule({
-  imports: [SharedModule, HeaderModule],
-  declarations: [
-    DisableSendPolicyComponent,
-    MasterPasswordPolicyComponent,
-    PasswordGeneratorPolicyComponent,
-    OrganizationDataOwnershipPolicyComponent,
-    RequireSsoPolicyComponent,
-    ResetPasswordPolicyComponent,
-    SendOptionsPolicyComponent,
-    SingleOrgPolicyComponent,
-    TwoFactorAuthenticationPolicyComponent,
-    PoliciesComponent,
-    PolicyEditComponent,
-    RemoveUnlockWithPinPolicyComponent,
-    RestrictedItemTypesPolicyComponent,
-  ],
-  exports: [
-    DisableSendPolicyComponent,
-    MasterPasswordPolicyComponent,
-    PasswordGeneratorPolicyComponent,
-    OrganizationDataOwnershipPolicyComponent,
-    RequireSsoPolicyComponent,
-    ResetPasswordPolicyComponent,
-    SendOptionsPolicyComponent,
-    SingleOrgPolicyComponent,
-    TwoFactorAuthenticationPolicyComponent,
-    PoliciesComponent,
-    PolicyEditComponent,
-    RemoveUnlockWithPinPolicyComponent,
-  ],
-})
-export class PoliciesModule {}
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/autotype-policy.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/autotype-policy.component.html
new file mode 100644
index 00000000000..f110e7d34cd
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/autotype-policy.component.html
@@ -0,0 +1,4 @@
+<bit-form-control>
+  <input type="checkbox" bitCheckbox [formControl]="enabled" id="enabled" />
+  <bit-label>{{ "turnOn" | i18n }}</bit-label>
+</bit-form-control>
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
new file mode 100644
index 00000000000..ce62a7ff5a3
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/autotype-policy.component.ts
@@ -0,0 +1,25 @@
+import { Component } from "@angular/core";
+
+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 { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
+
+export class DesktopAutotypeDefaultSettingPolicy extends BasePolicyEditDefinition {
+  name = "desktopAutotypePolicy";
+  description = "desktopAutotypePolicyDesc";
+  type = PolicyType.AutotypeDefaultSetting;
+  component = DesktopAutotypeDefaultSettingPolicyComponent;
+
+  display$(organization: Organization, configService: ConfigService) {
+    return configService.getFeatureFlag$(FeatureFlag.WindowsDesktopAutotype);
+  }
+}
+@Component({
+  templateUrl: "autotype-policy.component.html",
+  imports: [SharedModule],
+})
+export class DesktopAutotypeDefaultSettingPolicyComponent extends BasePolicyEditComponent {}
diff --git a/apps/web/src/app/admin-console/organizations/policies/disable-send.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/disable-send.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/disable-send.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/disable-send.component.html
diff --git a/apps/web/src/app/admin-console/organizations/policies/disable-send.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/disable-send.component.ts
similarity index 50%
rename from apps/web/src/app/admin-console/organizations/policies/disable-send.component.ts
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/disable-send.component.ts
index b323ac00d34..3b4df75e555 100644
--- a/apps/web/src/app/admin-console/organizations/policies/disable-send.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/disable-send.component.ts
@@ -2,9 +2,10 @@ import { Component } from "@angular/core";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
 
-export class DisableSendPolicy extends BasePolicy {
+export class DisableSendPolicy extends BasePolicyEditDefinition {
   name = "disableSend";
   description = "disableSendPolicyDesc";
   type = PolicyType.DisableSend;
@@ -12,8 +13,7 @@ export class DisableSendPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-disable-send",
   templateUrl: "disable-send.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class DisableSendPolicyComponent extends BasePolicyComponent {}
+export class DisableSendPolicyComponent extends BasePolicyEditComponent {}
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
new file mode 100644
index 00000000000..bb2c40b7a76
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/index.ts
@@ -0,0 +1,16 @@
+export { DisableSendPolicy } from "./disable-send.component";
+export { DesktopAutotypeDefaultSettingPolicy } from "./autotype-policy.component";
+export { MasterPasswordPolicy } from "./master-password.component";
+export { OrganizationDataOwnershipPolicy } from "./organization-data-ownership.component";
+export { PasswordGeneratorPolicy } from "./password-generator.component";
+export { RemoveUnlockWithPinPolicy } from "./remove-unlock-with-pin.component";
+export { RequireSsoPolicy } from "./require-sso.component";
+export { ResetPasswordPolicy } from "./reset-password.component";
+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 {
+  vNextOrganizationDataOwnershipPolicy,
+  vNextOrganizationDataOwnershipPolicyComponent,
+} from "./vnext-organization-data-ownership.component";
diff --git a/apps/web/src/app/admin-console/organizations/policies/master-password.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/master-password.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.html
diff --git a/apps/web/src/app/admin-console/organizations/policies/master-password.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.ts
similarity index 88%
rename from apps/web/src/app/admin-console/organizations/policies/master-password.component.ts
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.ts
index 54cf1be88fc..fe3d76a0907 100644
--- a/apps/web/src/app/admin-console/organizations/policies/master-password.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.ts
@@ -16,9 +16,10 @@ 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";
 
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
 
-export class MasterPasswordPolicy extends BasePolicy {
+export class MasterPasswordPolicy extends BasePolicyEditDefinition {
   name = "masterPassPolicyTitle";
   description = "masterPassPolicyDesc";
   type = PolicyType.MasterPassword;
@@ -26,11 +27,10 @@ export class MasterPasswordPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-master-password",
   templateUrl: "master-password.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class MasterPasswordPolicyComponent extends BasePolicyComponent implements OnInit {
+export class MasterPasswordPolicyComponent extends BasePolicyEditComponent implements OnInit {
   MinPasswordLength = Utils.minimumPasswordLength;
 
   data: FormGroup<ControlsOf<MasterPasswordPolicyOptions>> = this.formBuilder.group({
diff --git a/apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/organization-data-ownership.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/organization-data-ownership.component.html
diff --git a/apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/organization-data-ownership.component.ts
similarity index 70%
rename from apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.ts
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/organization-data-ownership.component.ts
index beb9fd5752a..94094b76f69 100644
--- a/apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/organization-data-ownership.component.ts
@@ -6,15 +6,16 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
 
-export class OrganizationDataOwnershipPolicy extends BasePolicy {
+export class OrganizationDataOwnershipPolicy extends BasePolicyEditDefinition {
   name = "organizationDataOwnership";
   description = "personalOwnershipPolicyDesc";
   type = PolicyType.OrganizationDataOwnership;
   component = OrganizationDataOwnershipPolicyComponent;
 
-  display(organization: Organization, configService: ConfigService): Observable<boolean> {
+  display$(organization: Organization, configService: ConfigService): Observable<boolean> {
     return configService
       .getFeatureFlag$(FeatureFlag.CreateDefaultLocation)
       .pipe(map((enabled) => !enabled));
@@ -22,8 +23,7 @@ export class OrganizationDataOwnershipPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-organization-data-ownership",
   templateUrl: "organization-data-ownership.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class OrganizationDataOwnershipPolicyComponent extends BasePolicyComponent {}
+export class OrganizationDataOwnershipPolicyComponent extends BasePolicyEditComponent {}
diff --git a/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/password-generator.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.html
diff --git a/apps/web/src/app/admin-console/organizations/policies/password-generator.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.ts
similarity index 94%
rename from apps/web/src/app/admin-console/organizations/policies/password-generator.component.ts
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.ts
index 26f87f333eb..e26d37bfdf2 100644
--- a/apps/web/src/app/admin-console/organizations/policies/password-generator.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.ts
@@ -9,9 +9,10 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { BuiltIn, Profile } from "@bitwarden/generator-core";
 
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
 
-export class PasswordGeneratorPolicy extends BasePolicy {
+export class PasswordGeneratorPolicy extends BasePolicyEditDefinition {
   name = "passwordGenerator";
   description = "passwordGeneratorPolicyDesc";
   type = PolicyType.PasswordGenerator;
@@ -19,11 +20,10 @@ export class PasswordGeneratorPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-password-generator",
   templateUrl: "password-generator.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class PasswordGeneratorPolicyComponent extends BasePolicyComponent {
+export class PasswordGeneratorPolicyComponent extends BasePolicyEditComponent {
   // these properties forward the application default settings to the UI
   // for HTML attribute bindings
   protected readonly minLengthMin =
diff --git a/apps/web/src/app/admin-console/organizations/policies/remove-unlock-with-pin.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/remove-unlock-with-pin.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.html
diff --git a/apps/web/src/app/admin-console/organizations/policies/remove-unlock-with-pin.component.spec.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.spec.ts
similarity index 86%
rename from apps/web/src/app/admin-console/organizations/policies/remove-unlock-with-pin.component.spec.ts
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.spec.ts
index 9058cd22f3e..f6df56cd83a 100644
--- a/apps/web/src/app/admin-console/organizations/policies/remove-unlock-with-pin.component.spec.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.spec.ts
@@ -1,11 +1,8 @@
-import { CommonModule } from "@angular/common";
 import { NO_ERRORS_SCHEMA } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { ReactiveFormsModule } from "@angular/forms";
 import { By } from "@angular/platform-browser";
 import { mock } from "jest-mock-extended";
 
-import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -33,8 +30,6 @@ describe("RemoveUnlockWithPinPolicyComponent", () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [CommonModule, ReactiveFormsModule],
-      declarations: [RemoveUnlockWithPinPolicyComponent, I18nPipe],
       providers: [
         { provide: I18nService, useValue: mock<I18nService>() },
         { provide: I18nService, useValue: i18nService },
@@ -102,9 +97,6 @@ describe("RemoveUnlockWithPinPolicyComponent", () => {
 
     const bitLabelElement = fixture.debugElement.query(By.css("bit-label"));
     expect(bitLabelElement).not.toBeNull();
-    const textNodes = bitLabelElement.childNodes
-      .filter((node) => node.nativeNode.nodeType === Node.TEXT_NODE)
-      .map((node) => node.nativeNode.wholeText?.trim());
-    expect(textNodes).toContain("Turn on");
+    expect(bitLabelElement.nativeElement.textContent.trim()).toBe("Turn on");
   });
 });
diff --git a/apps/web/src/app/admin-console/organizations/policies/remove-unlock-with-pin.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.ts
similarity index 61%
rename from apps/web/src/app/admin-console/organizations/policies/remove-unlock-with-pin.component.ts
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.ts
index 0d0f42b603e..e95ef8a1422 100644
--- a/apps/web/src/app/admin-console/organizations/policies/remove-unlock-with-pin.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.ts
@@ -2,9 +2,10 @@ import { Component } from "@angular/core";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
 
-export class RemoveUnlockWithPinPolicy extends BasePolicy {
+export class RemoveUnlockWithPinPolicy extends BasePolicyEditDefinition {
   name = "removeUnlockWithPinPolicyTitle";
   description = "removeUnlockWithPinPolicyDesc";
   type = PolicyType.RemoveUnlockWithPin;
@@ -12,8 +13,7 @@ export class RemoveUnlockWithPinPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "remove-unlock-with-pin",
   templateUrl: "remove-unlock-with-pin.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class RemoveUnlockWithPinPolicyComponent extends BasePolicyComponent {}
+export class RemoveUnlockWithPinPolicyComponent extends BasePolicyEditComponent {}
diff --git a/apps/web/src/app/admin-console/organizations/policies/require-sso.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/require-sso.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/require-sso.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/require-sso.component.html
diff --git a/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/require-sso.component.ts
similarity index 59%
rename from apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/require-sso.component.ts
index 3a0d196c593..3f28c0cb068 100644
--- a/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/require-sso.component.ts
@@ -5,22 +5,22 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
 
-export class RequireSsoPolicy extends BasePolicy {
+export class RequireSsoPolicy extends BasePolicyEditDefinition {
   name = "requireSso";
   description = "requireSsoPolicyDesc";
   type = PolicyType.RequireSso;
   component = RequireSsoPolicyComponent;
 
-  display(organization: Organization, configService: ConfigService) {
+  display$(organization: Organization, configService: ConfigService) {
     return of(organization.useSso);
   }
 }
 
 @Component({
-  selector: "policy-require-sso",
   templateUrl: "require-sso.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class RequireSsoPolicyComponent extends BasePolicyComponent {}
+export class RequireSsoPolicyComponent extends BasePolicyEditComponent {}
diff --git a/apps/web/src/app/admin-console/organizations/policies/reset-password.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/reset-password.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/reset-password.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/reset-password.component.html
diff --git a/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/reset-password.component.ts
similarity index 82%
rename from apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/reset-password.component.ts
index 93a42285fbc..fafb0b32398 100644
--- a/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/reset-password.component.ts
@@ -12,25 +12,25 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
 
-export class ResetPasswordPolicy extends BasePolicy {
+export class ResetPasswordPolicy extends BasePolicyEditDefinition {
   name = "accountRecoveryPolicy";
   description = "accountRecoveryPolicyDesc";
   type = PolicyType.ResetPassword;
   component = ResetPasswordPolicyComponent;
 
-  display(organization: Organization, configService: ConfigService) {
+  display$(organization: Organization, configService: ConfigService) {
     return of(organization.useResetPassword);
   }
 }
 
 @Component({
-  selector: "policy-reset-password",
   templateUrl: "reset-password.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class ResetPasswordPolicyComponent extends BasePolicyComponent implements OnInit {
+export class ResetPasswordPolicyComponent extends BasePolicyEditComponent implements OnInit {
   data = this.formBuilder.group({
     autoEnrollEnabled: false,
   });
diff --git a/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/restricted-item-types.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/restricted-item-types.component.html
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
new file mode 100644
index 00000000000..8f2573f0da3
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/restricted-item-types.component.ts
@@ -0,0 +1,23 @@
+import { Component } from "@angular/core";
+
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
+
+export class RestrictedItemTypesPolicy extends BasePolicyEditDefinition {
+  name = "restrictedItemTypePolicy";
+  description = "restrictedItemTypePolicyDesc";
+  type = PolicyType.RestrictedItemTypes;
+  component = RestrictedItemTypesPolicyComponent;
+}
+
+@Component({
+  templateUrl: "restricted-item-types.component.html",
+  imports: [SharedModule],
+})
+export class RestrictedItemTypesPolicyComponent extends BasePolicyEditComponent {
+  constructor() {
+    super();
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/policies/send-options.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/send-options.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/send-options.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/send-options.component.html
diff --git a/apps/web/src/app/admin-console/organizations/policies/send-options.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/send-options.component.ts
similarity index 62%
rename from apps/web/src/app/admin-console/organizations/policies/send-options.component.ts
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/send-options.component.ts
index 9a0a8871296..e581ed2f4c7 100644
--- a/apps/web/src/app/admin-console/organizations/policies/send-options.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/send-options.component.ts
@@ -3,9 +3,10 @@ import { UntypedFormBuilder } from "@angular/forms";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
 
-export class SendOptionsPolicy extends BasePolicy {
+export class SendOptionsPolicy extends BasePolicyEditDefinition {
   name = "sendOptions";
   description = "sendOptionsPolicyDesc";
   type = PolicyType.SendOptions;
@@ -13,11 +14,10 @@ export class SendOptionsPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-send-options",
   templateUrl: "send-options.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class SendOptionsPolicyComponent extends BasePolicyComponent {
+export class SendOptionsPolicyComponent extends BasePolicyEditComponent {
   data = this.formBuilder.group({
     disableHideEmail: false,
   });
diff --git a/apps/web/src/app/admin-console/organizations/policies/single-org.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/single-org.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/single-org.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/single-org.component.html
diff --git a/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/single-org.component.ts
similarity index 61%
rename from apps/web/src/app/admin-console/organizations/policies/single-org.component.ts
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/single-org.component.ts
index 613253ef8d9..ecaa86b03bc 100644
--- a/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/single-org.component.ts
@@ -2,9 +2,10 @@ import { Component, OnInit } from "@angular/core";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
 
-export class SingleOrgPolicy extends BasePolicy {
+export class SingleOrgPolicy extends BasePolicyEditDefinition {
   name = "singleOrg";
   description = "singleOrgPolicyDesc";
   type = PolicyType.SingleOrg;
@@ -12,11 +13,10 @@ export class SingleOrgPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-single-org",
   templateUrl: "single-org.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class SingleOrgPolicyComponent extends BasePolicyComponent implements OnInit {
+export class SingleOrgPolicyComponent extends BasePolicyEditComponent implements OnInit {
   async ngOnInit() {
     super.ngOnInit();
 
diff --git a/apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/two-factor-authentication.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/two-factor-authentication.component.html
diff --git a/apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/two-factor-authentication.component.ts
similarity index 60%
rename from apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.ts
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/two-factor-authentication.component.ts
index 691e12c72f6..13b7660c4e7 100644
--- a/apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/two-factor-authentication.component.ts
@@ -2,9 +2,10 @@ import { Component } from "@angular/core";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
 
-export class TwoFactorAuthenticationPolicy extends BasePolicy {
+export class TwoFactorAuthenticationPolicy extends BasePolicyEditDefinition {
   name = "twoStepLoginPolicyTitle";
   description = "twoStepLoginPolicyDesc";
   type = PolicyType.TwoFactorAuthentication;
@@ -12,8 +13,7 @@ export class TwoFactorAuthenticationPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-two-factor-authentication",
   templateUrl: "two-factor-authentication.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class TwoFactorAuthenticationPolicyComponent extends BasePolicyComponent {}
+export class TwoFactorAuthenticationPolicyComponent extends BasePolicyEditComponent {}
diff --git a/apps/web/src/app/admin-console/organizations/policies/vnext-organization-data-ownership.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/vnext-organization-data-ownership.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/vnext-organization-data-ownership.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/vnext-organization-data-ownership.component.html
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
new file mode 100644
index 00000000000..2234d5c7437
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/vnext-organization-data-ownership.component.ts
@@ -0,0 +1,95 @@
+import { Component, OnInit, TemplateRef, ViewChild } from "@angular/core";
+import { lastValueFrom, Observable } from "rxjs";
+
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
+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 { OrgKey } from "@bitwarden/common/types/key";
+import { DialogService } from "@bitwarden/components";
+import { EncString } from "@bitwarden/sdk-internal";
+
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
+
+interface VNextPolicyRequest {
+  policy: PolicyRequest;
+  metadata: {
+    defaultUserCollectionName: string;
+  };
+}
+
+export class vNextOrganizationDataOwnershipPolicy extends BasePolicyEditDefinition {
+  name = "organizationDataOwnership";
+  description = "organizationDataOwnershipDesc";
+  type = PolicyType.OrganizationDataOwnership;
+  component = vNextOrganizationDataOwnershipPolicyComponent;
+  showDescription = false;
+
+  override display$(organization: Organization, configService: ConfigService): Observable<boolean> {
+    return configService.getFeatureFlag$(FeatureFlag.CreateDefaultLocation);
+  }
+}
+
+@Component({
+  templateUrl: "vnext-organization-data-ownership.component.html",
+  imports: [SharedModule],
+})
+export class vNextOrganizationDataOwnershipPolicyComponent
+  extends BasePolicyEditComponent
+  implements OnInit
+{
+  constructor(
+    private dialogService: DialogService,
+    private i18nService: I18nService,
+    private encryptService: EncryptService,
+  ) {
+    super();
+  }
+
+  @ViewChild("dialog", { static: true }) warningContent!: TemplateRef<unknown>;
+
+  override async confirm(): Promise<boolean> {
+    if (this.policyResponse?.enabled && !this.enabled.value) {
+      const dialogRef = this.dialogService.open(this.warningContent);
+      const result = await lastValueFrom(dialogRef.closed);
+      return Boolean(result);
+    }
+    return true;
+  }
+
+  async buildVNextRequest(orgKey: OrgKey): Promise<VNextPolicyRequest> {
+    if (!this.policy) {
+      throw new Error("Policy was not found");
+    }
+
+    const defaultUserCollectionName = await this.getEncryptedDefaultUserCollectionName(orgKey);
+
+    const request: VNextPolicyRequest = {
+      policy: {
+        type: this.policy.type,
+        enabled: this.enabled.value ?? false,
+        data: this.buildRequestData(),
+      },
+      metadata: {
+        defaultUserCollectionName,
+      },
+    };
+
+    return request;
+  }
+
+  private async getEncryptedDefaultUserCollectionName(orgKey: OrgKey): Promise<EncString> {
+    const defaultCollectionName = this.i18nService.t("myItems");
+    const encrypted = await this.encryptService.encryptString(defaultCollectionName, orgKey);
+
+    if (!encrypted.encryptedString) {
+      throw new Error("Encryption error");
+    }
+
+    return encrypted.encryptedString;
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
rename to apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.html
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
new file mode 100644
index 00000000000..f0672d0f861
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.ts
@@ -0,0 +1,197 @@
+import {
+  AfterViewInit,
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  ViewChild,
+  ViewContainerRef,
+} from "@angular/core";
+import { FormBuilder } from "@angular/forms";
+import { Observable, map, firstValueFrom, switchMap, filter, of } from "rxjs";
+
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+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 { 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 { OrganizationId } from "@bitwarden/common/types/guid";
+import {
+  DIALOG_DATA,
+  DialogConfig,
+  DialogRef,
+  DialogService,
+  ToastService,
+} from "@bitwarden/components";
+import { KeyService } from "@bitwarden/key-management";
+
+import { SharedModule } from "../../../shared";
+
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "./base-policy-edit.component";
+import { vNextOrganizationDataOwnershipPolicyComponent } from "./policy-edit-definitions";
+
+export type PolicyEditDialogData = {
+  /**
+   * The metadata containing information about how to display and edit the policy.
+   */
+  policy: BasePolicyEditDefinition;
+  /**
+   * The organization ID for the policy.
+   */
+  organizationId: string;
+};
+
+export type PolicyEditDialogResult = "saved";
+
+@Component({
+  templateUrl: "policy-edit-dialog.component.html",
+  imports: [SharedModule],
+})
+export class PolicyEditDialogComponent implements AfterViewInit {
+  @ViewChild("policyForm", { read: ViewContainerRef, static: true })
+  policyFormRef: ViewContainerRef | undefined;
+
+  policyType = PolicyType;
+  loading = true;
+  enabled = false;
+  saveDisabled$: Observable<boolean> = of(false);
+  policyComponent: BasePolicyEditComponent | undefined;
+
+  formGroup = this.formBuilder.group({
+    enabled: [this.enabled],
+  });
+  constructor(
+    @Inject(DIALOG_DATA) protected data: PolicyEditDialogData,
+    private accountService: AccountService,
+    private policyApiService: PolicyApiServiceAbstraction,
+    private i18nService: I18nService,
+    private cdr: ChangeDetectorRef,
+    private formBuilder: FormBuilder,
+    private dialogRef: DialogRef<PolicyEditDialogResult>,
+    private toastService: ToastService,
+    private configService: ConfigService,
+    private keyService: KeyService,
+  ) {}
+
+  get policy(): BasePolicyEditDefinition {
+    return this.data.policy;
+  }
+
+  /**
+   * Instantiates the child policy component and inserts it into the view.
+   */
+  async ngAfterViewInit() {
+    const policyResponse = await this.load();
+    this.loading = false;
+
+    if (!this.policyFormRef) {
+      throw new Error("Template not initialized.");
+    }
+
+    this.policyComponent = this.policyFormRef.createComponent(this.data.policy.component).instance;
+    this.policyComponent.policy = this.data.policy;
+    this.policyComponent.policyResponse = policyResponse;
+
+    if (this.policyComponent.data) {
+      // If the policy has additional configuration, disable the save button if the form state is invalid
+      this.saveDisabled$ = this.policyComponent.data.statusChanges.pipe(
+        map((status) => status !== "VALID" || !policyResponse.canToggleState),
+      );
+    }
+
+    this.cdr.detectChanges();
+  }
+
+  async load() {
+    try {
+      return await this.policyApiService.getPolicy(this.data.organizationId, this.data.policy.type);
+    } catch (e: any) {
+      // No policy exists yet, instantiate an empty one
+      if (e.statusCode === 404) {
+        return new PolicyResponse({ Enabled: false });
+      } else {
+        throw e;
+      }
+    }
+  }
+
+  submit = async () => {
+    if (!this.policyComponent) {
+      throw new Error("PolicyComponent not initialized.");
+    }
+
+    if ((await this.policyComponent.confirm()) == false) {
+      this.dialogRef.close();
+      return;
+    }
+
+    try {
+      if (
+        this.policyComponent instanceof vNextOrganizationDataOwnershipPolicyComponent &&
+        (await this.isVNextEnabled())
+      ) {
+        await this.handleVNextSubmission(this.policyComponent);
+      } else {
+        await this.handleStandardSubmission();
+      }
+
+      this.toastService.showToast({
+        variant: "success",
+        message: this.i18nService.t("editedPolicyId", this.i18nService.t(this.data.policy.name)),
+      });
+      this.dialogRef.close("saved");
+    } catch (error: any) {
+      this.toastService.showToast({
+        variant: "error",
+        message: error.message,
+      });
+    }
+  };
+
+  private async isVNextEnabled(): Promise<boolean> {
+    const isVNextFeatureEnabled = await firstValueFrom(
+      this.configService.getFeatureFlag$(FeatureFlag.CreateDefaultLocation),
+    );
+
+    return isVNextFeatureEnabled;
+  }
+
+  private async handleStandardSubmission(): Promise<void> {
+    if (!this.policyComponent) {
+      throw new Error("PolicyComponent not initialized.");
+    }
+
+    const request = await this.policyComponent.buildRequest();
+    await this.policyApiService.putPolicy(this.data.organizationId, this.data.policy.type, request);
+  }
+
+  private async handleVNextSubmission(
+    policyComponent: vNextOrganizationDataOwnershipPolicyComponent,
+  ): Promise<void> {
+    const orgKey = await firstValueFrom(
+      this.accountService.activeAccount$.pipe(
+        getUserId,
+        switchMap((userId) => this.keyService.orgKeys$(userId)),
+        filter((orgKeys) => orgKeys != null),
+        map((orgKeys) => orgKeys[this.data.organizationId as OrganizationId] ?? null),
+      ),
+    );
+
+    if (orgKey == null) {
+      throw new Error("No encryption key for this organization.");
+    }
+
+    const vNextRequest = await policyComponent.buildVNextRequest(orgKey);
+
+    await this.policyApiService.putPolicyVNext(
+      this.data.organizationId,
+      this.data.policy.type,
+      vNextRequest,
+    );
+  }
+  static open = (dialogService: DialogService, config: DialogConfig<PolicyEditDialogData>) => {
+    return dialogService.open<PolicyEditDialogResult>(PolicyEditDialogComponent, config);
+  };
+}
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
new file mode 100644
index 00000000000..5e63ba1358a
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-register.ts
@@ -0,0 +1,36 @@
+import { BasePolicyEditDefinition } from "./base-policy-edit.component";
+import {
+  DesktopAutotypeDefaultSettingPolicy,
+  DisableSendPolicy,
+  MasterPasswordPolicy,
+  OrganizationDataOwnershipPolicy,
+  PasswordGeneratorPolicy,
+  RemoveUnlockWithPinPolicy,
+  RequireSsoPolicy,
+  ResetPasswordPolicy,
+  RestrictedItemTypesPolicy,
+  SendOptionsPolicy,
+  SingleOrgPolicy,
+  TwoFactorAuthenticationPolicy,
+  vNextOrganizationDataOwnershipPolicy,
+} from "./policy-edit-definitions";
+
+/**
+ * The policy register for OSS policies.
+ * Add your policy definition here if it is under the OSS license.
+ */
+export const ossPolicyEditRegister: BasePolicyEditDefinition[] = [
+  new TwoFactorAuthenticationPolicy(),
+  new MasterPasswordPolicy(),
+  new RemoveUnlockWithPinPolicy(),
+  new ResetPasswordPolicy(),
+  new PasswordGeneratorPolicy(),
+  new SingleOrgPolicy(),
+  new RequireSsoPolicy(),
+  new OrganizationDataOwnershipPolicy(),
+  new vNextOrganizationDataOwnershipPolicy(),
+  new DisableSendPolicy(),
+  new SendOptionsPolicy(),
+  new RestrictedItemTypesPolicy(),
+  new DesktopAutotypeDefaultSettingPolicy(),
+];
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
deleted file mode 100644
index f78ab207020..00000000000
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import {
-  AfterViewInit,
-  ChangeDetectorRef,
-  Component,
-  Inject,
-  ViewChild,
-  ViewContainerRef,
-} from "@angular/core";
-import { FormBuilder } from "@angular/forms";
-import { Observable, map } from "rxjs";
-
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
-import { PolicyType } from "@bitwarden/common/admin-console/enums";
-import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
-import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import {
-  DIALOG_DATA,
-  DialogConfig,
-  DialogRef,
-  DialogService,
-  ToastService,
-} from "@bitwarden/components";
-
-import { BasePolicy, BasePolicyComponent } from "../policies";
-
-export type PolicyEditDialogData = {
-  /** Returns policy abstracts. */
-  policy: BasePolicy;
-  /** Returns a unique organization id  */
-  organizationId: string;
-};
-
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum PolicyEditDialogResult {
-  Saved = "saved",
-}
-@Component({
-  selector: "app-policy-edit",
-  templateUrl: "policy-edit.component.html",
-  standalone: false,
-})
-export class PolicyEditComponent implements AfterViewInit {
-  @ViewChild("policyForm", { read: ViewContainerRef, static: true })
-  policyFormRef: ViewContainerRef;
-
-  policyType = PolicyType;
-  loading = true;
-  enabled = false;
-  saveDisabled$: Observable<boolean>;
-  policyComponent: BasePolicyComponent;
-
-  private policyResponse: PolicyResponse;
-  formGroup = this.formBuilder.group({
-    enabled: [this.enabled],
-  });
-  constructor(
-    @Inject(DIALOG_DATA) protected data: PolicyEditDialogData,
-    private policyApiService: PolicyApiServiceAbstraction,
-    private i18nService: I18nService,
-    private cdr: ChangeDetectorRef,
-    private formBuilder: FormBuilder,
-    private dialogRef: DialogRef<PolicyEditDialogResult>,
-    private toastService: ToastService,
-  ) {}
-  get policy(): BasePolicy {
-    return this.data.policy;
-  }
-
-  async ngAfterViewInit() {
-    await this.load();
-    this.loading = false;
-
-    this.policyComponent = this.policyFormRef.createComponent(this.data.policy.component)
-      .instance as BasePolicyComponent;
-    this.policyComponent.policy = this.data.policy;
-    this.policyComponent.policyResponse = this.policyResponse;
-
-    this.saveDisabled$ = this.policyComponent.data.statusChanges.pipe(
-      map((status) => status !== "VALID" || !this.policyResponse.canToggleState),
-    );
-
-    this.cdr.detectChanges();
-  }
-
-  async load() {
-    try {
-      this.policyResponse = await this.policyApiService.getPolicy(
-        this.data.organizationId,
-        this.data.policy.type,
-      );
-    } catch (e) {
-      if (e.statusCode === 404) {
-        this.policyResponse = new PolicyResponse({ Enabled: false });
-      } else {
-        throw e;
-      }
-    }
-  }
-
-  submit = async () => {
-    if ((await this.policyComponent.confirm()) == false) {
-      this.dialogRef.close();
-      return;
-    }
-
-    let request: PolicyRequest;
-
-    try {
-      request = await this.policyComponent.buildRequest();
-    } catch (e) {
-      this.toastService.showToast({ variant: "error", title: null, message: e.message });
-      return;
-    }
-
-    await this.policyApiService.putPolicy(this.data.organizationId, this.data.policy.type, request);
-    this.toastService.showToast({
-      variant: "success",
-      title: null,
-      message: this.i18nService.t("editedPolicyId", this.i18nService.t(this.data.policy.name)),
-    });
-    this.dialogRef.close(PolicyEditDialogResult.Saved);
-  };
-
-  static open = (dialogService: DialogService, config: DialogConfig<PolicyEditDialogData>) => {
-    return dialogService.open<PolicyEditDialogResult>(PolicyEditComponent, config);
-  };
-}
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-list.service.ts b/apps/web/src/app/admin-console/organizations/policies/policy-list.service.ts
new file mode 100644
index 00000000000..0434338f2f0
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-list.service.ts
@@ -0,0 +1,13 @@
+import { BasePolicyEditDefinition } from "./base-policy-edit.component";
+
+export class PolicyListService {
+  private policies: readonly BasePolicyEditDefinition[];
+
+  constructor(policies: BasePolicyEditDefinition[]) {
+    this.policies = Object.freeze([...policies]);
+  }
+
+  getPolicies() {
+    return this.policies;
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-register-token.ts b/apps/web/src/app/admin-console/organizations/policies/policy-register-token.ts
new file mode 100644
index 00000000000..3c46af32e88
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-register-token.ts
@@ -0,0 +1,7 @@
+import { SafeInjectionToken } from "@bitwarden/ui-common";
+
+import { BasePolicyEditDefinition } from "./base-policy-edit.component";
+
+export const POLICY_EDIT_REGISTER = new SafeInjectionToken<BasePolicyEditDefinition[]>(
+  "POLICY_EDIT_REGISTER",
+);
diff --git a/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.ts b/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.ts
deleted file mode 100644
index 6cad0fc0170..00000000000
--- a/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Component } from "@angular/core";
-import { Observable } from "rxjs";
-
-import { PolicyType } from "@bitwarden/common/admin-console/enums";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
-
-export class RestrictedItemTypesPolicy extends BasePolicy {
-  name = "restrictedItemTypePolicy";
-  description = "restrictedItemTypePolicyDesc";
-  type = PolicyType.RestrictedItemTypes;
-  component = RestrictedItemTypesPolicyComponent;
-
-  display(organization: Organization, configService: ConfigService): Observable<boolean> {
-    return configService.getFeatureFlag$(FeatureFlag.RemoveCardItemTypePolicy);
-  }
-}
-
-@Component({
-  selector: "policy-restricted-item-types",
-  templateUrl: "restricted-item-types.component.html",
-  standalone: false,
-})
-export class RestrictedItemTypesPolicyComponent extends BasePolicyComponent {
-  constructor() {
-    super();
-  }
-}
diff --git a/apps/web/src/app/admin-console/organizations/policies/vnext-organization-data-ownership.component.ts b/apps/web/src/app/admin-console/organizations/policies/vnext-organization-data-ownership.component.ts
deleted file mode 100644
index 11b1548d9f9..00000000000
--- a/apps/web/src/app/admin-console/organizations/policies/vnext-organization-data-ownership.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Component, OnInit, TemplateRef, ViewChild } from "@angular/core";
-import { lastValueFrom, Observable } from "rxjs";
-
-import { PolicyType } from "@bitwarden/common/admin-console/enums";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { DialogService } from "@bitwarden/components";
-
-import { SharedModule } from "../../../shared";
-
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
-
-export class vNextOrganizationDataOwnershipPolicy extends BasePolicy {
-  name = "organizationDataOwnership";
-  description = "organizationDataOwnershipDesc";
-  type = PolicyType.OrganizationDataOwnership;
-  component = vNextOrganizationDataOwnershipPolicyComponent;
-  showDescription = false;
-
-  override display(organization: Organization, configService: ConfigService): Observable<boolean> {
-    return configService.getFeatureFlag$(FeatureFlag.CreateDefaultLocation);
-  }
-}
-
-@Component({
-  selector: "vnext-policy-organization-data-ownership",
-  templateUrl: "vnext-organization-data-ownership.component.html",
-  standalone: true,
-  imports: [SharedModule],
-})
-export class vNextOrganizationDataOwnershipPolicyComponent
-  extends BasePolicyComponent
-  implements OnInit
-{
-  constructor(private dialogService: DialogService) {
-    super();
-  }
-
-  @ViewChild("dialog", { static: true }) warningContent!: TemplateRef<unknown>;
-
-  override async confirm(): Promise<boolean> {
-    if (this.policyResponse?.enabled && !this.enabled.value) {
-      const dialogRef = this.dialogService.open(this.warningContent);
-      const result = await lastValueFrom(dialogRef.closed);
-      return Boolean(result);
-    }
-    return true;
-  }
-}
diff --git a/apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts b/apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts
index 9b0c3035e98..27a6226f964 100644
--- a/apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts
@@ -1,13 +1,12 @@
 import { NgModule } from "@angular/core";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { ItemModule } from "@bitwarden/components";
 
 import { DangerZoneComponent } from "../../../auth/settings/account/danger-zone.component";
 import { HeaderModule } from "../../../layouts/header/header.module";
 import { SharedModule } from "../../../shared";
 import { AccountFingerprintComponent } from "../../../shared/components/account-fingerprint/account-fingerprint.component";
-import { PremiumBadgeComponent } from "../../../vault/components/premium-badge.component";
-import { PoliciesModule } from "../../organizations/policies";
 
 import { AccountComponent } from "./account.component";
 import { OrganizationSettingsRoutingModule } from "./organization-settings-routing.module";
@@ -16,7 +15,6 @@ import { TwoFactorSetupComponent } from "./two-factor-setup.component";
 @NgModule({
   imports: [
     SharedModule,
-    PoliciesModule,
     OrganizationSettingsRoutingModule,
     AccountFingerprintComponent,
     DangerZoneComponent,
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/index.ts b/apps/web/src/app/admin-console/organizations/shared/components/integrations/index.ts
deleted file mode 100644
index c8fe9d32652..00000000000
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from "./integrations.pipe";
-export * from "./integration-card/integration-card.component";
-export * from "./integration-grid/integration-grid.component";
-export * from "./models";
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.spec.ts b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.spec.ts
deleted file mode 100644
index 382d245b235..00000000000
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.spec.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { ActivatedRoute } from "@angular/router";
-import { mock } from "jest-mock-extended";
-import { BehaviorSubject } from "rxjs";
-
-import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
-// eslint-disable-next-line no-restricted-imports
-import { OrganizationIntegrationApiService } from "@bitwarden/bit-common/dirt/integrations/services";
-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 { ToastService } from "@bitwarden/components";
-// eslint-disable-next-line no-restricted-imports
-import { SharedModule } from "@bitwarden/components/src/shared";
-import { I18nPipe } from "@bitwarden/ui-common";
-
-import { IntegrationCardComponent } from "./integration-card.component";
-
-describe("IntegrationCardComponent", () => {
-  let component: IntegrationCardComponent;
-  let fixture: ComponentFixture<IntegrationCardComponent>;
-  const mockI18nService = mock<I18nService>();
-  const activatedRoute = mock<ActivatedRoute>();
-  const mockOrgIntegrationApiService = mock<OrganizationIntegrationApiService>();
-
-  const systemTheme$ = new BehaviorSubject<ThemeType>(ThemeType.Light);
-  const usersPreferenceTheme$ = new BehaviorSubject<ThemeType>(ThemeType.Light);
-
-  beforeEach(async () => {
-    // reset system theme
-    systemTheme$.next(ThemeType.Light);
-    activatedRoute.snapshot = {
-      paramMap: {
-        get: jest.fn().mockReturnValue("test-organization-id"),
-      },
-    } as any;
-
-    await TestBed.configureTestingModule({
-      imports: [IntegrationCardComponent, SharedModule],
-      providers: [
-        { provide: ThemeStateService, useValue: { selectedTheme$: usersPreferenceTheme$ } },
-        { provide: SYSTEM_THEME_OBSERVABLE, useValue: systemTheme$ },
-        { provide: I18nPipe, useValue: mock<I18nPipe>() },
-        { provide: I18nService, useValue: mockI18nService },
-        { provide: ActivatedRoute, useValue: activatedRoute },
-        { provide: OrganizationIntegrationApiService, useValue: mockOrgIntegrationApiService },
-        { provide: ToastService, useValue: mock<ToastService>() },
-      ],
-    }).compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(IntegrationCardComponent);
-    component = fixture.componentInstance;
-
-    component.name = "Integration Name";
-    component.image = "test-image.png";
-    component.linkURL = "https://example.com/";
-
-    mockI18nService.t.mockImplementation((key) => key);
-    fixture.detectChanges();
-  });
-
-  it("assigns link href", () => {
-    const link = fixture.nativeElement.querySelector("a");
-
-    expect(link.href).toBe("https://example.com/");
-  });
-
-  it("renders card body", () => {
-    const name = fixture.nativeElement.querySelector("h3");
-
-    expect(name.textContent).toContain("Integration Name");
-  });
-
-  it("assigns external rel attribute", () => {
-    component.externalURL = true;
-    fixture.detectChanges();
-
-    const link = fixture.nativeElement.querySelector("a");
-
-    expect(link.rel).toBe("noopener noreferrer");
-  });
-
-  describe("new badge", () => {
-    beforeEach(() => {
-      jest.useFakeTimers();
-      jest.setSystemTime(new Date("2023-09-01"));
-    });
-
-    afterEach(() => {
-      jest.useRealTimers();
-    });
-
-    it("shows when expiration is in the future", () => {
-      component.newBadgeExpiration = "2023-09-02";
-      expect(component.showNewBadge()).toBe(true);
-    });
-
-    it("does not show when expiration is not set", () => {
-      expect(component.showNewBadge()).toBe(false);
-    });
-
-    it("does not show when expiration is in the past", () => {
-      component.newBadgeExpiration = "2023-08-31";
-      expect(component.showNewBadge()).toBe(false);
-    });
-
-    it("does not show when expiration is today", () => {
-      component.newBadgeExpiration = "2023-09-01";
-      expect(component.showNewBadge()).toBe(false);
-    });
-
-    it("does not show when expiration is invalid", () => {
-      component.newBadgeExpiration = "not-a-date";
-      expect(component.showNewBadge()).toBe(false);
-    });
-  });
-
-  describe("imageDarkMode", () => {
-    it("ignores theme changes when darkModeImage is not set", () => {
-      systemTheme$.next(ThemeType.Dark);
-      usersPreferenceTheme$.next(ThemeType.Dark);
-
-      fixture.detectChanges();
-
-      expect(component.imageEle.nativeElement.src).toContain("test-image.png");
-    });
-
-    describe("user prefers the system theme", () => {
-      beforeEach(() => {
-        component.imageDarkMode = "test-image-dark.png";
-      });
-
-      it("sets image src to imageDarkMode", () => {
-        usersPreferenceTheme$.next(ThemeType.System);
-        systemTheme$.next(ThemeType.Dark);
-
-        fixture.detectChanges();
-
-        expect(component.imageEle.nativeElement.src).toContain("test-image-dark.png");
-      });
-
-      it("sets image src to light mode image", () => {
-        component.imageEle.nativeElement.src = "test-image-dark.png";
-
-        usersPreferenceTheme$.next(ThemeType.System);
-        systemTheme$.next(ThemeType.Light);
-
-        fixture.detectChanges();
-
-        expect(component.imageEle.nativeElement.src).toContain("test-image.png");
-      });
-    });
-
-    describe("user prefers dark mode", () => {
-      beforeEach(() => {
-        component.imageDarkMode = "test-image-dark.png";
-      });
-
-      it("updates image to dark mode", () => {
-        systemTheme$.next(ThemeType.Light); // system theme shouldn't matter
-        usersPreferenceTheme$.next(ThemeType.Dark);
-
-        fixture.detectChanges();
-
-        expect(component.imageEle.nativeElement.src).toContain("test-image-dark.png");
-      });
-    });
-
-    describe("user prefers light mode", () => {
-      beforeEach(() => {
-        component.imageDarkMode = "test-image-dark.png";
-      });
-
-      it("updates image to light mode", () => {
-        component.imageEle.nativeElement.src = "test-image-dark.png";
-
-        systemTheme$.next(ThemeType.Dark); // system theme shouldn't matter
-        usersPreferenceTheme$.next(ThemeType.Light);
-
-        fixture.detectChanges();
-
-        expect(component.imageEle.nativeElement.src).toContain("test-image.png");
-      });
-    });
-  });
-
-  describe("connected badge", () => {
-    it("shows connected badge when isConnected is true", () => {
-      component.isConnected = true;
-
-      expect(component.showConnectedBadge()).toBe(true);
-    });
-
-    it("does not show connected badge when isConnected is false", () => {
-      component.isConnected = false;
-      fixture.detectChanges();
-      const name = fixture.nativeElement.querySelector("h3 > span > span > span");
-
-      expect(name.textContent).toContain("off");
-      // when isConnected is true/false, the badge should be shown as on/off
-      // when isConnected is undefined, the badge should not be shown
-      expect(component.showConnectedBadge()).toBe(true);
-    });
-
-    it("does not show connected badge when isConnected is undefined", () => {
-      component.isConnected = undefined;
-      expect(component.showConnectedBadge()).toBe(false);
-    });
-  });
-});
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.ts b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.ts
deleted file mode 100644
index 1d95d3182b2..00000000000
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import {
-  AfterViewInit,
-  Component,
-  ElementRef,
-  Inject,
-  Input,
-  OnDestroy,
-  ViewChild,
-} from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
-import { Observable, Subject, combineLatest, lastValueFrom, takeUntil } from "rxjs";
-
-import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
-// eslint-disable-next-line no-restricted-imports
-import {
-  OrganizationIntegrationType,
-  OrganizationIntegrationRequest,
-  OrganizationIntegrationResponse,
-  OrganizationIntegrationApiService,
-} from "@bitwarden/bit-common/dirt/integrations/index";
-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 { SharedModule } from "../../../../../../shared/shared.module";
-import { openHecConnectDialog } from "../integration-dialog/index";
-import { Integration } from "../models";
-
-@Component({
-  selector: "app-integration-card",
-  templateUrl: "./integration-card.component.html",
-  imports: [SharedModule],
-})
-export class IntegrationCardComponent implements AfterViewInit, OnDestroy {
-  private destroyed$: Subject<void> = new Subject();
-  @ViewChild("imageEle") imageEle: ElementRef<HTMLImageElement>;
-
-  @Input() name: string;
-  @Input() image: string;
-  @Input() imageDarkMode?: string;
-  @Input() linkURL: string;
-  @Input() integrationSettings: Integration;
-
-  /** Adds relevant `rel` attribute to external links */
-  @Input() externalURL?: boolean;
-
-  /**
-   * Date of when the new badge should be hidden.
-   * When omitted, the new badge is never shown.
-   *
-   * @example "2024-12-31"
-   */
-  @Input() newBadgeExpiration?: string;
-  @Input() description?: string;
-  @Input() isConnected?: boolean;
-  @Input() canSetupConnection?: boolean;
-
-  constructor(
-    private themeStateService: ThemeStateService,
-    @Inject(SYSTEM_THEME_OBSERVABLE)
-    private systemTheme$: Observable<ThemeType>,
-    private dialogService: DialogService,
-    private activatedRoute: ActivatedRoute,
-    private apiService: OrganizationIntegrationApiService,
-    private toastService: ToastService,
-    private i18nService: I18nService,
-  ) {}
-
-  ngAfterViewInit() {
-    combineLatest([this.themeStateService.selectedTheme$, this.systemTheme$])
-      .pipe(takeUntil(this.destroyed$))
-      .subscribe(([theme, systemTheme]) => {
-        // When the card doesn't have a dark mode image, exit early
-        if (!this.imageDarkMode) {
-          return;
-        }
-
-        if (theme === ThemeType.System) {
-          // When the user's preference is the system theme,
-          // use the system theme to determine the image
-          const prefersDarkMode = systemTheme === ThemeType.Dark;
-
-          this.imageEle.nativeElement.src = prefersDarkMode ? this.imageDarkMode : this.image;
-        } else if (theme === ThemeType.Dark) {
-          // When the user's preference is dark mode, use the dark mode image
-          this.imageEle.nativeElement.src = this.imageDarkMode;
-        } else {
-          // Otherwise use the light mode image
-          this.imageEle.nativeElement.src = this.image;
-        }
-      });
-  }
-
-  ngOnDestroy(): void {
-    this.destroyed$.next();
-    this.destroyed$.complete();
-  }
-
-  /** Show the "new" badge when expiration is in the future */
-  showNewBadge() {
-    if (!this.newBadgeExpiration) {
-      return false;
-    }
-
-    const expirationDate = new Date(this.newBadgeExpiration);
-
-    // Do not show the new badge for invalid dates
-    if (isNaN(expirationDate.getTime())) {
-      return false;
-    }
-
-    return expirationDate > new Date();
-  }
-
-  showConnectedBadge(): boolean {
-    return this.isConnected !== undefined;
-  }
-
-  async setupConnection() {
-    // invoke the dialog to connect the integration
-    const dialog = openHecConnectDialog(this.dialogService, {
-      data: {
-        settings: this.integrationSettings,
-      },
-    });
-
-    const result = await lastValueFrom(dialog.closed);
-
-    // the dialog was cancelled
-    if (!result || !result.success) {
-      return;
-    }
-
-    // save the integration
-    try {
-      const dbResponse = await this.saveHecIntegration(result.configuration);
-      this.isConnected = !!dbResponse.id;
-    } catch {
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t("failedToSaveIntegration"),
-      });
-      return;
-    }
-  }
-
-  async saveHecIntegration(configuration: string): Promise<OrganizationIntegrationResponse> {
-    const organizationId = this.activatedRoute.snapshot.paramMap.get(
-      "organizationId",
-    ) as OrganizationId;
-
-    const request = new OrganizationIntegrationRequest(
-      OrganizationIntegrationType.Hec,
-      configuration,
-    );
-
-    const integrations = await this.apiService.getOrganizationIntegrations(organizationId);
-    const existingIntegration = integrations.find(
-      (i) => i.type === OrganizationIntegrationType.Hec,
-    );
-
-    if (existingIntegration) {
-      return await this.apiService.updateOrganizationIntegration(
-        organizationId,
-        existingIntegration.id,
-        request,
-      );
-    } else {
-      return await this.apiService.createOrganizationIntegration(organizationId, request);
-    }
-  }
-}
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts
deleted file mode 100644
index c0af17db8d7..00000000000
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Component, Inject, OnInit } from "@angular/core";
-import { FormBuilder, Validators } from "@angular/forms";
-
-import { DIALOG_DATA, DialogConfig, DialogRef, DialogService } from "@bitwarden/components";
-import { SharedModule } from "@bitwarden/web-vault/app/shared";
-
-import { Integration } from "../../models";
-
-export type HecConnectDialogParams = {
-  settings: Integration;
-};
-
-export interface HecConnectDialogResult {
-  integrationSettings: Integration;
-  configuration: string;
-  success: boolean;
-  error: string | null;
-}
-
-@Component({
-  templateUrl: "./connect-dialog-hec.component.html",
-  imports: [SharedModule],
-})
-export class ConnectHecDialogComponent implements OnInit {
-  loading = false;
-  formGroup = this.formBuilder.group({
-    url: ["", [Validators.required, Validators.pattern("https?://.+")]],
-    bearerToken: ["", Validators.required],
-    index: ["", Validators.required],
-    service: ["", Validators.required],
-  });
-
-  constructor(
-    @Inject(DIALOG_DATA) protected connectInfo: HecConnectDialogParams,
-    protected formBuilder: FormBuilder,
-    private dialogRef: DialogRef<HecConnectDialogResult>,
-  ) {}
-
-  ngOnInit(): void {
-    const settings = this.getSettingsAsJson(this.connectInfo.settings.configuration ?? "");
-
-    if (settings) {
-      this.formGroup.patchValue({
-        url: settings?.url || "",
-        bearerToken: settings?.bearerToken || "",
-        index: settings?.index || "",
-        service: this.connectInfo.settings.name,
-      });
-    }
-  }
-
-  getSettingsAsJson(configuration: string) {
-    try {
-      return JSON.parse(configuration);
-    } catch {
-      return {};
-    }
-  }
-
-  submit = async (): Promise<void> => {
-    const formJson = this.formGroup.getRawValue();
-
-    const result: HecConnectDialogResult = {
-      integrationSettings: this.connectInfo.settings,
-      configuration: JSON.stringify(formJson),
-      success: true,
-      error: null,
-    };
-
-    this.dialogRef.close(result);
-
-    return;
-  };
-}
-
-export function openHecConnectDialog(
-  dialogService: DialogService,
-  config: DialogConfig<HecConnectDialogParams, DialogRef<HecConnectDialogResult>>,
-) {
-  return dialogService.open<HecConnectDialogResult>(ConnectHecDialogComponent, config);
-}
diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts
index 1cb95250611..2fc81fe2119 100644
--- a/apps/web/src/app/app.component.ts
+++ b/apps/web/src/app/app.component.ts
@@ -30,22 +30,6 @@ import { SearchService } from "@bitwarden/common/vault/abstractions/search.servi
 import { DialogService, ToastService } from "@bitwarden/components";
 import { KeyService, BiometricStateService } from "@bitwarden/key-management";
 
-import { PolicyListService } from "./admin-console/core/policy-list.service";
-import {
-  DisableSendPolicy,
-  MasterPasswordPolicy,
-  PasswordGeneratorPolicy,
-  OrganizationDataOwnershipPolicy,
-  vNextOrganizationDataOwnershipPolicy,
-  RequireSsoPolicy,
-  ResetPasswordPolicy,
-  SendOptionsPolicy,
-  SingleOrgPolicy,
-  TwoFactorAuthenticationPolicy,
-  RemoveUnlockWithPinPolicy,
-  RestrictedItemTypesPolicy,
-} from "./admin-console/organizations/policies";
-
 const BroadcasterSubscriptionId = "AppComponent";
 const IdleTimeout = 60000 * 10; // 10 minutes
 
@@ -79,7 +63,6 @@ export class AppComponent implements OnDestroy, OnInit {
     private serverNotificationsService: ServerNotificationsService,
     private stateService: StateService,
     private eventUploadService: EventUploadService,
-    protected policyListService: PolicyListService,
     protected configService: ConfigService,
     private dialogService: DialogService,
     private biometricStateService: BiometricStateService,
@@ -238,21 +221,6 @@ export class AppComponent implements OnDestroy, OnInit {
         }
       });
     });
-
-    this.policyListService.addPolicies([
-      new TwoFactorAuthenticationPolicy(),
-      new MasterPasswordPolicy(),
-      new RemoveUnlockWithPinPolicy(),
-      new ResetPasswordPolicy(),
-      new PasswordGeneratorPolicy(),
-      new SingleOrgPolicy(),
-      new RequireSsoPolicy(),
-      new OrganizationDataOwnershipPolicy(),
-      new vNextOrganizationDataOwnershipPolicy(),
-      new DisableSendPolicy(),
-      new SendOptionsPolicy(),
-      new RestrictedItemTypesPolicy(),
-    ]);
   }
 
   ngOnDestroy() {
@@ -290,6 +258,7 @@ 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),
     ]);
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 2993a3774d3..70f7686a2cd 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
@@ -131,8 +131,7 @@ describe("WebSetInitialPasswordService", () => {
         credentials.newPasswordHint,
         credentials.orgSsoIdentifier,
         keysRequest,
-        credentials.kdfConfig.kdfType,
-        credentials.kdfConfig.iterations,
+        credentials.kdfConfig,
       );
     });
 
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..aba5940d752 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
@@ -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..74323773e66 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
@@ -10,15 +10,19 @@ import { WebAuthnLoginPrfKeyServiceAbstraction } from "@bitwarden/common/auth/ab
 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 { 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 { 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";
 
@@ -248,6 +252,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/login/login-via-webauthn/login-via-webauthn.component.html b/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.html
index 07bd855fdf7..94dfac42976 100644
--- 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
@@ -12,7 +12,9 @@
     >
       <div class="tw-flex tw-flex-col tw-items-center">
         <ng-container *ngIf="currentState === 'assert'">
-          <bit-icon [icon]="Icons.CreatePasskeyIcon" class="tw-my-10"></bit-icon>
+          <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"
@@ -27,7 +29,9 @@
         </ng-container>
 
         <ng-container *ngIf="currentState === 'assertFailed'">
-          <bit-icon [icon]="Icons.CreatePasskeyFailedIcon" class="tw-my-10"></bit-icon>
+          <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"
diff --git a/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.ts b/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.ts
index 443005473c4..695e935b919 100644
--- a/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.ts
+++ b/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.ts
@@ -1,7 +1,10 @@
 import { Component } from "@angular/core";
 
 import { BaseLoginViaWebAuthnComponent } from "@bitwarden/angular/auth/components/base-login-via-webauthn.component";
-import { CreatePasskeyIcon, CreatePasskeyFailedIcon } from "@bitwarden/assets/svg";
+import {
+  TwoFactorAuthSecurityKeyIcon,
+  TwoFactorAuthSecurityKeyFailedIcon,
+} from "@bitwarden/assets/svg";
 
 @Component({
   selector: "app-login-via-webauthn",
@@ -10,7 +13,7 @@ import { CreatePasskeyIcon, CreatePasskeyFailedIcon } from "@bitwarden/assets/sv
 })
 export class LoginViaWebAuthnComponent extends BaseLoginViaWebAuthnComponent {
   protected readonly Icons = {
-    CreatePasskeyIcon,
-    CreatePasskeyFailedIcon,
+    TwoFactorAuthSecurityKeyIcon,
+    TwoFactorAuthSecurityKeyFailedIcon,
   };
 }
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 baa0f396fc5..04b549e7f05 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
@@ -3,6 +3,7 @@
 import { Component, Inject, OnInit } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 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";
@@ -15,7 +16,6 @@ import {
 } from "@bitwarden/components";
 
 import { SharedModule } from "../../../shared/shared.module";
-import { PremiumBadgeComponent } from "../../../vault/components/premium-badge.component";
 import { EmergencyAccessService } from "../../emergency-access";
 import { EmergencyAccessType } from "../../emergency-access/enums/emergency-access-type";
 
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 6de647dc5ce..de30205e6fe 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
@@ -3,6 +3,7 @@
 import { Component, OnInit } from "@angular/core";
 import { lastValueFrom, Observable, firstValueFrom, switchMap } from "rxjs";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -20,7 +21,6 @@ import { DialogService, ToastService } from "@bitwarden/components";
 
 import { HeaderModule } from "../../../layouts/header/header.module";
 import { SharedModule } from "../../../shared/shared.module";
-import { PremiumBadgeComponent } from "../../../vault/components/premium-badge.component";
 import { EmergencyAccessService } from "../../emergency-access";
 import { EmergencyAccessStatusType } from "../../emergency-access/enums/emergency-access-status-type";
 import { EmergencyAccessType } from "../../emergency-access/enums/emergency-access-type";
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 f0ecca1686d..60993924ded 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
@@ -134,7 +134,7 @@ describe("EmergencyViewDialogComponent", () => {
 
       component["updateTitle"]();
 
-      expect(component["title"]).toBe("viewItemType typelogin");
+      expect(component["title"]).toBe("viewItemHeaderLogin");
     });
 
     it("sets card title", () => {
@@ -142,7 +142,7 @@ describe("EmergencyViewDialogComponent", () => {
 
       component["updateTitle"]();
 
-      expect(component["title"]).toBe("viewItemType typecard");
+      expect(component["title"]).toBe("viewItemHeaderCard");
     });
 
     it("sets identity title", () => {
@@ -150,7 +150,7 @@ describe("EmergencyViewDialogComponent", () => {
 
       component["updateTitle"]();
 
-      expect(component["title"]).toBe("viewItemType typeidentity");
+      expect(component["title"]).toBe("viewItemHeaderIdentity");
     });
 
     it("sets note title", () => {
@@ -158,7 +158,7 @@ describe("EmergencyViewDialogComponent", () => {
 
       component["updateTitle"]();
 
-      expect(component["title"]).toBe("viewItemType note");
+      expect(component["title"]).toBe("viewItemHeaderNote");
     });
   });
 });
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 67612e5dcd3..656ec894f27 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
@@ -73,22 +73,20 @@ export class EmergencyViewDialogComponent {
   };
 
   private updateTitle() {
-    const partOne = "viewItemType";
-
     const type = this.cipher.type;
 
     switch (type) {
       case CipherType.Login:
-        this.title = this.i18nService.t(partOne, this.i18nService.t("typeLogin").toLowerCase());
+        this.title = this.i18nService.t("viewItemHeaderLogin");
         break;
       case CipherType.Card:
-        this.title = this.i18nService.t(partOne, this.i18nService.t("typeCard").toLowerCase());
+        this.title = this.i18nService.t("viewItemHeaderCard");
         break;
       case CipherType.Identity:
-        this.title = this.i18nService.t(partOne, this.i18nService.t("typeIdentity").toLowerCase());
+        this.title = this.i18nService.t("viewItemHeaderIdentity");
         break;
       case CipherType.SecureNote:
-        this.title = this.i18nService.t(partOne, this.i18nService.t("note").toLowerCase());
+        this.title = this.i18nService.t("viewItemHeaderNote");
         break;
     }
   }
diff --git a/apps/web/src/app/auth/settings/security/device-management-old.component.html b/apps/web/src/app/auth/settings/security/device-management-old.component.html
deleted file mode 100644
index da01d0fe8f4..00000000000
--- a/apps/web/src/app/auth/settings/security/device-management-old.component.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<bit-container>
-  <div class="tw-mt-6 tw-mb-2 tw-pb-2.5">
-    <div class="tw-flex tw-items-center tw-gap-2">
-      <h1 class="tw-m-0">{{ "devices" | i18n }}</h1>
-      <button
-        [bitPopoverTriggerFor]="infoPopover"
-        type="button"
-        class="tw-border-none tw-bg-transparent tw-text-primary-600 tw-flex tw-items-center tw-size-4"
-        [position]="'right-start'"
-      >
-        <i class="bwi bwi-question-circle" aria-hidden="true"></i>
-      </button>
-      <bit-popover [title]="'whatIsADevice' | i18n" #infoPopover>
-        <p class="tw-mb-0">{{ "aDeviceIs" | i18n }}</p>
-      </bit-popover>
-      <i
-        *ngIf="asyncActionLoading"
-        class="bwi bwi-spinner bwi-spin tw-flex tw-items-center tw-size-4"
-        aria-hidden="true"
-      ></i>
-    </div>
-  </div>
-
-  <p>{{ "deviceListDescriptionTemp" | i18n }}</p>
-
-  <div *ngIf="loading" class="tw-flex tw-justify-center tw-items-center tw-p-4">
-    <i class="bwi bwi-spinner bwi-spin tw-text-2xl" aria-hidden="true"></i>
-  </div>
-
-  <bit-table-scroll *ngIf="!loading" [dataSource]="dataSource" [rowSize]="50">
-    <ng-container header>
-      <th
-        *ngFor="let col of columnConfig"
-        [class]="col.headerClass"
-        bitCell
-        [bitSortable]="col.sortable ? col.name : null"
-        [default]="col.name === 'loginStatus' ? 'desc' : null"
-        scope="col"
-        role="columnheader"
-      >
-        {{ col.title }}
-      </th>
-      <!-- TODO: Add a column for the device actions when available -->
-      <!-- <th bitCell scope="col" role="columnheader"></th> -->
-    </ng-container>
-    <ng-template bitRowDef let-row>
-      <td bitCell class="tw-flex tw-gap-2">
-        <div class="tw-flex tw-items-center tw-justify-center tw-w-10">
-          <i [class]="getDeviceIcon(row.type)" class="bwi-lg" aria-hidden="true"></i>
-        </div>
-        <div>
-          <ng-container *ngIf="row.hasPendingAuthRequest">
-            <a bitLink href="#" appStopClick (click)="managePendingAuthRequest(row)">
-              {{ row.displayName }}
-            </a>
-
-            <span class="tw-text-sm tw-text-muted tw-block">
-              {{ "needsApproval" | i18n }}
-            </span>
-          </ng-container>
-          <ng-container *ngIf="!row.hasPendingAuthRequest">
-            {{ row.displayName }}
-            <span
-              *ngIf="row.trusted && !row.hasPendingAuthRequest"
-              class="tw-text-sm tw-text-muted tw-block"
-            >
-              {{ "trusted" | i18n }}
-            </span>
-          </ng-container>
-        </div>
-      </td>
-      <td bitCell>
-        <span *ngIf="isCurrentDevice(row)" bitBadge variant="primary">{{
-          "currentSession" | i18n
-        }}</span>
-        <span *ngIf="row.hasPendingAuthRequest" bitBadge variant="warning">{{
-          "requestPending" | i18n
-        }}</span>
-      </td>
-      <td bitCell>{{ row.firstLogin | date: "medium" }}</td>
-      <!-- <td bitCell>
-        <button
-          type="button"
-          bitIconButton="bwi-ellipsis-v"
-          [bitMenuTriggerFor]="optionsMenu"
-        ></button>
-        <bit-menu #optionsMenu>
-          Remove device button to be re-added later when we have per device session de-authentication. 
-          <button
-            type="button"
-            bitMenuItem
-            (click)="removeDevice(row)"
-            [disabled]="isCurrentDevice(row)"
-          >
-            <span [class]="isCurrentDevice(row) ? 'tw-text-muted' : 'tw-text-danger'">
-              <i class="bwi bwi-trash" aria-hidden="true"></i>
-              {{ "removeDevice" | i18n }}
-            </span>
-          </button>
-        </bit-menu>
-      </td> -->
-    </ng-template>
-  </bit-table-scroll>
-</bit-container>
diff --git a/apps/web/src/app/auth/settings/security/device-management-old.component.spec.ts b/apps/web/src/app/auth/settings/security/device-management-old.component.spec.ts
deleted file mode 100644
index 64fb9003ccf..00000000000
--- a/apps/web/src/app/auth/settings/security/device-management-old.component.spec.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { RouterTestingModule } from "@angular/router/testing";
-import { of, Subject } from "rxjs";
-
-import { AuthRequestApiServiceAbstraction } from "@bitwarden/auth/common";
-import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
-import { DeviceView } from "@bitwarden/common/auth/abstractions/devices/views/device.view";
-import { DeviceType } from "@bitwarden/common/enums";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { MessageListener } from "@bitwarden/common/platform/messaging";
-import {
-  DialogService,
-  ToastService,
-  TableModule,
-  PopoverModule,
-  LayoutComponent,
-} from "@bitwarden/components";
-
-import { SharedModule } from "../../../shared";
-import { VaultBannersService } from "../../../vault/individual-vault/vault-banners/services/vault-banners.service";
-
-import { DeviceManagementOldComponent } from "./device-management-old.component";
-
-class MockResizeObserver {
-  observe = jest.fn();
-  unobserve = jest.fn();
-  disconnect = jest.fn();
-}
-
-global.ResizeObserver = MockResizeObserver;
-
-interface Message {
-  command: string;
-  notificationId?: string;
-}
-
-describe("DeviceManagementOldComponent", () => {
-  let fixture: ComponentFixture<DeviceManagementOldComponent>;
-  let messageSubject: Subject<Message>;
-  let mockDevices: DeviceView[];
-  let vaultBannersService: VaultBannersService;
-
-  const mockDeviceResponse = {
-    id: "test-id",
-    requestDeviceType: "test-type",
-    requestDeviceTypeValue: DeviceType.Android,
-    requestDeviceIdentifier: "test-identifier",
-    requestIpAddress: "127.0.0.1",
-    creationDate: new Date().toISOString(),
-    responseDate: null,
-    key: "test-key",
-    masterPasswordHash: null,
-    publicKey: "test-public-key",
-    requestApproved: false,
-    origin: "test-origin",
-  };
-
-  beforeEach(async () => {
-    messageSubject = new Subject<Message>();
-    mockDevices = [];
-
-    await TestBed.configureTestingModule({
-      imports: [
-        RouterTestingModule,
-        SharedModule,
-        TableModule,
-        PopoverModule,
-        DeviceManagementOldComponent,
-      ],
-      providers: [
-        {
-          provide: DevicesServiceAbstraction,
-          useValue: {
-            getDevices$: jest.fn().mockReturnValue(mockDevices),
-            getCurrentDevice$: jest.fn().mockReturnValue(of(null)),
-            getDeviceByIdentifier$: jest.fn().mockReturnValue(of(null)),
-            updateTrustedDeviceKeys: jest.fn(),
-          },
-        },
-        {
-          provide: AuthRequestApiServiceAbstraction,
-          useValue: {
-            getAuthRequest: jest.fn().mockResolvedValue(mockDeviceResponse),
-          },
-        },
-        {
-          provide: MessageListener,
-          useValue: {
-            allMessages$: messageSubject.asObservable(),
-          },
-        },
-        {
-          provide: DialogService,
-          useValue: {
-            openSimpleDialog: jest.fn(),
-          },
-        },
-        {
-          provide: ToastService,
-          useValue: {
-            success: jest.fn(),
-            error: jest.fn(),
-          },
-        },
-        {
-          provide: VaultBannersService,
-          useValue: {
-            shouldShowPendingAuthRequestBanner: jest.fn(),
-          },
-        },
-        {
-          provide: I18nService,
-          useValue: {
-            t: jest.fn((key: string) => key),
-          },
-        },
-        {
-          provide: ValidationService,
-          useValue: {
-            showError: jest.fn(),
-          },
-        },
-        {
-          provide: LayoutComponent,
-          useValue: {
-            mainContent: jest.fn(),
-          },
-        },
-      ],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(DeviceManagementOldComponent);
-
-    vaultBannersService = TestBed.inject(VaultBannersService);
-  });
-
-  describe("message listener", () => {
-    beforeEach(() => {
-      jest.spyOn(vaultBannersService, "shouldShowPendingAuthRequestBanner").mockResolvedValue(true);
-    });
-
-    it("ignores other message types", async () => {
-      const initialDataLength = (fixture.componentInstance as any).dataSource.data.length;
-      const message: Message = { command: "other", notificationId: "test-id" };
-      messageSubject.next(message);
-      await fixture.whenStable();
-
-      expect((fixture.componentInstance as any).dataSource.data.length).toBe(initialDataLength);
-    });
-
-    it("adds device to table when auth request message received", async () => {
-      const initialDataLength = (fixture.componentInstance as any).dataSource.data.length;
-      const message: Message = {
-        command: "openLoginApproval",
-        notificationId: "test-id",
-      };
-
-      messageSubject.next(message);
-      fixture.detectChanges();
-      await fixture.whenStable();
-
-      const dataSource = (fixture.componentInstance as any).dataSource;
-      expect(dataSource.data.length).toBe(initialDataLength + 1);
-
-      const addedDevice = dataSource.data[0];
-      expect(addedDevice).toEqual({
-        id: "",
-        type: mockDeviceResponse.requestDeviceTypeValue,
-        displayName: expect.any(String),
-        loginStatus: "requestPending",
-        firstLogin: expect.any(Date),
-        trusted: false,
-        devicePendingAuthRequest: {
-          id: mockDeviceResponse.id,
-          creationDate: mockDeviceResponse.creationDate,
-        },
-        hasPendingAuthRequest: true,
-        identifier: mockDeviceResponse.requestDeviceIdentifier,
-      });
-    });
-
-    it("stops listening when component is destroyed", async () => {
-      fixture.destroy();
-      const message: Message = {
-        command: "openLoginApproval",
-        notificationId: "test-id",
-      };
-      messageSubject.next(message);
-      expect((fixture.componentInstance as any).dataSource.data.length).toBe(0);
-    });
-  });
-});
diff --git a/apps/web/src/app/auth/settings/security/device-management-old.component.ts b/apps/web/src/app/auth/settings/security/device-management-old.component.ts
deleted file mode 100644
index 816da6e873f..00000000000
--- a/apps/web/src/app/auth/settings/security/device-management-old.component.ts
+++ /dev/null
@@ -1,373 +0,0 @@
-import { CommonModule } from "@angular/common";
-import { Component, DestroyRef } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { firstValueFrom } from "rxjs";
-
-import { LoginApprovalDialogComponent } from "@bitwarden/angular/auth/login-approval";
-import { AuthRequestApiServiceAbstraction } from "@bitwarden/auth/common";
-import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
-import {
-  DevicePendingAuthRequest,
-  DeviceResponse,
-} from "@bitwarden/common/auth/abstractions/devices/responses/device.response";
-import { DeviceView } from "@bitwarden/common/auth/abstractions/devices/views/device.view";
-import { DeviceType, DeviceTypeMetadata } from "@bitwarden/common/enums";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { MessageListener } from "@bitwarden/common/platform/messaging";
-import {
-  DialogService,
-  ToastService,
-  TableDataSource,
-  TableModule,
-  PopoverModule,
-} from "@bitwarden/components";
-
-import { SharedModule } from "../../../shared";
-
-/**
- * Interface representing a row in the device management table
- */
-interface DeviceTableData {
-  id: string;
-  type: DeviceType;
-  displayName: string;
-  loginStatus: string;
-  firstLogin: Date;
-  trusted: boolean;
-  devicePendingAuthRequest: DevicePendingAuthRequest | null;
-  hasPendingAuthRequest: boolean;
-  identifier: string;
-}
-
-/**
- * Provides a table of devices and allows the user to log out, approve or remove a device
- */
-@Component({
-  selector: "app-device-management",
-  templateUrl: "./device-management-old.component.html",
-  imports: [CommonModule, SharedModule, TableModule, PopoverModule],
-})
-export class DeviceManagementOldComponent {
-  protected dataSource = new TableDataSource<DeviceTableData>();
-  protected currentDevice: DeviceView | undefined;
-  protected loading = true;
-  protected asyncActionLoading = false;
-
-  constructor(
-    private i18nService: I18nService,
-    private devicesService: DevicesServiceAbstraction,
-    private dialogService: DialogService,
-    private toastService: ToastService,
-    private validationService: ValidationService,
-    private messageListener: MessageListener,
-    private authRequestApiService: AuthRequestApiServiceAbstraction,
-    private destroyRef: DestroyRef,
-  ) {
-    void this.initializeDevices();
-  }
-
-  /**
-   * Initialize the devices list and set up the message listener
-   */
-  private async initializeDevices(): Promise<void> {
-    try {
-      await this.loadDevices();
-
-      this.messageListener.allMessages$
-        .pipe(takeUntilDestroyed(this.destroyRef))
-        .subscribe((message) => {
-          if (message.command !== "openLoginApproval") {
-            return;
-          }
-          // Handle inserting a new device when an auth request is received
-          this.upsertDeviceWithPendingAuthRequest(
-            message as { command: string; notificationId: string },
-          ).catch((error) => this.validationService.showError(error));
-        });
-    } catch (error) {
-      this.validationService.showError(error);
-    }
-  }
-
-  /**
-   * Handle inserting a new device when an auth request is received
-   * @param message - The auth request message
-   */
-  private async upsertDeviceWithPendingAuthRequest(message: {
-    command: string;
-    notificationId: string;
-  }): Promise<void> {
-    const requestId = message.notificationId;
-    if (!requestId) {
-      return;
-    }
-
-    const authRequestResponse = await this.authRequestApiService.getAuthRequest(requestId);
-    if (!authRequestResponse) {
-      return;
-    }
-
-    // Add new device to the table
-    const upsertDevice: DeviceTableData = {
-      id: "",
-      type: authRequestResponse.requestDeviceTypeValue,
-      displayName: this.getHumanReadableDeviceType(authRequestResponse.requestDeviceTypeValue),
-      loginStatus: this.i18nService.t("requestPending"),
-      firstLogin: new Date(authRequestResponse.creationDate),
-      trusted: false,
-      devicePendingAuthRequest: {
-        id: authRequestResponse.id,
-        creationDate: authRequestResponse.creationDate,
-      },
-      hasPendingAuthRequest: true,
-      identifier: authRequestResponse.requestDeviceIdentifier,
-    };
-
-    // If the device already exists in the DB, update the device id and first login date
-    if (authRequestResponse.requestDeviceIdentifier) {
-      const existingDevice = await firstValueFrom(
-        this.devicesService.getDeviceByIdentifier$(authRequestResponse.requestDeviceIdentifier),
-      );
-
-      if (existingDevice?.id && existingDevice.creationDate) {
-        upsertDevice.id = existingDevice.id;
-        upsertDevice.firstLogin = new Date(existingDevice.creationDate);
-      }
-    }
-
-    const existingDeviceIndex = this.dataSource.data.findIndex(
-      (device) => device.identifier === upsertDevice.identifier,
-    );
-
-    if (existingDeviceIndex >= 0) {
-      // Update existing device
-      this.dataSource.data[existingDeviceIndex] = upsertDevice;
-      this.dataSource.data = [...this.dataSource.data];
-    } else {
-      // Add new device
-      this.dataSource.data = [upsertDevice, ...this.dataSource.data];
-    }
-  }
-
-  /**
-   * Load current device and all devices
-   */
-  private async loadDevices(): Promise<void> {
-    try {
-      const currentDevice = await firstValueFrom(this.devicesService.getCurrentDevice$());
-      const devices = await firstValueFrom(this.devicesService.getDevices$());
-
-      if (!currentDevice || !devices) {
-        this.loading = false;
-        return;
-      }
-
-      this.currentDevice = new DeviceView(currentDevice);
-      this.updateDeviceTable(devices);
-    } catch (error) {
-      this.validationService.showError(error);
-    } finally {
-      this.loading = false;
-    }
-  }
-
-  /**
-   * Updates the device table with the latest device data
-   * @param devices - Array of device views to display in the table
-   */
-  private updateDeviceTable(devices: Array<DeviceView>): void {
-    this.dataSource.data = devices
-      .map((device: DeviceView): DeviceTableData | null => {
-        if (!device.id) {
-          this.validationService.showError(new Error(this.i18nService.t("deviceIdMissing")));
-          return null;
-        }
-
-        if (device.type == undefined) {
-          this.validationService.showError(new Error(this.i18nService.t("deviceTypeMissing")));
-          return null;
-        }
-
-        if (!device.creationDate) {
-          this.validationService.showError(
-            new Error(this.i18nService.t("deviceCreationDateMissing")),
-          );
-          return null;
-        }
-
-        const hasPendingRequest = device.response
-          ? this.hasPendingAuthRequest(device.response)
-          : false;
-        return {
-          id: device.id,
-          type: device.type,
-          displayName: this.getHumanReadableDeviceType(device.type),
-          loginStatus: this.getLoginStatus(device),
-          firstLogin: new Date(device.creationDate),
-          trusted: device.response?.isTrusted ?? false,
-          devicePendingAuthRequest: device.response?.devicePendingAuthRequest ?? null,
-          hasPendingAuthRequest: hasPendingRequest,
-          identifier: device.identifier ?? "",
-        };
-      })
-      .filter((device): device is DeviceTableData => device !== null);
-  }
-
-  /**
-   * Column configuration for the table
-   */
-  protected readonly columnConfig = [
-    {
-      name: "displayName",
-      title: this.i18nService.t("device"),
-      headerClass: "tw-w-1/3",
-      sortable: true,
-    },
-    {
-      name: "loginStatus",
-      title: this.i18nService.t("loginStatus"),
-      headerClass: "tw-w-1/3",
-      sortable: true,
-    },
-    {
-      name: "firstLogin",
-      title: this.i18nService.t("firstLogin"),
-      headerClass: "tw-w-1/3",
-      sortable: true,
-    },
-  ];
-
-  /**
-   * Get the icon for a device type
-   * @param type - The device type
-   * @returns The icon for the device type
-   */
-  getDeviceIcon(type: DeviceType): string {
-    const defaultIcon = "bwi bwi-desktop";
-    const categoryIconMap: Record<string, string> = {
-      webVault: "bwi bwi-browser",
-      desktop: "bwi bwi-desktop",
-      mobile: "bwi bwi-mobile",
-      cli: "bwi bwi-cli",
-      extension: "bwi bwi-puzzle",
-      sdk: "bwi bwi-desktop",
-    };
-
-    const metadata = DeviceTypeMetadata[type];
-    return metadata ? (categoryIconMap[metadata.category] ?? defaultIcon) : defaultIcon;
-  }
-
-  /**
-   * Get the login status of a device
-   * It will return the current session if the device is the current device
-   * It will return the date of the pending auth request when available
-   * @param device - The device
-   * @returns The login status
-   */
-  private getLoginStatus(device: DeviceView): string {
-    if (this.isCurrentDevice(device)) {
-      return this.i18nService.t("currentSession");
-    }
-
-    if (device?.response?.devicePendingAuthRequest?.creationDate) {
-      return this.i18nService.t("requestPending");
-    }
-
-    return "";
-  }
-
-  /**
-   * Get a human readable device type from the DeviceType enum
-   * @param type - The device type
-   * @returns The human readable device type
-   */
-  private getHumanReadableDeviceType(type: DeviceType): string {
-    const metadata = DeviceTypeMetadata[type];
-    if (!metadata) {
-      return this.i18nService.t("unknownDevice");
-    }
-
-    // If the platform is "Unknown" translate it since it is not a proper noun
-    const platform =
-      metadata.platform === "Unknown" ? this.i18nService.t("unknown") : metadata.platform;
-    const category = this.i18nService.t(metadata.category);
-    return platform ? `${category} - ${platform}` : category;
-  }
-
-  /**
-   * Check if a device is the current device
-   * @param device - The device or device table data
-   * @returns True if the device is the current device, false otherwise
-   */
-  protected isCurrentDevice(device: DeviceView | DeviceTableData): boolean {
-    return "response" in device
-      ? device.id === this.currentDevice?.id
-      : device.id === this.currentDevice?.id;
-  }
-
-  /**
-   * Check if a device has a pending auth request
-   * @param device - The device response
-   * @returns True if the device has a pending auth request, false otherwise
-   */
-  private hasPendingAuthRequest(device: DeviceResponse): boolean {
-    return (
-      device.devicePendingAuthRequest !== undefined && device.devicePendingAuthRequest !== null
-    );
-  }
-
-  /**
-   * Open a dialog to approve or deny a pending auth request for a device
-   */
-  async managePendingAuthRequest(device: DeviceTableData) {
-    if (device.devicePendingAuthRequest === undefined || device.devicePendingAuthRequest === null) {
-      return;
-    }
-
-    const dialogRef = LoginApprovalDialogComponent.open(this.dialogService, {
-      notificationId: device.devicePendingAuthRequest.id,
-    });
-
-    const result = await firstValueFrom(dialogRef.closed);
-
-    if (result !== undefined && typeof result === "boolean") {
-      // auth request approved or denied so reset
-      device.devicePendingAuthRequest = null;
-      device.hasPendingAuthRequest = false;
-    }
-  }
-
-  /**
-   * Remove a device
-   * @param device - The device
-   */
-  protected async removeDevice(device: DeviceTableData) {
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: { key: "removeDevice" },
-      content: { key: "removeDeviceConfirmation" },
-      type: "warning",
-    });
-
-    if (!confirmed) {
-      return;
-    }
-
-    try {
-      this.asyncActionLoading = true;
-      await firstValueFrom(this.devicesService.deactivateDevice$(device.id));
-      this.asyncActionLoading = false;
-
-      // Remove the device from the data source
-      this.dataSource.data = this.dataSource.data.filter((d) => d.id !== device.id);
-
-      this.toastService.showToast({
-        title: "",
-        message: this.i18nService.t("deviceRemoved"),
-        variant: "success",
-      });
-    } catch (error) {
-      this.validationService.showError(error);
-    }
-  }
-}
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 c77109936ee..9d16d4380eb 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
@@ -8,10 +8,10 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { DialogService } from "@bitwarden/components";
 
+import { ChangeKdfModule } from "../../../key-management/change-kdf/change-kdf.module";
 import { SharedModule } from "../../../shared";
 
 import { ApiKeyComponent } from "./api-key.component";
-import { ChangeKdfModule } from "./change-kdf/change-kdf.module";
 
 @Component({
   templateUrl: "security-keys.component.html",
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 f7586329380..ba476dc9106 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,12 +2,9 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { DeviceManagementComponent } from "@bitwarden/angular/auth/device-management/device-management.component";
-import { featureFlaggedRoute } from "@bitwarden/angular/platform/utils/feature-flagged-route";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
 import { TwoFactorSetupComponent } from "../two-factor/two-factor-setup.component";
 
-import { DeviceManagementOldComponent } from "./device-management-old.component";
 import { PasswordSettingsComponent } from "./password-settings/password-settings.component";
 import { SecurityKeysComponent } from "./security-keys.component";
 import { SecurityComponent } from "./security.component";
@@ -34,15 +31,11 @@ const routes: Routes = [
         component: SecurityKeysComponent,
         data: { titleId: "keys" },
       },
-      ...featureFlaggedRoute({
-        defaultComponent: DeviceManagementOldComponent,
-        flaggedComponent: DeviceManagementComponent,
-        featureFlag: FeatureFlag.PM14938_BrowserExtensionLoginApproval,
-        routeOptions: {
-          path: "device-management",
-          data: { titleId: "devices" },
-        },
-      }),
+      {
+        path: "device-management",
+        component: DeviceManagementComponent,
+        data: { titleId: "devices" },
+      },
     ],
   },
 ];
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 e538e72a77e..043c27998cd 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
@@ -12,6 +12,7 @@ import {
   switchMap,
 } from "rxjs";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
@@ -35,7 +36,6 @@ import { DialogRef, DialogService, ItemModule } from "@bitwarden/components";
 
 import { HeaderModule } from "../../../layouts/header/header.module";
 import { SharedModule } from "../../../shared/shared.module";
-import { PremiumBadgeComponent } from "../../../vault/components/premium-badge.component";
 
 import { TwoFactorRecoveryComponent } from "./two-factor-recovery.component";
 import { TwoFactorSetupAuthenticatorComponent } from "./two-factor-setup-authenticator.component";
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html
index 01c0e94dc0f..305bb8e7f9c 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html
@@ -15,7 +15,9 @@
       </ng-container>
 
       <div *ngIf="currentStep === 'credentialCreation'" class="tw-flex tw-flex-col tw-items-center">
-        <bit-icon [icon]="Icons.CreatePasskeyIcon" class="tw-mb-6"></bit-icon>
+        <div class="tw-size-24 tw-content-center tw-mb-6">
+          <bit-icon [icon]="Icons.TwoFactorAuthSecurityKeyIcon"></bit-icon>
+        </div>
         <h3 bitTypography="h3">{{ "creatingPasskeyLoading" | i18n }}</h3>
         <p bitTypography="body1">{{ "creatingPasskeyLoadingInfo" | i18n }}</p>
       </div>
@@ -24,7 +26,9 @@
         *ngIf="currentStep === 'credentialCreationFailed'"
         class="tw-flex tw-flex-col tw-items-center"
       >
-        <bit-icon [icon]="Icons.CreatePasskeyFailedIcon" class="tw-mb-6"></bit-icon>
+        <div class="tw-size-24 tw-content-center tw-mb-6">
+          <bit-icon [icon]="Icons.TwoFactorAuthSecurityKeyFailedIcon"></bit-icon>
+        </div>
         <h3 bitTypography="h3">{{ "errorCreatingPasskey" | i18n }}</h3>
         <p bitTypography="body1">{{ "errorCreatingPasskeyInfo" | i18n }}</p>
       </div>
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 35e5048b1af..04b148e8a0a 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
@@ -4,7 +4,10 @@ import { Component, OnInit } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { firstValueFrom, map, Observable } from "rxjs";
 
-import { CreatePasskeyFailedIcon, CreatePasskeyIcon } from "@bitwarden/assets/svg";
+import {
+  TwoFactorAuthSecurityKeyFailedIcon,
+  TwoFactorAuthSecurityKeyIcon,
+} from "@bitwarden/assets/svg";
 import { PrfKeySet } from "@bitwarden/auth/common";
 import { Verification } from "@bitwarden/common/auth/types/verification";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
@@ -37,8 +40,8 @@ export class CreateCredentialDialogComponent implements OnInit {
   protected readonly NameMaxCharacters = 50;
   protected readonly CreateCredentialDialogResult = CreateCredentialDialogResult;
   protected readonly Icons = {
-    CreatePasskeyIcon,
-    CreatePasskeyFailedIcon,
+    TwoFactorAuthSecurityKeyIcon,
+    TwoFactorAuthSecurityKeyFailedIcon,
   };
 
   protected currentStep: Step = "userVerification";
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/index.ts b/apps/web/src/app/billing/clients/index.ts
index ff962abcbf3..17f64248cfa 100644
--- a/apps/web/src/app/billing/clients/index.ts
+++ b/apps/web/src/app/billing/clients/index.ts
@@ -1,2 +1,3 @@
 export * from "./organization-billing.client";
 export * from "./subscriber-billing.client";
+export * from "./tax.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/organization-is-unmanaged.guard.ts b/apps/web/src/app/billing/guards/organization-is-unmanaged.guard.ts
index 75054d78db1..8f7eeaafb70 100644
--- a/apps/web/src/app/billing/guards/organization-is-unmanaged.guard.ts
+++ b/apps/web/src/app/billing/guards/organization-is-unmanaged.guard.ts
@@ -35,7 +35,7 @@ export const organizationIsUnmanaged: CanActivateFn = async (route: ActivatedRou
     return true;
   }
 
-  const provider = await providerService.get(organization.providerId);
+  const provider = await firstValueFrom(providerService.get$(organization.providerId, userId));
 
   if (!provider) {
     return true;
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/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..bb0ca60b677 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
@@ -3,8 +3,6 @@ import { RouterModule, Routes } from "@angular/router";
 
 import { AccountPaymentDetailsComponent } from "@bitwarden/web-vault/app/billing/individual/payment-details/account-payment-details.component";
 
-import { PaymentMethodComponent } from "../shared";
-
 import { BillingHistoryViewComponent } from "./billing-history-view.component";
 import { PremiumComponent } from "./premium/premium.component";
 import { SubscriptionComponent } from "./subscription.component";
@@ -27,11 +25,6 @@ const routes: Routes = [
         component: PremiumComponent,
         data: { titleId: "goPremium" },
       },
-      {
-        path: "payment-method",
-        component: PaymentMethodComponent,
-        data: { titleId: "paymentMethod" },
-      },
       {
         path: "payment-details",
         component: AccountPaymentDetailsComponent,
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..20f2a6cc143 100644
--- a/apps/web/src/app/billing/individual/individual-billing.module.ts
+++ b/apps/web/src/app/billing/individual/individual-billing.module.ts
@@ -1,5 +1,10 @@
 import { NgModule } from "@angular/core";
 
+import {
+  EnterBillingAddressComponent,
+  EnterPaymentMethodComponent,
+} from "@bitwarden/web-vault/app/billing/payment/components";
+
 import { HeaderModule } from "../../layouts/header/header.module";
 import { BillingSharedModule } from "../shared";
 
@@ -10,7 +15,13 @@ import { SubscriptionComponent } from "./subscription.component";
 import { UserSubscriptionComponent } from "./user-subscription.component";
 
 @NgModule({
-  imports: [IndividualBillingRoutingModule, BillingSharedModule, HeaderModule],
+  imports: [
+    IndividualBillingRoutingModule,
+    BillingSharedModule,
+    HeaderModule,
+    EnterPaymentMethodComponent,
+    EnterBillingAddressComponent,
+  ],
   declarations: [
     SubscriptionComponent,
     BillingHistoryViewComponent,
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..ca7902542de 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,13 +13,6 @@ 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;
@@ -56,23 +34,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 +48,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 +57,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/premium.component.html b/apps/web/src/app/billing/individual/premium/premium.component.html
index 3f0f97541df..52ebe7803df 100644
--- a/apps/web/src/app/billing/individual/premium/premium.component.html
+++ b/apps/web/src/app/billing/individual/premium/premium.component.html
@@ -70,7 +70,7 @@
     (onLicenseFileUploaded)="onLicenseFileSelectedChanged()"
   />
 </bit-section>
-<form *ngIf="!isSelfHost" [formGroup]="addOnFormGroup" [bitSubmit]="submitPayment">
+<form *ngIf="!isSelfHost" [formGroup]="formGroup" [bitSubmit]="submitPayment">
   <bit-section>
     <h2 bitTypography="h2">{{ "addons" | i18n }}</h2>
     <div class="tw-grid tw-grid-cols-12 tw-gap-4">
@@ -93,15 +93,25 @@
   <bit-section>
     <h2 bitTypography="h2">{{ "summary" | i18n }}</h2>
     {{ "premiumMembership" | i18n }}: {{ premiumPrice | currency: "$" }} <br />
-    {{ "additionalStorageGb" | i18n }}: {{ addOnFormGroup.value.additionalStorage || 0 }} GB &times;
+    {{ "additionalStorageGb" | i18n }}: {{ formGroup.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">
+      <app-enter-payment-method
+        [group]="formGroup.controls.paymentMethod"
+        [showBankAccount]="false"
+      >
+      </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 | currency: "USD $" }}</span>
diff --git a/apps/web/src/app/billing/individual/premium/premium.component.ts b/apps/web/src/app/billing/individual/premium/premium.component.ts
index 974c22455ff..d5062e34881 100644
--- a/apps/web/src/app/billing/individual/premium/premium.component.ts
+++ b/apps/web/src/app/billing/individual/premium/premium.component.ts
@@ -9,36 +9,34 @@ 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";
+import { 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";
 
 @Component({
   templateUrl: "./premium.component.html",
   standalone: false,
+  providers: [TaxClient],
 })
 export class PremiumComponent {
-  @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
-  @ViewChild(TaxInfoComponent) taxInfoComponent: TaxInfoComponent;
+  @ViewChild(EnterPaymentMethodComponent) enterPaymentMethodComponent!: EnterPaymentMethodComponent;
 
   protected hasPremiumFromAnyOrganization$: Observable<boolean>;
 
-  protected addOnFormGroup = new FormGroup({
+  protected formGroup = new FormGroup({
     additionalStorage: new FormControl<number>(0, [Validators.min(0), Validators.max(99)]),
-  });
-
-  protected licenseFormGroup = new FormGroup({
-    file: new FormControl<File>(null, [Validators.required]),
+    paymentMethod: EnterPaymentMethodComponent.getFormGroup(),
+    billingAddress: EnterBillingAddressComponent.getFormGroup(),
   });
 
   protected cloudWebVaultURL: string;
@@ -53,16 +51,14 @@ export class PremiumComponent {
     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,
+    private taxClient: TaxClient,
   ) {
     this.isSelfHost = this.platformUtilsService.isSelfHost();
 
@@ -93,11 +89,13 @@ export class PremiumComponent {
       )
       .subscribe();
 
-    this.addOnFormGroup.controls.additionalStorage.valueChanges
-      .pipe(debounceTime(1000), takeUntilDestroyed())
-      .subscribe(() => {
-        this.refreshSalesTax();
-      });
+    this.formGroup.valueChanges
+      .pipe(
+        debounceTime(1000),
+        switchMap(async () => await this.refreshSalesTax()),
+        takeUntilDestroyed(),
+      )
+      .subscribe();
   }
 
   finalizeUpgrade = async () => {
@@ -117,53 +115,21 @@ export class PremiumComponent {
   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) {
+    if (this.formGroup.invalid) {
       return;
     }
 
-    const { type, token } = await this.paymentComponent.tokenize();
+    const paymentMethod = await this.enterPaymentMethodComponent.tokenize();
+
+    const legacyEnum = tokenizablePaymentMethodToLegacyEnum(paymentMethod.type);
 
     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);
+    formData.append("paymentMethodType", legacyEnum.toString());
+    formData.append("paymentToken", paymentMethod.token);
+    formData.append("additionalStorageGb", this.formGroup.value.additionalStorage.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();
@@ -171,7 +137,7 @@ export class PremiumComponent {
   };
 
   protected get additionalStorageCost(): number {
-    return this.storageGBPrice * this.addOnFormGroup.value.additionalStorage;
+    return this.storageGBPrice * this.formGroup.value.additionalStorage;
   }
 
   protected get premiumURL(): string {
@@ -190,35 +156,18 @@ export class PremiumComponent {
     await this.postFinalizeUpgrade();
   }
 
-  private refreshSalesTax(): void {
-    if (!this.taxInfoComponent.country || !this.taxInfoComponent.postalCode) {
+  private async refreshSalesTax(): Promise<void> {
+    if (this.formGroup.invalid) {
       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),
-        });
-      });
-  }
+    const billingAddress = getBillingAddressFromForm(this.formGroup.controls.billingAddress);
 
-  protected onTaxInformationChanged(): void {
-    this.refreshSalesTax();
+    const taxAmounts = await this.taxClient.previewTaxForPremiumSubscriptionPurchase(
+      this.formGroup.value.additionalStorage,
+      billingAddress,
+    );
+
+    this.estimatedTax = taxAmounts.tax;
   }
 }
diff --git a/apps/web/src/app/billing/individual/subscription.component.html b/apps/web/src/app/billing/individual/subscription.component.html
index fa2eb0412a9..f9a46cf56ad 100644
--- a/apps/web/src/app/billing/individual/subscription.component.html
+++ b/apps/web/src/app/billing/individual/subscription.component.html
@@ -3,10 +3,7 @@
     <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>
diff --git a/apps/web/src/app/billing/individual/subscription.component.ts b/apps/web/src/app/billing/individual/subscription.component.ts
index c6a20a9f6a3..2a08ec85127 100644
--- a/apps/web/src/app/billing/individual/subscription.component.ts
+++ b/apps/web/src/app/billing/individual/subscription.component.ts
@@ -1,12 +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 { 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";
 
 @Component({
@@ -15,32 +13,16 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 })
 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/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
index f899b8eccb4..abd7bdb155a 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
@@ -328,24 +328,60 @@
         *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">
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..2b5c27e0f09 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,28 +28,8 @@ 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 { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -57,6 +37,7 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
 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 +45,25 @@ 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 {
+  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;
@@ -111,11 +106,16 @@ interface OnSuccessArgs {
 
 @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;
+  @ViewChild(EnterPaymentMethodComponent) enterPaymentMethodComponent: EnterPaymentMethodComponent;
 
   @Input() acceptingSponsorship = false;
   @Input() organizationId: string;
@@ -172,7 +172,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 +187,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   secretsManagerPlans: PlanResponse[];
   organization: Organization;
   sub: OrganizationSubscriptionResponse;
-  billing: BillingResponse;
   dialogHeaderName: string;
   currentPlanName: string;
   showPayment: boolean = false;
@@ -191,15 +194,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 +217,10 @@ 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,
   ) {}
 
   async ngOnInit(): Promise<void> {
@@ -242,10 +243,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);
         }
@@ -307,15 +312,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 +347,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 +358,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 +366,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() {
@@ -460,7 +470,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 +485,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 +499,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";
@@ -591,8 +593,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 {
@@ -746,39 +747,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();
@@ -795,9 +779,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       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,46 +800,13 @@ 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,
     );
   }
 
@@ -875,25 +824,25 @@ 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 };
+      await Promise.all([
+        this.subscriberBillingClient.updatePaymentMethod(subscriber, paymentMethod, null),
+        this.subscriberBillingClient.updateBillingAddress(subscriber, billingAddress),
+      ]);
     }
 
     // Backfill pub/priv key if necessary
@@ -931,18 +880,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) {
@@ -1002,25 +939,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 +983,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 +997,44 @@ 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:
+          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 +1051,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/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..cbeedc454dc 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,24 +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 { 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 { 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";
 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";
@@ -59,10 +46,20 @@ 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,
+  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;
@@ -78,11 +75,16 @@ const Allowed2020PlansForLegacyProviders = [
 @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;
+  @ViewChild(EnterPaymentMethodComponent) enterPaymentMethodComponent!: EnterPaymentMethodComponent;
 
   @Input() organizationId?: string;
   @Input() showFree = true;
@@ -105,8 +107,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
 
   private _productTier = ProductTierType.Free;
 
-  protected taxInformation: TaxInformation;
-
   @Input()
   get plan(): PlanType {
     return this._plan;
@@ -135,10 +135,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 +148,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 +180,9 @@ 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,
   ) {
     this.selfHosted = this.platformUtilsService.isSelfHost();
   }
@@ -199,9 +199,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) {
@@ -268,15 +273,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({
@@ -587,34 +594,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;
     }
 
@@ -688,46 +674,54 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     }
   }
 
-  private refreshSalesTax(): void {
-    if (!this.taxComponent.validate()) {
+  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 getPlanFromLegacyEnum = (): OrganizationSubscriptionPlan => {
+      switch (this.formGroup.value.plan) {
+        case PlanType.FamiliesAnnually:
+          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.secretsManagerForm.controls.enabled.value === true) {
-      request.secretsManager = {
-        seats: this.secretsManagerForm.controls.userSeats.value,
-        additionalMachineAccounts: this.secretsManagerForm.controls.additionalServiceAccounts.value,
-      };
-    }
+    const billingAddress = getBillingAddressFromForm(this.billingFormGroup.controls.billingAddress);
 
-    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 passwordManagerSeats =
+      this.formGroup.value.productTier === ProductTierType.Families
+        ? 1
+        : this.formGroup.value.additionalSeats;
+
+    const taxAmounts = await this.taxClient.previewTaxForOrganizationSubscriptionPurchase(
+      {
+        ...getPlanFromLegacyEnum(),
+        passwordManager: {
+          seats: passwordManagerSeats,
+          additionalStorage: this.formGroup.value.additionalStorage,
+          sponsored: false,
+        },
+        secretsManager: this.formGroup.value.secretsManager.enabled
+          ? {
+              seats: this.secretsManagerForm.value.userSeats,
+              additionalServiceAccounts: this.secretsManagerForm.value.additionalServiceAccounts,
+              standalone: false,
+            }
+          : undefined,
+      },
+      billingAddress,
+    );
+
+    this.estimatedTax = taxAmounts.tax;
+    this.total = taxAmounts.total;
   }
 
   private async updateOrganization() {
@@ -738,21 +732,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,
+        },
       );
     }
 
@@ -791,23 +788,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
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 3b3e08764ff..5fa10c4c87c 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
@@ -238,7 +238,9 @@
     </ng-container>
     <ng-template #organizationIsNotManagedByConsolidatedBillingMSP>
       <div class="tw-flex tw-flex-col tw-items-center tw-text-info">
-        <bit-icon [icon]="subscriptionHiddenIcon"></bit-icon>
+        <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>{{ "billingContactProviderForAssistance" | i18n }}</p>
       </div>
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 509fecb88fe..6bb262152ed 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute } from "@angular/router";
 import { firstValueFrom, lastValueFrom, Subject } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
-import { SubscriptionHiddenIcon } from "@bitwarden/assets/svg";
+import { GearIcon } from "@bitwarden/assets/svg";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import {
@@ -66,7 +66,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
   organizationIsManagedByConsolidatedBillingMSP = false;
   resellerSeatsRemainingMessage: string;
 
-  protected readonly subscriptionHiddenIcon = SubscriptionHiddenIcon;
+  protected readonly gearIcon = GearIcon;
   protected readonly teamsStarter = ProductTierType.TeamsStarter;
 
   private destroy$ = new Subject<void>();
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 05802d5868a..b2bf27e726a 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;
@@ -93,24 +80,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 +107,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 +126,6 @@ export class OrganizationPaymentDetailsComponent implements OnInit, OnDestroy {
     private messageListener: MessageListener,
     private organizationService: OrganizationService,
     private organizationWarningsService: OrganizationWarningsService,
-    private router: Router,
     private subscriberBillingClient: SubscriberBillingClient,
   ) {}
 
@@ -243,7 +209,6 @@ export class OrganizationPaymentDetailsComponent implements OnInit, OnDestroy {
     const result = await lastValueFrom(dialogRef.closed);
     if (result?.type === "success") {
       await this.setPaymentMethod(result.paymentMethod);
-      this.organizationWarningsService.refreshFreeTrialWarning();
     }
   };
 
@@ -264,6 +229,10 @@ export class OrganizationPaymentDetailsComponent implements OnInit, OnDestroy {
 
   setPaymentMethod = async (paymentMethod: MaskedPaymentMethod) => {
     if (this.viewState$.value) {
+      if (!this.viewState$.value.paymentMethod) {
+        this.organizationWarningsService.refreshFreeTrialWarning();
+      }
+
       const billingAddress =
         this.viewState$.value.billingAddress ??
         (await this.subscriberBillingClient.getBillingAddress(this.viewState$.value.organization));
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 a0d0dd6c784..00000000000
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<bit-banner
-  id="free-trial-banner"
-  class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
-  bannerType="premium"
-  icon="bwi-billing"
-  [showClose]="false"
-  *ngIf="freeTrialData?.shownBanner"
->
-  {{ freeTrialData?.message }}
-  <a
-    bitLink
-    linkType="secondary"
-    (click)="changePayment()"
-    class="tw-cursor-pointer"
-    rel="noreferrer noopener"
-  >
-    {{ "clickHereToAddPaymentMethod" | i18n }}
-  </a>
-</bit-banner>
-<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 855263cdbc1..00000000000
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
+++ /dev/null
@@ -1,298 +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 {
-  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 { 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 { TrialFlowService } from "../../services/trial-flow.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";
-import { FreeTrial } from "../../types/free-trial";
-
-@Component({
-  templateUrl: "./organization-payment-method.component.html",
-  standalone: false,
-})
-export class OrganizationPaymentMethodComponent implements OnDestroy {
-  organizationId!: string;
-  isUnpaid = false;
-  accountCredit?: number;
-  paymentSource?: PaymentSourceResponse;
-  subscriptionStatus?: string;
-  protected freeTrialData?: FreeTrial;
-  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 trialFlowService: TrialFlowService,
-    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");
-        }
-
-        this.freeTrialData = this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
-          this.organization,
-          this.organizationSubscriptionResponse,
-          this.paymentSource,
-        );
-      }
-      // 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/subscription-hidden.component.ts b/apps/web/src/app/billing/organizations/subscription-hidden.component.ts
index f68b20635ba..cca12e938d2 100644
--- a/apps/web/src/app/billing/organizations/subscription-hidden.component.ts
+++ b/apps/web/src/app/billing/organizations/subscription-hidden.component.ts
@@ -2,12 +2,14 @@
 // @ts-strict-ignore
 import { Component, Input } from "@angular/core";
 
-import { SubscriptionHiddenIcon } from "@bitwarden/assets/svg";
+import { GearIcon } from "@bitwarden/assets/svg";
 
 @Component({
   selector: "app-org-subscription-hidden",
   template: `<div class="tw-flex tw-flex-col tw-items-center tw-text-info">
-    <bit-icon [icon]="subscriptionHiddenIcon"></bit-icon>
+    <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>{{ "billingContactProviderForAssistance" | i18n }}</p>
   </div>`,
@@ -15,5 +17,5 @@ import { SubscriptionHiddenIcon } from "@bitwarden/assets/svg";
 })
 export class SubscriptionHiddenComponent {
   @Input() providerName: string;
-  subscriptionHiddenIcon = SubscriptionHiddenIcon;
+  gearIcon = GearIcon;
 }
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 4925e4bc01d..8390e432236 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
@@ -16,7 +16,6 @@ import { OrganizationFreeTrialWarning } from "../types";
     @if (warning) {
       <bit-banner
         id="free-trial-banner"
-        class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
         icon="bwi-billing"
         bannerType="premium"
         [showClose]="false"
@@ -38,6 +37,7 @@ import { OrganizationFreeTrialWarning } from "../types";
 })
 export class OrganizationFreeTrialWarningComponent implements OnInit {
   @Input({ required: true }) organization!: Organization;
+  @Input() includeOrganizationNameInMessaging = false;
   @Output() clicked = new EventEmitter<void>();
 
   warning$!: Observable<OrganizationFreeTrialWarning | null>;
@@ -45,6 +45,9 @@ export class OrganizationFreeTrialWarningComponent implements OnInit {
   constructor(private organizationWarningsService: OrganizationWarningsService) {}
 
   ngOnInit() {
-    this.warning$ = this.organizationWarningsService.getFreeTrialWarning$(this.organization);
+    this.warning$ = this.organizationWarningsService.getFreeTrialWarning$(
+      this.organization,
+      this.includeOrganizationNameInMessaging,
+    );
   }
 }
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 4eba9f3daf5..c49f59f6b05 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
@@ -16,7 +16,6 @@ import { OrganizationResellerRenewalWarning } from "../types";
     @if (warning) {
       <bit-banner
         id="reseller-warning-banner"
-        class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
         icon="bwi-billing"
         bannerType="info"
         [showClose]="false"
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..53f72558089 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,8 +15,6 @@ 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 { DialogRef, DialogService } from "@bitwarden/components";
 import { OrganizationBillingClient } from "@bitwarden/web-vault/app/billing/clients";
@@ -35,7 +33,6 @@ 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>;
@@ -57,7 +54,6 @@ describe("OrganizationWarningsService", () => {
     });
 
   beforeEach(() => {
-    configService = mock<ConfigService>();
     dialogService = mock<DialogService>();
     i18nService = mock<I18nService>();
     organizationApiService = mock<OrganizationApiServiceAbstraction>();
@@ -94,7 +90,6 @@ describe("OrganizationWarningsService", () => {
     TestBed.configureTestingModule({
       providers: [
         OrganizationWarningsService,
-        { provide: ConfigService, useValue: configService },
         { provide: DialogService, useValue: dialogService },
         { provide: I18nService, useValue: i18nService },
         { provide: OrganizationApiServiceAbstraction, useValue: organizationApiService },
@@ -466,7 +461,6 @@ describe("OrganizationWarningsService", () => {
       } as OrganizationWarningsResponse);
 
       dialogService.openSimpleDialog.mockResolvedValue(true);
-      configService.getFeatureFlag.mockResolvedValue(false);
       router.navigate.mockResolvedValue(true);
 
       service.showInactiveSubscriptionDialog$(organization).subscribe({
@@ -478,11 +472,8 @@ describe("OrganizationWarningsService", () => {
             acceptButtonText: "Continue",
             cancelButtonText: "Close",
           });
-          expect(configService.getFeatureFlag).toHaveBeenCalledWith(
-            FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
-          );
           expect(router.navigate).toHaveBeenCalledWith(
-            ["organizations", "org-id-123", "billing", "payment-method"],
+            ["organizations", "org-id-123", "billing", "payment-details"],
             { state: { launchPaymentModalAutomatically: true } },
           );
           done();
@@ -497,7 +488,6 @@ describe("OrganizationWarningsService", () => {
       } as OrganizationWarningsResponse);
 
       dialogService.openSimpleDialog.mockResolvedValue(true);
-      configService.getFeatureFlag.mockResolvedValue(true);
       router.navigate.mockResolvedValue(true);
 
       service.showInactiveSubscriptionDialog$(organization).subscribe({
@@ -522,7 +512,6 @@ describe("OrganizationWarningsService", () => {
       service.showInactiveSubscriptionDialog$(organization).subscribe({
         complete: () => {
           expect(dialogService.openSimpleDialog).toHaveBeenCalled();
-          expect(configService.getFeatureFlag).not.toHaveBeenCalled();
           expect(router.navigate).not.toHaveBeenCalled();
           done();
         },
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 5b466dfe41d..46a34def28b 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
@@ -16,8 +16,6 @@ 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 { OrganizationId } from "@bitwarden/common/types/guid";
 import { DialogService } from "@bitwarden/components";
@@ -53,7 +51,6 @@ export class OrganizationWarningsService {
   taxIdWarningRefreshed$ = this.taxIdWarningRefreshedSubject.asObservable();
 
   constructor(
-    private configService: ConfigService,
     private dialogService: DialogService,
     private i18nService: I18nService,
     private organizationApiService: OrganizationApiServiceAbstraction,
@@ -63,6 +60,7 @@ export class OrganizationWarningsService {
 
   getFreeTrialWarning$ = (
     organization: Organization,
+    includeOrganizationNameInMessaging = false,
   ): Observable<OrganizationFreeTrialWarning | null> =>
     merge(
       this.getWarning$(organization, (response) => response.freeTrial),
@@ -80,20 +78,30 @@ export class OrganizationWarningsService {
         if (remainingTrialDays >= 2) {
           return {
             organization,
-            message: this.i18nService.t("freeTrialEndPromptCount", remainingTrialDays),
+            message: includeOrganizationNameInMessaging
+              ? this.i18nService.t(
+                  "freeTrialEndPromptMultipleDays",
+                  organization.name,
+                  remainingTrialDays,
+                )
+              : this.i18nService.t("freeTrialEndPromptCount", remainingTrialDays),
           };
         }
 
         if (remainingTrialDays == 1) {
           return {
             organization,
-            message: this.i18nService.t("freeTrialEndPromptTomorrowNoOrgName"),
+            message: includeOrganizationNameInMessaging
+              ? this.i18nService.t("freeTrialEndPromptTomorrow", organization.name)
+              : this.i18nService.t("freeTrialEndPromptTomorrowNoOrgName"),
           };
         }
 
         return {
           organization,
-          message: this.i18nService.t("freeTrialEndingTodayWithoutOrgName"),
+          message: includeOrganizationNameInMessaging
+            ? this.i18nService.t("freeTrialEndPromptToday", organization.name)
+            : this.i18nService.t("freeTrialEndingTodayWithoutOrgName"),
         };
       }),
     );
@@ -185,14 +193,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 },
                 },
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..5f5e3442935 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,7 +5,7 @@ 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";
 
@@ -40,9 +40,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>
               }
@@ -74,16 +74,6 @@ export class DisplayPaymentMethodComponent {
   @Input({ required: true }) paymentMethod!: MaskedPaymentMethod | null;
   @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 +90,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..6e356097d32 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;
@@ -104,13 +104,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..3f68c12c897 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";
@@ -67,54 +78,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">
@@ -175,7 +188,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..4af5226e7ee 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
@@ -8,7 +8,6 @@ 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 {
   isTokenizablePaymentMethod,
   selectableCountries,
@@ -16,6 +15,8 @@ import {
   TokenizedPaymentMethod,
 } from "../types";
 
+import { PaymentLabelComponent } from "./payment-label.component";
+
 type PaymentMethodOption = TokenizablePaymentMethod | "accountCredit";
 
 type PaymentMethodFormGroup = FormGroup<{
@@ -102,7 +103,7 @@ type PaymentMethodFormGroup = FormGroup<{
                 <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>
@@ -310,7 +311,7 @@ export class EnterPaymentMethodComponent implements OnInit {
   select = (paymentMethod: PaymentMethodOption) =>
     this.group.controls.type.patchValue(paymentMethod);
 
-  tokenize = async (): Promise<TokenizedPaymentMethod> => {
+  tokenize = async (): Promise<TokenizedPaymentMethod | null> => {
     const exchange = async (paymentMethod: TokenizablePaymentMethod) => {
       switch (paymentMethod) {
         case "bankAccount": {
@@ -351,13 +352,37 @@ 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;
     }
   };
 
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/shared/payment/payment-label.component.ts b/apps/web/src/app/billing/payment/components/payment-label.component.ts
similarity index 58%
rename from apps/web/src/app/billing/shared/payment/payment-label.component.ts
rename to apps/web/src/app/billing/payment/components/payment-label.component.ts
index 025727d1d1e..8ecc7b7fd9e 100644
--- a/apps/web/src/app/billing/shared/payment/payment-label.component.ts
+++ b/apps/web/src/app/billing/payment/components/payment-label.component.ts
@@ -13,7 +13,21 @@ import { SharedModule } from "../../../shared";
  */
 @Component({
   selector: "app-payment-label",
-  templateUrl: "./payment-label.component.html",
+  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-xs tw-font-normal">({{ "required" | i18n }})</span>
+      </bit-label>
+    </div>
+  `,
   imports: [FormFieldModule, SharedModule],
 })
 export class PaymentLabelComponent {
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..cc1f1ab5e0a 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
@@ -37,6 +37,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/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..5d212a9cb68 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,3 +1,5 @@
+import { PaymentMethodType } from "@bitwarden/common/billing/enums";
+
 export const TokenizablePaymentMethods = {
   bankAccount: "bankAccount",
   card: "card",
@@ -16,6 +18,34 @@ export const isTokenizablePaymentMethod = (value: string): value is TokenizableP
   return valid.includes(value);
 };
 
+export const tokenizablePaymentMethodFromLegacyEnum = (
+  legacyEnum: PaymentMethodType,
+): TokenizablePaymentMethod | null => {
+  switch (legacyEnum) {
+    case PaymentMethodType.BankAccount:
+      return "bankAccount";
+    case PaymentMethodType.Card:
+      return "card";
+    case PaymentMethodType.PayPal:
+      return "payPal";
+    default:
+      return null;
+  }
+};
+
+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;
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..52041936e50 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
@@ -19,12 +19,6 @@ interface EnterpriseOrgStatus {
 
 @Injectable({ providedIn: "root" })
 export class FreeFamiliesPolicyService {
-  protected enterpriseOrgStatus: EnterpriseOrgStatus = {
-    isFreeFamilyPolicyEnabled: false,
-    belongToOneEnterpriseOrgs: false,
-    belongToMultipleEnterpriseOrgs: false,
-  };
-
   constructor(
     private policyService: PolicyService,
     private organizationService: OrganizationService,
@@ -104,9 +98,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 +118,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 +137,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 +158,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/pricing-summary.service.ts b/apps/web/src/app/billing/services/pricing-summary.service.ts
index 0b048b379d8..b06dc80a070 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 =
@@ -72,14 +65,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 + additionalStorageTotal + secretsManagerSubtotal + estimatedTax
+      : passwordManagerSubtotal + additionalStorageTotal + estimatedTax;
 
     return {
       selectedPlanInterval: selectedInterval === PlanInterval.Annually ? "year" : "month",
@@ -104,45 +92,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/reseller-warning.service.ts b/apps/web/src/app/billing/services/reseller-warning.service.ts
deleted file mode 100644
index 2c59ebafe05..00000000000
--- a/apps/web/src/app/billing/services/reseller-warning.service.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import { Injectable } from "@angular/core";
-
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-
-export interface ResellerWarning {
-  type: "info" | "warning";
-  message: string;
-}
-
-@Injectable({ providedIn: "root" })
-export class ResellerWarningService {
-  private readonly RENEWAL_WARNING_DAYS = 14;
-  private readonly GRACE_PERIOD_DAYS = 30;
-
-  constructor(private i18nService: I18nService) {}
-
-  getWarning(
-    organization: Organization,
-    organizationBillingMetadata: OrganizationBillingMetadataResponse,
-  ): ResellerWarning | null {
-    if (!organization.hasReseller) {
-      return null; // If no reseller, return null immediately
-    }
-
-    // Check for past due warning first (highest priority)
-    if (this.shouldShowPastDueWarning(organizationBillingMetadata)) {
-      const gracePeriodEnd = this.getGracePeriodEndDate(organizationBillingMetadata.invoiceDueDate);
-      if (!gracePeriodEnd) {
-        return null;
-      }
-      return {
-        type: "warning",
-        message: this.i18nService.t(
-          "resellerPastDueWarningMsg",
-          organization.providerName,
-          this.formatDate(gracePeriodEnd),
-        ),
-      } as ResellerWarning;
-    }
-
-    // Check for open invoice warning
-    if (this.shouldShowInvoiceWarning(organizationBillingMetadata)) {
-      const invoiceCreatedDate = organizationBillingMetadata.invoiceCreatedDate;
-      const invoiceDueDate = organizationBillingMetadata.invoiceDueDate;
-      if (!invoiceCreatedDate || !invoiceDueDate) {
-        return null;
-      }
-      return {
-        type: "info",
-        message: this.i18nService.t(
-          "resellerOpenInvoiceWarningMgs",
-          organization.providerName,
-          this.formatDate(organizationBillingMetadata.invoiceCreatedDate),
-          this.formatDate(organizationBillingMetadata.invoiceDueDate),
-        ),
-      } as ResellerWarning;
-    }
-
-    // Check for renewal warning
-    if (this.shouldShowRenewalWarning(organizationBillingMetadata)) {
-      const subPeriodEndDate = organizationBillingMetadata.subPeriodEndDate;
-      if (!subPeriodEndDate) {
-        return null;
-      }
-
-      return {
-        type: "info",
-        message: this.i18nService.t(
-          "resellerRenewalWarningMsg",
-          organization.providerName,
-          this.formatDate(organizationBillingMetadata.subPeriodEndDate),
-        ),
-      } as ResellerWarning;
-    }
-
-    return null;
-  }
-
-  private shouldShowRenewalWarning(
-    organizationBillingMetadata: OrganizationBillingMetadataResponse,
-  ): boolean {
-    if (
-      !organizationBillingMetadata.hasSubscription ||
-      !organizationBillingMetadata.subPeriodEndDate
-    ) {
-      return false;
-    }
-    const renewalDate = new Date(organizationBillingMetadata.subPeriodEndDate);
-    const daysUntilRenewal = Math.ceil(
-      (renewalDate.getTime() - Date.now()) / (1000 * 60 * 60 * 24),
-    );
-    return daysUntilRenewal <= this.RENEWAL_WARNING_DAYS;
-  }
-
-  private shouldShowInvoiceWarning(
-    organizationBillingMetadata: OrganizationBillingMetadataResponse,
-  ): boolean {
-    if (
-      !organizationBillingMetadata.hasOpenInvoice ||
-      !organizationBillingMetadata.invoiceDueDate
-    ) {
-      return false;
-    }
-    const invoiceDueDate = new Date(organizationBillingMetadata.invoiceDueDate);
-    return invoiceDueDate > new Date();
-  }
-
-  private shouldShowPastDueWarning(
-    organizationBillingMetadata: OrganizationBillingMetadataResponse,
-  ): boolean {
-    if (
-      !organizationBillingMetadata.hasOpenInvoice ||
-      !organizationBillingMetadata.invoiceDueDate
-    ) {
-      return false;
-    }
-    const invoiceDueDate = new Date(organizationBillingMetadata.invoiceDueDate);
-    return invoiceDueDate <= new Date() && !organizationBillingMetadata.isSubscriptionUnpaid;
-  }
-
-  private getGracePeriodEndDate(dueDate: Date | null): Date | null {
-    if (!dueDate) {
-      return null;
-    }
-    const gracePeriodEnd = new Date(dueDate);
-    gracePeriodEnd.setDate(gracePeriodEnd.getDate() + this.GRACE_PERIOD_DAYS);
-    return gracePeriodEnd;
-  }
-
-  private formatDate(date: Date | null): string {
-    if (!date) {
-      return "N/A";
-    }
-    return new Date(date).toLocaleDateString("en-US", {
-      month: "short",
-      day: "2-digit",
-      year: "numeric",
-    });
-  }
-}
diff --git a/apps/web/src/app/billing/services/subscription-pricing.service.spec.ts b/apps/web/src/app/billing/services/subscription-pricing.service.spec.ts
new file mode 100644
index 00000000000..0fb33020bc3
--- /dev/null
+++ b/apps/web/src/app/billing/services/subscription-pricing.service.spec.ts
@@ -0,0 +1,887 @@
+import { TestBed } from "@angular/core/testing";
+import { mock, MockProxy } from "jest-mock-extended";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
+import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ToastService } from "@bitwarden/components";
+import { LogService } from "@bitwarden/logging";
+
+import {
+  BusinessSubscriptionPricingTierIds,
+  PersonalSubscriptionPricingTierIds,
+  SubscriptionCadenceIds,
+} from "../types/subscription-pricing-tier";
+
+import { SubscriptionPricingService } from "./subscription-pricing.service";
+
+describe("SubscriptionPricingService", () => {
+  let service: SubscriptionPricingService;
+  let apiService: MockProxy<ApiService>;
+  let i18nService: MockProxy<I18nService>;
+  let logService: MockProxy<LogService>;
+  let toastService: MockProxy<ToastService>;
+
+  const mockFamiliesPlan = {
+    type: PlanType.FamiliesAnnually,
+    productTier: ProductTierType.Families,
+    name: "Families (Annually)",
+    isAnnual: true,
+    nameLocalizationKey: "planNameFamilies",
+    descriptionLocalizationKey: "planDescFamiliesV2",
+    canBeUsedByBusiness: false,
+    trialPeriodDays: 7,
+    hasSelfHost: false,
+    hasPolicies: false,
+    hasGroups: false,
+    hasDirectory: false,
+    hasEvents: false,
+    hasTotp: true,
+    has2fa: true,
+    hasApi: true,
+    hasSso: false,
+    hasResetPassword: false,
+    hasSend: true,
+    usersGetPremium: true,
+    upgradeSortOrder: 1,
+    displaySortOrder: 1,
+    legacyYear: 2024,
+    disabled: false,
+    PasswordManager: {
+      baseSeats: 6,
+      baseStorageGb: 1,
+      basePrice: 36,
+      seatPrice: 0,
+      additionalStoragePricePerGb: 4,
+      allowSeatAutoscale: false,
+      maxSeats: 6,
+      maxCollections: null,
+      maxProjects: null,
+    },
+    SecretsManager: null,
+  } as any as PlanResponse;
+
+  const mockTeamsPlan = {
+    type: PlanType.TeamsAnnually,
+    productTier: ProductTierType.Teams,
+    name: "Teams (Annually)",
+    isAnnual: true,
+    nameLocalizationKey: "planNameTeams",
+    descriptionLocalizationKey: "planDescTeams",
+    canBeUsedByBusiness: true,
+    trialPeriodDays: 7,
+    hasSelfHost: true,
+    hasPolicies: true,
+    hasGroups: true,
+    hasDirectory: true,
+    hasEvents: true,
+    hasTotp: true,
+    has2fa: true,
+    hasApi: true,
+    hasSso: true,
+    hasResetPassword: true,
+    hasSend: true,
+    usersGetPremium: false,
+    upgradeSortOrder: 2,
+    displaySortOrder: 2,
+    legacyYear: 2024,
+    disabled: false,
+    PasswordManager: {
+      baseSeats: 0,
+      baseStorageGb: 1,
+      basePrice: 0,
+      seatPrice: 36,
+      additionalStoragePricePerGb: 4,
+      allowSeatAutoscale: true,
+      maxSeats: null,
+      maxCollections: null,
+      maxProjects: null,
+    },
+    SecretsManager: {
+      baseSeats: 0,
+      baseStorageGb: 0,
+      basePrice: 0,
+      seatPrice: 72,
+      additionalPricePerServiceAccount: 6,
+      baseServiceAccount: 20,
+      allowSeatAutoscale: true,
+      maxSeats: null,
+      maxCollections: null,
+      maxProjects: null,
+    },
+  } as any as PlanResponse;
+
+  const mockEnterprisePlan = {
+    type: PlanType.EnterpriseAnnually,
+    productTier: ProductTierType.Enterprise,
+    name: "Enterprise (Annually)",
+    isAnnual: true,
+    nameLocalizationKey: "planNameEnterprise",
+    descriptionLocalizationKey: "planDescEnterpriseV2",
+    canBeUsedByBusiness: true,
+    trialPeriodDays: 7,
+    hasSelfHost: true,
+    hasPolicies: true,
+    hasGroups: true,
+    hasDirectory: true,
+    hasEvents: true,
+    hasTotp: true,
+    has2fa: true,
+    hasApi: true,
+    hasSso: true,
+    hasResetPassword: true,
+    hasSend: true,
+    usersGetPremium: false,
+    upgradeSortOrder: 3,
+    displaySortOrder: 3,
+    legacyYear: 2024,
+    disabled: false,
+    PasswordManager: {
+      baseSeats: 0,
+      baseStorageGb: 1,
+      basePrice: 0,
+      seatPrice: 48,
+      additionalStoragePricePerGb: 4,
+      allowSeatAutoscale: true,
+      maxSeats: null,
+      maxCollections: null,
+      maxProjects: null,
+    },
+    SecretsManager: {
+      baseSeats: 0,
+      baseStorageGb: 0,
+      basePrice: 0,
+      seatPrice: 84,
+      additionalPricePerServiceAccount: 6,
+      baseServiceAccount: 50,
+      allowSeatAutoscale: true,
+      maxSeats: null,
+      maxCollections: null,
+      maxProjects: null,
+    },
+  } as any as PlanResponse;
+
+  const mockFreePlan = {
+    type: PlanType.Free,
+    productTier: ProductTierType.Free,
+    name: "Free",
+    isAnnual: false,
+    nameLocalizationKey: "planNameFree",
+    descriptionLocalizationKey: "planDescFreeV2",
+    canBeUsedByBusiness: true,
+    trialPeriodDays: null,
+    hasSelfHost: false,
+    hasPolicies: false,
+    hasGroups: false,
+    hasDirectory: false,
+    hasEvents: false,
+    hasTotp: false,
+    has2fa: true,
+    hasApi: false,
+    hasSso: false,
+    hasResetPassword: false,
+    hasSend: true,
+    usersGetPremium: false,
+    upgradeSortOrder: 0,
+    displaySortOrder: 0,
+    legacyYear: 2024,
+    disabled: false,
+    PasswordManager: {
+      baseSeats: 2,
+      baseStorageGb: null,
+      basePrice: 0,
+      seatPrice: 0,
+      additionalStoragePricePerGb: null,
+      allowSeatAutoscale: false,
+      maxSeats: 2,
+      maxCollections: 2,
+      maxProjects: null,
+    },
+    SecretsManager: {
+      baseSeats: 2,
+      baseStorageGb: null,
+      basePrice: 0,
+      seatPrice: 0,
+      additionalPricePerServiceAccount: null,
+      baseServiceAccount: 0,
+      allowSeatAutoscale: false,
+      maxSeats: 2,
+      maxCollections: null,
+      maxProjects: 3,
+    },
+  } as any as PlanResponse;
+
+  const mockPlansResponse: any = {
+    data: [mockFamiliesPlan, mockTeamsPlan, mockEnterprisePlan, mockFreePlan],
+    continuationToken: null,
+  };
+
+  beforeAll(() => {
+    i18nService = mock<I18nService>();
+    logService = mock<LogService>();
+    toastService = mock<ToastService>();
+
+    i18nService.t.mockImplementation((key: string, ...args: any[]) => {
+      switch (key) {
+        // Plan names
+        case "premium":
+          return "Premium";
+        case "planNameFamilies":
+          return "Families";
+        case "planNameTeams":
+          return "Teams";
+        case "planNameEnterprise":
+          return "Enterprise";
+        case "planNameFree":
+          return "Free";
+        case "planNameCustom":
+          return "Custom";
+
+        // Plan descriptions
+        case "planDescPremium":
+          return "Premium plan description";
+        case "planDescFamiliesV2":
+          return "Families plan description";
+        case "planDescFreeV2":
+          return `Free plan for ${args[0]} user`;
+        case "planDescEnterpriseV2":
+          return "Enterprise plan description";
+        case "planDescCustom":
+          return "Custom plan description";
+        case "teamsPlanUpgradeMessage":
+          return "Resilient protection for growing teams";
+
+        // Feature translations
+        case "builtInAuthenticator":
+          return "Built-in authenticator";
+        case "secureFileStorage":
+          return "Secure file storage";
+        case "emergencyAccess":
+          return "Emergency access";
+        case "breachMonitoring":
+          return "Breach monitoring";
+        case "andMoreFeatures":
+          return "And more features";
+        case "premiumAccounts":
+          return "6 premium accounts";
+        case "familiesUnlimitedSharing":
+          return "Unlimited sharing for families";
+        case "familiesUnlimitedCollections":
+          return "Unlimited collections for families";
+        case "familiesSharedStorage":
+          return "Shared storage for families";
+        case "limitedUsersV2":
+          return `Limited to ${args[0]} users`;
+        case "limitedCollectionsV2":
+          return `Limited to ${args[0]} collections`;
+        case "alwaysFree":
+          return "Always free";
+        case "twoSecretsIncluded":
+          return "Two secrets included";
+        case "projectsIncludedV2":
+          return `${args[0]} projects included`;
+        case "secureItemSharing":
+          return "Secure item sharing";
+        case "eventLogMonitoring":
+          return "Event log monitoring";
+        case "directoryIntegration":
+          return "Directory integration";
+        case "scimSupport":
+          return "SCIM support";
+        case "unlimitedSecretsAndProjects":
+          return "Unlimited secrets and projects";
+        case "includedMachineAccountsV2":
+          return `${args[0]} machine accounts included`;
+        case "enterpriseSecurityPolicies":
+          return "Enterprise security policies";
+        case "passwordLessSso":
+          return "Passwordless SSO";
+        case "accountRecovery":
+          return "Account recovery";
+        case "selfHostOption":
+          return "Self-host option";
+        case "complimentaryFamiliesPlan":
+          return "Complimentary families plan";
+        case "unlimitedUsers":
+          return "Unlimited users";
+        case "strengthenCybersecurity":
+          return "Strengthen cybersecurity";
+        case "boostProductivity":
+          return "Boost productivity";
+        case "seamlessIntegration":
+          return "Seamless integration";
+        case "unexpectedError":
+          return "An unexpected error has occurred.";
+        default:
+          return key;
+      }
+    });
+  });
+
+  beforeEach(() => {
+    apiService = mock<ApiService>();
+
+    apiService.getPlans.mockResolvedValue(mockPlansResponse);
+
+    TestBed.configureTestingModule({
+      providers: [
+        SubscriptionPricingService,
+        { provide: ApiService, useValue: apiService },
+        { provide: I18nService, useValue: i18nService },
+        { provide: LogService, useValue: logService },
+        { provide: ToastService, useValue: toastService },
+      ],
+    });
+
+    service = TestBed.inject(SubscriptionPricingService);
+  });
+
+  describe("getPersonalSubscriptionPricingTiers$", () => {
+    it("should return Premium and Families pricing tiers with correct structure", (done) => {
+      service.getPersonalSubscriptionPricingTiers$().subscribe((tiers) => {
+        expect(tiers).toHaveLength(2);
+
+        const premiumTier = tiers.find(
+          (tier) => tier.id === PersonalSubscriptionPricingTierIds.Premium,
+        );
+        expect(premiumTier).toEqual({
+          id: PersonalSubscriptionPricingTierIds.Premium,
+          name: "Premium",
+          description: "Premium plan description",
+          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 features" },
+            ],
+          },
+        });
+
+        const familiesTier = tiers.find(
+          (tier) => tier.id === PersonalSubscriptionPricingTierIds.Families,
+        );
+        expect(familiesTier).toEqual({
+          id: PersonalSubscriptionPricingTierIds.Families,
+          name: "Families",
+          description: "Families plan description",
+          availableCadences: [SubscriptionCadenceIds.Annually],
+          passwordManager: {
+            type: "packaged",
+            users: mockFamiliesPlan.PasswordManager.baseSeats,
+            annualPrice: mockFamiliesPlan.PasswordManager.basePrice,
+            annualPricePerAdditionalStorageGB:
+              mockFamiliesPlan.PasswordManager.additionalStoragePricePerGb,
+            features: [
+              { key: "premiumAccounts", value: "6 premium accounts" },
+              { key: "familiesUnlimitedSharing", value: "Unlimited sharing for families" },
+              { key: "familiesUnlimitedCollections", value: "Unlimited collections for families" },
+              { key: "familiesSharedStorage", value: "Shared storage for families" },
+            ],
+          },
+        });
+
+        expect(i18nService.t).toHaveBeenCalledWith("premium");
+        expect(i18nService.t).toHaveBeenCalledWith("planDescPremium");
+        expect(i18nService.t).toHaveBeenCalledWith("planNameFamilies");
+        expect(i18nService.t).toHaveBeenCalledWith("planDescFamiliesV2");
+        expect(i18nService.t).toHaveBeenCalledWith("builtInAuthenticator");
+        expect(i18nService.t).toHaveBeenCalledWith("secureFileStorage");
+        expect(i18nService.t).toHaveBeenCalledWith("emergencyAccess");
+        expect(i18nService.t).toHaveBeenCalledWith("breachMonitoring");
+        expect(i18nService.t).toHaveBeenCalledWith("andMoreFeatures");
+        expect(i18nService.t).toHaveBeenCalledWith("premiumAccounts");
+        expect(i18nService.t).toHaveBeenCalledWith("familiesUnlimitedSharing");
+        expect(i18nService.t).toHaveBeenCalledWith("familiesUnlimitedCollections");
+        expect(i18nService.t).toHaveBeenCalledWith("familiesSharedStorage");
+
+        done();
+      });
+    });
+
+    it("should handle API errors by logging and showing toast", (done) => {
+      const errorApiService = mock<ApiService>();
+      const errorI18nService = mock<I18nService>();
+      const errorLogService = mock<LogService>();
+      const errorToastService = mock<ToastService>();
+
+      const testError = new Error("API error");
+      errorApiService.getPlans.mockRejectedValue(testError);
+
+      errorI18nService.t.mockImplementation((key: string) => {
+        if (key === "unexpectedError") {
+          return "An unexpected error has occurred.";
+        }
+        return key;
+      });
+
+      const errorService = new SubscriptionPricingService(
+        errorApiService,
+        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();
+        },
+        error: () => {
+          fail("Observable should not error, it should return empty array");
+        },
+      });
+    });
+
+    it("should contain correct pricing", (done) => {
+      service.getPersonalSubscriptionPricingTiers$().subscribe((tiers) => {
+        const premiumTier = tiers.find(
+          (tier) => tier.id === PersonalSubscriptionPricingTierIds.Premium,
+        )!;
+        const familiesTier = tiers.find(
+          (tier) => tier.id === PersonalSubscriptionPricingTierIds.Families,
+        )!;
+
+        expect(premiumTier.passwordManager.annualPrice).toEqual(10);
+        expect(premiumTier.passwordManager.annualPricePerAdditionalStorageGB).toEqual(4);
+
+        expect(familiesTier.passwordManager.annualPrice).toEqual(
+          mockFamiliesPlan.PasswordManager.basePrice,
+        );
+        expect(familiesTier.passwordManager.annualPricePerAdditionalStorageGB).toEqual(
+          mockFamiliesPlan.PasswordManager.additionalStoragePricePerGb,
+        );
+
+        done();
+      });
+    });
+  });
+
+  describe("getBusinessSubscriptionPricingTiers$", () => {
+    it("should return Teams, Enterprise, and Custom pricing tiers with correct structure", (done) => {
+      service.getBusinessSubscriptionPricingTiers$().subscribe((tiers) => {
+        expect(tiers).toHaveLength(3);
+
+        const teamsTier = tiers.find(
+          (tier) => tier.id === BusinessSubscriptionPricingTierIds.Teams,
+        );
+        expect(teamsTier).toEqual({
+          id: BusinessSubscriptionPricingTierIds.Teams,
+          name: "Teams",
+          description: "Resilient protection for growing teams",
+          availableCadences: [SubscriptionCadenceIds.Annually, SubscriptionCadenceIds.Monthly],
+          passwordManager: {
+            type: "scalable",
+            annualPricePerUser: mockTeamsPlan.PasswordManager.seatPrice,
+            annualPricePerAdditionalStorageGB:
+              mockTeamsPlan.PasswordManager.additionalStoragePricePerGb,
+            features: [
+              { key: "secureItemSharing", value: "Secure item sharing" },
+              { key: "eventLogMonitoring", value: "Event log monitoring" },
+              { key: "directoryIntegration", value: "Directory integration" },
+              { key: "scimSupport", value: "SCIM support" },
+            ],
+          },
+          secretsManager: {
+            type: "scalable",
+            annualPricePerUser: mockTeamsPlan.SecretsManager!.seatPrice,
+            annualPricePerAdditionalServiceAccount:
+              mockTeamsPlan.SecretsManager!.additionalPricePerServiceAccount,
+            features: [
+              { key: "unlimitedSecretsAndProjects", value: "Unlimited secrets and projects" },
+              {
+                key: "includedMachineAccountsV2",
+                value: `${mockTeamsPlan.SecretsManager!.baseServiceAccount} machine accounts included`,
+              },
+            ],
+          },
+        });
+
+        const enterpriseTier = tiers.find(
+          (tier) => tier.id === BusinessSubscriptionPricingTierIds.Enterprise,
+        );
+        expect(enterpriseTier).toEqual({
+          id: BusinessSubscriptionPricingTierIds.Enterprise,
+          name: "Enterprise",
+          description: "Enterprise plan description",
+          availableCadences: [SubscriptionCadenceIds.Annually, SubscriptionCadenceIds.Monthly],
+          passwordManager: {
+            type: "scalable",
+            annualPricePerUser: mockEnterprisePlan.PasswordManager.seatPrice,
+            annualPricePerAdditionalStorageGB:
+              mockEnterprisePlan.PasswordManager.additionalStoragePricePerGb,
+            features: [
+              { key: "enterpriseSecurityPolicies", value: "Enterprise security policies" },
+              { key: "passwordLessSso", value: "Passwordless SSO" },
+              { key: "accountRecovery", value: "Account recovery" },
+              { key: "selfHostOption", value: "Self-host option" },
+              { key: "complimentaryFamiliesPlan", value: "Complimentary families plan" },
+            ],
+          },
+          secretsManager: {
+            type: "scalable",
+            annualPricePerUser: mockEnterprisePlan.SecretsManager!.seatPrice,
+            annualPricePerAdditionalServiceAccount:
+              mockEnterprisePlan.SecretsManager!.additionalPricePerServiceAccount,
+            features: [
+              { key: "unlimitedUsers", value: "Unlimited users" },
+              {
+                key: "includedMachineAccountsV2",
+                value: `${mockEnterprisePlan.SecretsManager!.baseServiceAccount} machine accounts included`,
+              },
+            ],
+          },
+        });
+
+        const customTier = tiers.find(
+          (tier) => tier.id === BusinessSubscriptionPricingTierIds.Custom,
+        );
+        expect(customTier).toEqual({
+          id: BusinessSubscriptionPricingTierIds.Custom,
+          name: "Custom",
+          description: "Custom plan description",
+          availableCadences: [],
+          passwordManager: {
+            type: "custom",
+            features: [
+              { key: "strengthenCybersecurity", value: "Strengthen cybersecurity" },
+              { key: "boostProductivity", value: "Boost productivity" },
+              { key: "seamlessIntegration", value: "Seamless integration" },
+            ],
+          },
+        });
+
+        expect(i18nService.t).toHaveBeenCalledWith("planNameTeams");
+        expect(i18nService.t).toHaveBeenCalledWith("teamsPlanUpgradeMessage");
+        expect(i18nService.t).toHaveBeenCalledWith("planNameEnterprise");
+        expect(i18nService.t).toHaveBeenCalledWith("planDescEnterpriseV2");
+        expect(i18nService.t).toHaveBeenCalledWith("planNameCustom");
+        expect(i18nService.t).toHaveBeenCalledWith("planDescCustom");
+        expect(i18nService.t).toHaveBeenCalledWith("secureItemSharing");
+        expect(i18nService.t).toHaveBeenCalledWith("eventLogMonitoring");
+        expect(i18nService.t).toHaveBeenCalledWith("directoryIntegration");
+        expect(i18nService.t).toHaveBeenCalledWith("scimSupport");
+        expect(i18nService.t).toHaveBeenCalledWith("unlimitedSecretsAndProjects");
+        expect(i18nService.t).toHaveBeenCalledWith("includedMachineAccountsV2", 20);
+        expect(i18nService.t).toHaveBeenCalledWith("enterpriseSecurityPolicies");
+        expect(i18nService.t).toHaveBeenCalledWith("passwordLessSso");
+        expect(i18nService.t).toHaveBeenCalledWith("accountRecovery");
+        expect(i18nService.t).toHaveBeenCalledWith("selfHostOption");
+        expect(i18nService.t).toHaveBeenCalledWith("complimentaryFamiliesPlan");
+        expect(i18nService.t).toHaveBeenCalledWith("unlimitedUsers");
+        expect(i18nService.t).toHaveBeenCalledWith("includedMachineAccountsV2", 50);
+        expect(i18nService.t).toHaveBeenCalledWith("strengthenCybersecurity");
+        expect(i18nService.t).toHaveBeenCalledWith("boostProductivity");
+        expect(i18nService.t).toHaveBeenCalledWith("seamlessIntegration");
+
+        done();
+      });
+    });
+
+    it("should handle API errors by logging and showing toast", (done) => {
+      const errorApiService = mock<ApiService>();
+      const errorI18nService = mock<I18nService>();
+      const errorLogService = mock<LogService>();
+      const errorToastService = mock<ToastService>();
+
+      const testError = new Error("API error");
+      errorApiService.getPlans.mockRejectedValue(testError);
+
+      errorI18nService.t.mockImplementation((key: string) => {
+        if (key === "unexpectedError") {
+          return "An unexpected error has occurred.";
+        }
+        return key;
+      });
+
+      const errorService = new SubscriptionPricingService(
+        errorApiService,
+        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();
+        },
+        error: () => {
+          fail("Observable should not error, it should return empty array");
+        },
+      });
+    });
+
+    it("should contain correct pricing", (done) => {
+      service.getBusinessSubscriptionPricingTiers$().subscribe((tiers) => {
+        const teamsTier = tiers.find(
+          (tier) => tier.id === BusinessSubscriptionPricingTierIds.Teams,
+        )!;
+        const enterpriseTier = tiers.find(
+          (tier) => tier.id === BusinessSubscriptionPricingTierIds.Enterprise,
+        )!;
+
+        const teamsPasswordManager = teamsTier.passwordManager as any;
+        const teamsSecretsManager = teamsTier.secretsManager as any;
+        expect(teamsPasswordManager.annualPricePerUser).toEqual(
+          mockTeamsPlan.PasswordManager.seatPrice,
+        );
+        expect(teamsPasswordManager.annualPricePerAdditionalStorageGB).toEqual(
+          mockTeamsPlan.PasswordManager.additionalStoragePricePerGb,
+        );
+        expect(teamsSecretsManager.annualPricePerUser).toEqual(
+          mockTeamsPlan.SecretsManager.seatPrice,
+        );
+        expect(teamsSecretsManager.annualPricePerAdditionalServiceAccount).toEqual(
+          mockTeamsPlan.SecretsManager.additionalPricePerServiceAccount,
+        );
+
+        const enterprisePasswordManager = enterpriseTier.passwordManager as any;
+        const enterpriseSecretsManager = enterpriseTier.secretsManager as any;
+        expect(enterprisePasswordManager.annualPricePerUser).toEqual(
+          mockEnterprisePlan.PasswordManager.seatPrice,
+        );
+        expect(enterprisePasswordManager.annualPricePerAdditionalStorageGB).toEqual(
+          mockEnterprisePlan.PasswordManager.additionalStoragePricePerGb,
+        );
+        expect(enterpriseSecretsManager.annualPricePerUser).toEqual(
+          mockEnterprisePlan.SecretsManager.seatPrice,
+        );
+        expect(enterpriseSecretsManager.annualPricePerAdditionalServiceAccount).toEqual(
+          mockEnterprisePlan.SecretsManager.additionalPricePerServiceAccount,
+        );
+
+        done();
+      });
+    });
+
+    it("should not include secretsManager for Custom tier", (done) => {
+      service.getBusinessSubscriptionPricingTiers$().subscribe((tiers) => {
+        const customTier = tiers.find(
+          (tier) => tier.id === BusinessSubscriptionPricingTierIds.Custom,
+        )!;
+        expect(customTier.secretsManager).toBeUndefined();
+        done();
+      });
+    });
+  });
+
+  describe("getDeveloperSubscriptionPricingTiers$", () => {
+    it("should return Free, Teams, and Enterprise pricing tiers with correct structure", (done) => {
+      service.getDeveloperSubscriptionPricingTiers$().subscribe((tiers) => {
+        expect(tiers).toHaveLength(3);
+
+        const freeTier = tiers.find((tier) => tier.id === BusinessSubscriptionPricingTierIds.Free);
+        expect(freeTier).toEqual({
+          id: BusinessSubscriptionPricingTierIds.Free,
+          name: "Free",
+          description: "Free plan for 1 user",
+          availableCadences: [],
+          passwordManager: {
+            type: "free",
+            features: [
+              {
+                key: "limitedUsersV2",
+                value: `Limited to ${mockFreePlan.PasswordManager.maxSeats} users`,
+              },
+              {
+                key: "limitedCollectionsV2",
+                value: `Limited to ${mockFreePlan.PasswordManager.maxCollections} collections`,
+              },
+              { key: "alwaysFree", value: "Always free" },
+            ],
+          },
+          secretsManager: {
+            type: "free",
+            features: [
+              { key: "twoSecretsIncluded", value: "Two secrets included" },
+              {
+                key: "projectsIncludedV2",
+                value: `${mockFreePlan.SecretsManager!.maxProjects} projects included`,
+              },
+            ],
+          },
+        });
+
+        const teamsTier = tiers.find(
+          (tier) => tier.id === BusinessSubscriptionPricingTierIds.Teams,
+        );
+        expect(teamsTier).toEqual({
+          id: BusinessSubscriptionPricingTierIds.Teams,
+          name: "Teams",
+          description: "Resilient protection for growing teams",
+          availableCadences: [SubscriptionCadenceIds.Annually, SubscriptionCadenceIds.Monthly],
+          passwordManager: {
+            type: "scalable",
+            annualPricePerUser: mockTeamsPlan.PasswordManager.seatPrice,
+            annualPricePerAdditionalStorageGB:
+              mockTeamsPlan.PasswordManager.additionalStoragePricePerGb,
+            features: [
+              { key: "secureItemSharing", value: "Secure item sharing" },
+              { key: "eventLogMonitoring", value: "Event log monitoring" },
+              { key: "directoryIntegration", value: "Directory integration" },
+              { key: "scimSupport", value: "SCIM support" },
+            ],
+          },
+          secretsManager: {
+            type: "scalable",
+            annualPricePerUser: mockTeamsPlan.SecretsManager!.seatPrice,
+            annualPricePerAdditionalServiceAccount:
+              mockTeamsPlan.SecretsManager!.additionalPricePerServiceAccount,
+            features: [
+              { key: "unlimitedSecretsAndProjects", value: "Unlimited secrets and projects" },
+              {
+                key: "includedMachineAccountsV2",
+                value: `${mockTeamsPlan.SecretsManager!.baseServiceAccount} machine accounts included`,
+              },
+            ],
+          },
+        });
+
+        const enterpriseTier = tiers.find(
+          (tier) => tier.id === BusinessSubscriptionPricingTierIds.Enterprise,
+        );
+        expect(enterpriseTier).toEqual({
+          id: BusinessSubscriptionPricingTierIds.Enterprise,
+          name: "Enterprise",
+          description: "Enterprise plan description",
+          availableCadences: [SubscriptionCadenceIds.Annually, SubscriptionCadenceIds.Monthly],
+          passwordManager: {
+            type: "scalable",
+            annualPricePerUser: mockEnterprisePlan.PasswordManager.seatPrice,
+            annualPricePerAdditionalStorageGB:
+              mockEnterprisePlan.PasswordManager.additionalStoragePricePerGb,
+            features: [
+              { key: "enterpriseSecurityPolicies", value: "Enterprise security policies" },
+              { key: "passwordLessSso", value: "Passwordless SSO" },
+              { key: "accountRecovery", value: "Account recovery" },
+              { key: "selfHostOption", value: "Self-host option" },
+              { key: "complimentaryFamiliesPlan", value: "Complimentary families plan" },
+            ],
+          },
+          secretsManager: {
+            type: "scalable",
+            annualPricePerUser: mockEnterprisePlan.SecretsManager!.seatPrice,
+            annualPricePerAdditionalServiceAccount:
+              mockEnterprisePlan.SecretsManager!.additionalPricePerServiceAccount,
+            features: [
+              { key: "unlimitedUsers", value: "Unlimited users" },
+              {
+                key: "includedMachineAccountsV2",
+                value: `${mockEnterprisePlan.SecretsManager!.baseServiceAccount} machine accounts included`,
+              },
+            ],
+          },
+        });
+
+        expect(i18nService.t).toHaveBeenCalledWith("planNameFree");
+        expect(i18nService.t).toHaveBeenCalledWith("planDescFreeV2", "1");
+        expect(i18nService.t).toHaveBeenCalledWith(
+          "limitedUsersV2",
+          mockFreePlan.PasswordManager.maxSeats,
+        );
+        expect(i18nService.t).toHaveBeenCalledWith(
+          "limitedCollectionsV2",
+          mockFreePlan.PasswordManager.maxCollections,
+        );
+        expect(i18nService.t).toHaveBeenCalledWith("alwaysFree");
+        expect(i18nService.t).toHaveBeenCalledWith("twoSecretsIncluded");
+        expect(i18nService.t).toHaveBeenCalledWith(
+          "projectsIncludedV2",
+          mockFreePlan.SecretsManager!.maxProjects,
+        );
+        expect(i18nService.t).toHaveBeenCalledWith("planNameTeams");
+        expect(i18nService.t).toHaveBeenCalledWith("teamsPlanUpgradeMessage");
+        expect(i18nService.t).toHaveBeenCalledWith("planNameEnterprise");
+        expect(i18nService.t).toHaveBeenCalledWith("planDescEnterpriseV2");
+        expect(i18nService.t).toHaveBeenCalledWith("secureItemSharing");
+        expect(i18nService.t).toHaveBeenCalledWith("eventLogMonitoring");
+        expect(i18nService.t).toHaveBeenCalledWith("directoryIntegration");
+        expect(i18nService.t).toHaveBeenCalledWith("scimSupport");
+        expect(i18nService.t).toHaveBeenCalledWith("unlimitedSecretsAndProjects");
+        expect(i18nService.t).toHaveBeenCalledWith("includedMachineAccountsV2", 20);
+        expect(i18nService.t).toHaveBeenCalledWith("enterpriseSecurityPolicies");
+        expect(i18nService.t).toHaveBeenCalledWith("passwordLessSso");
+        expect(i18nService.t).toHaveBeenCalledWith("accountRecovery");
+        expect(i18nService.t).toHaveBeenCalledWith("selfHostOption");
+        expect(i18nService.t).toHaveBeenCalledWith("complimentaryFamiliesPlan");
+        expect(i18nService.t).toHaveBeenCalledWith("unlimitedUsers");
+        expect(i18nService.t).toHaveBeenCalledWith("includedMachineAccountsV2", 50);
+
+        done();
+      });
+    });
+
+    it("should handle API errors by logging and showing toast", (done) => {
+      const errorApiService = mock<ApiService>();
+      const errorI18nService = mock<I18nService>();
+      const errorLogService = mock<LogService>();
+      const errorToastService = mock<ToastService>();
+
+      const testError = new Error("API error");
+      errorApiService.getPlans.mockRejectedValue(testError);
+
+      errorI18nService.t.mockImplementation((key: string) => {
+        if (key === "unexpectedError") {
+          return "An unexpected error has occurred.";
+        }
+        return key;
+      });
+
+      const errorService = new SubscriptionPricingService(
+        errorApiService,
+        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.",
+          });
+          done();
+        },
+        error: () => {
+          fail("Observable should not error, it should return empty array");
+        },
+      });
+    });
+  });
+
+  describe("Observable behavior and caching", () => {
+    it("should share API response between multiple subscriptions", () => {
+      const getPlansResponse = jest.spyOn(apiService, "getPlans");
+
+      // Subscribe to multiple observables
+      service.getPersonalSubscriptionPricingTiers$().subscribe();
+      service.getBusinessSubscriptionPricingTiers$().subscribe();
+      service.getDeveloperSubscriptionPricingTiers$().subscribe();
+
+      // API should only be called once due to shareReplay
+      expect(getPlansResponse).toHaveBeenCalledTimes(1);
+    });
+  });
+});
diff --git a/apps/web/src/app/billing/services/subscription-pricing.service.ts b/apps/web/src/app/billing/services/subscription-pricing.service.ts
new file mode 100644
index 00000000000..fad797bed51
--- /dev/null
+++ b/apps/web/src/app/billing/services/subscription-pricing.service.ts
@@ -0,0 +1,360 @@
+import { Injectable } from "@angular/core";
+import { combineLatest, from, map, Observable, of, shareReplay } from "rxjs";
+import { catchError } from "rxjs/operators";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { PlanType } from "@bitwarden/common/billing/enums";
+import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+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 {
+  BusinessSubscriptionPricingTier,
+  BusinessSubscriptionPricingTierIds,
+  PersonalSubscriptionPricingTier,
+  PersonalSubscriptionPricingTierIds,
+  SubscriptionCadenceIds,
+} from "@bitwarden/web-vault/app/billing/types/subscription-pricing-tier";
+
+@Injectable({ providedIn: BillingServicesModule })
+export class SubscriptionPricingService {
+  constructor(
+    private apiService: ApiService,
+    private i18nService: I18nService,
+    private logService: LogService,
+    private toastService: ToastService,
+  ) {}
+
+  getPersonalSubscriptionPricingTiers$ = (): Observable<PersonalSubscriptionPricingTier[]> =>
+    combineLatest([this.premium$, this.families$]).pipe(
+      catchError((error: unknown) => {
+        this.logService.error(error);
+        this.showUnexpectedErrorToast();
+        return of([]);
+      }),
+    );
+
+  getBusinessSubscriptionPricingTiers$ = (): Observable<BusinessSubscriptionPricingTier[]> =>
+    combineLatest([this.teams$, this.enterprise$, this.custom$]).pipe(
+      catchError((error: unknown) => {
+        this.logService.error(error);
+        this.showUnexpectedErrorToast();
+        return of([]);
+      }),
+    );
+
+  getDeveloperSubscriptionPricingTiers$ = (): Observable<BusinessSubscriptionPricingTier[]> =>
+    combineLatest([this.free$, this.teams$, this.enterprise$]).pipe(
+      catchError((error: unknown) => {
+        this.logService.error(error);
+        this.showUnexpectedErrorToast();
+        return of([]);
+      }),
+    );
+
+  private plansResponse$: Observable<ListResponse<PlanResponse>> = from(
+    this.apiService.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 families$: Observable<PersonalSubscriptionPricingTier> = this.plansResponse$.pipe(
+    map((plans) => {
+      const familiesPlan = plans.data.find((plan) => plan.type === PlanType.FamiliesAnnually)!;
+
+      return {
+        id: PersonalSubscriptionPricingTierIds.Families,
+        name: this.i18nService.t("planNameFamilies"),
+        description: this.i18nService.t("planDescFamiliesV2"),
+        availableCadences: [SubscriptionCadenceIds.Annually],
+        passwordManager: {
+          type: "packaged",
+          users: familiesPlan.PasswordManager.baseSeats,
+          annualPrice: familiesPlan.PasswordManager.basePrice,
+          annualPricePerAdditionalStorageGB:
+            familiesPlan.PasswordManager.additionalStoragePricePerGb,
+          features: [
+            this.featureTranslations.premiumAccounts(),
+            this.featureTranslations.familiesUnlimitedSharing(),
+            this.featureTranslations.familiesUnlimitedCollections(),
+            this.featureTranslations.familiesSharedStorage(),
+          ],
+        },
+      };
+    }),
+  );
+
+  private free$: Observable<BusinessSubscriptionPricingTier> = this.plansResponse$.pipe(
+    map((plans) => {
+      const freePlan = plans.data.find((plan) => plan.type === PlanType.Free)!;
+
+      return {
+        id: BusinessSubscriptionPricingTierIds.Free,
+        name: this.i18nService.t("planNameFree"),
+        description: this.i18nService.t("planDescFreeV2", "1"),
+        availableCadences: [],
+        passwordManager: {
+          type: "free",
+          features: [
+            this.featureTranslations.limitedUsersV2(freePlan.PasswordManager.maxSeats),
+            this.featureTranslations.limitedCollectionsV2(freePlan.PasswordManager.maxCollections),
+            this.featureTranslations.alwaysFree(),
+          ],
+        },
+        secretsManager: {
+          type: "free",
+          features: [
+            this.featureTranslations.twoSecretsIncluded(),
+            this.featureTranslations.projectsIncludedV2(freePlan.SecretsManager.maxProjects),
+          ],
+        },
+      };
+    }),
+  );
+
+  private teams$: Observable<BusinessSubscriptionPricingTier> = this.plansResponse$.pipe(
+    map((plans) => {
+      const annualTeamsPlan = plans.data.find((plan) => plan.type === PlanType.TeamsAnnually)!;
+
+      return {
+        id: BusinessSubscriptionPricingTierIds.Teams,
+        name: this.i18nService.t("planNameTeams"),
+        description: this.i18nService.t("teamsPlanUpgradeMessage"),
+        availableCadences: [SubscriptionCadenceIds.Annually, SubscriptionCadenceIds.Monthly],
+        passwordManager: {
+          type: "scalable",
+          annualPricePerUser: annualTeamsPlan.PasswordManager.seatPrice,
+          annualPricePerAdditionalStorageGB:
+            annualTeamsPlan.PasswordManager.additionalStoragePricePerGb,
+          features: [
+            this.featureTranslations.secureItemSharing(),
+            this.featureTranslations.eventLogMonitoring(),
+            this.featureTranslations.directoryIntegration(),
+            this.featureTranslations.scimSupport(),
+          ],
+        },
+        secretsManager: {
+          type: "scalable",
+          annualPricePerUser: annualTeamsPlan.SecretsManager.seatPrice,
+          annualPricePerAdditionalServiceAccount:
+            annualTeamsPlan.SecretsManager.additionalPricePerServiceAccount,
+          features: [
+            this.featureTranslations.unlimitedSecretsAndProjects(),
+            this.featureTranslations.includedMachineAccountsV2(
+              annualTeamsPlan.SecretsManager.baseServiceAccount,
+            ),
+          ],
+        },
+      };
+    }),
+  );
+
+  private enterprise$: Observable<BusinessSubscriptionPricingTier> = this.plansResponse$.pipe(
+    map((plans) => {
+      const annualEnterprisePlan = plans.data.find(
+        (plan) => plan.type === PlanType.EnterpriseAnnually,
+      )!;
+
+      return {
+        id: BusinessSubscriptionPricingTierIds.Enterprise,
+        name: this.i18nService.t("planNameEnterprise"),
+        description: this.i18nService.t("planDescEnterpriseV2"),
+        availableCadences: [SubscriptionCadenceIds.Annually, SubscriptionCadenceIds.Monthly],
+        passwordManager: {
+          type: "scalable",
+          annualPricePerUser: annualEnterprisePlan.PasswordManager.seatPrice,
+          annualPricePerAdditionalStorageGB:
+            annualEnterprisePlan.PasswordManager.additionalStoragePricePerGb,
+          features: [
+            this.featureTranslations.enterpriseSecurityPolicies(),
+            this.featureTranslations.passwordLessSso(),
+            this.featureTranslations.accountRecovery(),
+            this.featureTranslations.selfHostOption(),
+            this.featureTranslations.complimentaryFamiliesPlan(),
+          ],
+        },
+        secretsManager: {
+          type: "scalable",
+          annualPricePerUser: annualEnterprisePlan.SecretsManager.seatPrice,
+          annualPricePerAdditionalServiceAccount:
+            annualEnterprisePlan.SecretsManager.additionalPricePerServiceAccount,
+          features: [
+            this.featureTranslations.unlimitedUsers(),
+            this.featureTranslations.includedMachineAccountsV2(
+              annualEnterprisePlan.SecretsManager.baseServiceAccount,
+            ),
+          ],
+        },
+      };
+    }),
+  );
+
+  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(),
+        ],
+      },
+    })),
+  );
+
+  private showUnexpectedErrorToast() {
+    this.toastService.showToast({
+      variant: "error",
+      title: "",
+      message: this.i18nService.t("unexpectedError"),
+    });
+  }
+
+  private featureTranslations = {
+    builtInAuthenticator: () => ({
+      key: "builtInAuthenticator",
+      value: this.i18nService.t("builtInAuthenticator"),
+    }),
+    emergencyAccess: () => ({
+      key: "emergencyAccess",
+      value: this.i18nService.t("emergencyAccess"),
+    }),
+    breachMonitoring: () => ({
+      key: "breachMonitoring",
+      value: this.i18nService.t("breachMonitoring"),
+    }),
+    andMoreFeatures: () => ({
+      key: "andMoreFeatures",
+      value: this.i18nService.t("andMoreFeatures"),
+    }),
+    premiumAccounts: () => ({
+      key: "premiumAccounts",
+      value: this.i18nService.t("premiumAccounts"),
+    }),
+    secureFileStorage: () => ({
+      key: "secureFileStorage",
+      value: this.i18nService.t("secureFileStorage"),
+    }),
+    familiesUnlimitedSharing: () => ({
+      key: "familiesUnlimitedSharing",
+      value: this.i18nService.t("familiesUnlimitedSharing"),
+    }),
+    familiesUnlimitedCollections: () => ({
+      key: "familiesUnlimitedCollections",
+      value: this.i18nService.t("familiesUnlimitedCollections"),
+    }),
+    familiesSharedStorage: () => ({
+      key: "familiesSharedStorage",
+      value: this.i18nService.t("familiesSharedStorage"),
+    }),
+    limitedUsersV2: (users: number) => ({
+      key: "limitedUsersV2",
+      value: this.i18nService.t("limitedUsersV2", users),
+    }),
+    limitedCollectionsV2: (collections: number) => ({
+      key: "limitedCollectionsV2",
+      value: this.i18nService.t("limitedCollectionsV2", collections),
+    }),
+    alwaysFree: () => ({
+      key: "alwaysFree",
+      value: this.i18nService.t("alwaysFree"),
+    }),
+    twoSecretsIncluded: () => ({
+      key: "twoSecretsIncluded",
+      value: this.i18nService.t("twoSecretsIncluded"),
+    }),
+    projectsIncludedV2: (projects: number) => ({
+      key: "projectsIncludedV2",
+      value: this.i18nService.t("projectsIncludedV2", projects),
+    }),
+    secureItemSharing: () => ({
+      key: "secureItemSharing",
+      value: this.i18nService.t("secureItemSharing"),
+    }),
+    eventLogMonitoring: () => ({
+      key: "eventLogMonitoring",
+      value: this.i18nService.t("eventLogMonitoring"),
+    }),
+    directoryIntegration: () => ({
+      key: "directoryIntegration",
+      value: this.i18nService.t("directoryIntegration"),
+    }),
+    scimSupport: () => ({
+      key: "scimSupport",
+      value: this.i18nService.t("scimSupport"),
+    }),
+    unlimitedSecretsAndProjects: () => ({
+      key: "unlimitedSecretsAndProjects",
+      value: this.i18nService.t("unlimitedSecretsAndProjects"),
+    }),
+    includedMachineAccountsV2: (included: number) => ({
+      key: "includedMachineAccountsV2",
+      value: this.i18nService.t("includedMachineAccountsV2", included),
+    }),
+    enterpriseSecurityPolicies: () => ({
+      key: "enterpriseSecurityPolicies",
+      value: this.i18nService.t("enterpriseSecurityPolicies"),
+    }),
+    passwordLessSso: () => ({
+      key: "passwordLessSso",
+      value: this.i18nService.t("passwordLessSso"),
+    }),
+    accountRecovery: () => ({
+      key: "accountRecovery",
+      value: this.i18nService.t("accountRecovery"),
+    }),
+    selfHostOption: () => ({
+      key: "selfHostOption",
+      value: this.i18nService.t("selfHostOption"),
+    }),
+    complimentaryFamiliesPlan: () => ({
+      key: "complimentaryFamiliesPlan",
+      value: this.i18nService.t("complimentaryFamiliesPlan"),
+    }),
+    unlimitedUsers: () => ({
+      key: "unlimitedUsers",
+      value: this.i18nService.t("unlimitedUsers"),
+    }),
+    strengthenCybersecurity: () => ({
+      key: "strengthenCybersecurity",
+      value: this.i18nService.t("strengthenCybersecurity"),
+    }),
+    boostProductivity: () => ({
+      key: "boostProductivity",
+      value: this.i18nService.t("boostProductivity"),
+    }),
+    seamlessIntegration: () => ({
+      key: "seamlessIntegration",
+      value: this.i18nService.t("seamlessIntegration"),
+    }),
+  };
+}
diff --git a/apps/web/src/app/billing/services/trial-flow.service.ts b/apps/web/src/app/billing/services/trial-flow.service.ts
deleted file mode 100644
index 831cc129e60..00000000000
--- a/apps/web/src/app/billing/services/trial-flow.service.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Injectable } from "@angular/core";
-import { Router } from "@angular/router";
-import { lastValueFrom } from "rxjs";
-
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
-import { BillingSourceResponse } from "@bitwarden/common/billing/models/response/billing.response";
-import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
-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 { DialogService } from "@bitwarden/components";
-
-import {
-  ChangePlanDialogResultType,
-  openChangePlanDialog,
-} from "../organizations/change-plan-dialog.component";
-import { FreeTrial } from "../types/free-trial";
-
-@Injectable({ providedIn: "root" })
-export class TrialFlowService {
-  constructor(
-    private i18nService: I18nService,
-    protected dialogService: DialogService,
-    private router: Router,
-    protected billingApiService: BillingApiServiceAbstraction,
-    private organizationApiService: OrganizationApiServiceAbstraction,
-    private configService: ConfigService,
-  ) {}
-  checkForOrgsWithUpcomingPaymentIssues(
-    organization: Organization,
-    organizationSubscription: OrganizationSubscriptionResponse,
-    paymentSource: BillingSourceResponse | PaymentSourceResponse,
-  ): FreeTrial {
-    const trialEndDate = organizationSubscription?.subscription?.trialEndDate;
-    const displayBanner =
-      !paymentSource &&
-      organization?.isOwner &&
-      organizationSubscription?.subscription?.status === "trialing";
-    const trialRemainingDays = trialEndDate ? this.calculateTrialRemainingDays(trialEndDate) : 0;
-    const freeTrialMessage = this.getFreeTrialMessage(trialRemainingDays);
-
-    return {
-      remainingDays: trialRemainingDays,
-      message: freeTrialMessage,
-      shownBanner: displayBanner,
-      organizationId: organization.id,
-      organizationName: organization.name,
-    };
-  }
-
-  calculateTrialRemainingDays(trialEndDate: string): number | undefined {
-    const today = new Date();
-    const trialEnd = new Date(trialEndDate);
-    const timeDifference = trialEnd.getTime() - today.getTime();
-
-    return Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
-  }
-
-  getFreeTrialMessage(trialRemainingDays: number): string {
-    if (trialRemainingDays >= 2) {
-      return this.i18nService.t("freeTrialEndPromptCount", trialRemainingDays);
-    } else if (trialRemainingDays === 1) {
-      return this.i18nService.t("freeTrialEndPromptTomorrowNoOrgName");
-    } else {
-      return this.i18nService.t("freeTrialEndingTodayWithoutOrgName");
-    }
-  }
-
-  async handleUnpaidSubscriptionDialog(
-    org: Organization,
-    organizationBillingMetadata: OrganizationBillingMetadataResponse,
-  ): Promise<void> {
-    if (
-      organizationBillingMetadata.isSubscriptionUnpaid ||
-      organizationBillingMetadata.isSubscriptionCanceled
-    ) {
-      const confirmed = await this.promptForPaymentNavigation(
-        org,
-        organizationBillingMetadata.isSubscriptionCanceled,
-        organizationBillingMetadata.isSubscriptionUnpaid,
-      );
-      if (confirmed) {
-        await this.navigateToPaymentMethod(org?.id);
-      }
-    }
-  }
-
-  private async promptForPaymentNavigation(
-    org: Organization,
-    isCanceled: boolean,
-    isUnpaid: boolean,
-  ): Promise<boolean> {
-    if (!org?.isOwner && !org.providerId) {
-      await this.dialogService.openSimpleDialog({
-        title: this.i18nService.t("suspendedOrganizationTitle", org?.name),
-        content: { key: "suspendedUserOrgMessage" },
-        type: "danger",
-        acceptButtonText: this.i18nService.t("close"),
-        cancelButtonText: null,
-      });
-      return false;
-    }
-
-    if (org.providerId) {
-      await this.dialogService.openSimpleDialog({
-        title: this.i18nService.t("suspendedOrganizationTitle", org.name),
-        content: { key: "suspendedManagedOrgMessage", placeholders: [org.providerName] },
-        type: "danger",
-        acceptButtonText: this.i18nService.t("close"),
-        cancelButtonText: null,
-      });
-      return false;
-    }
-
-    if (org.isOwner && isUnpaid) {
-      return await this.dialogService.openSimpleDialog({
-        title: this.i18nService.t("suspendedOrganizationTitle", org.name),
-        content: { key: "suspendedOwnerOrgMessage" },
-        type: "danger",
-        acceptButtonText: this.i18nService.t("continue"),
-        cancelButtonText: this.i18nService.t("close"),
-      });
-    }
-
-    if (org.isOwner && isCanceled) {
-      await this.changePlan(org);
-    }
-  }
-
-  private async navigateToPaymentMethod(orgId: string) {
-    const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
-      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
-    );
-    const route = managePaymentDetailsOutsideCheckout ? "payment-details" : "payment-method";
-    await this.router.navigate(["organizations", `${orgId}`, "billing", route], {
-      state: { launchPaymentModalAutomatically: true },
-      queryParams: { launchPaymentModalAutomatically: true },
-    });
-  }
-
-  private async changePlan(org: Organization) {
-    const subscription = await this.organizationApiService.getSubscription(org.id);
-    const reference = openChangePlanDialog(this.dialogService, {
-      data: {
-        organizationId: org.id,
-        subscription: subscription,
-        productTierType: org.productTierType,
-      },
-    });
-
-    const result = await lastValueFrom(reference.closed);
-    if (result === ChangePlanDialogResultType.Closed) {
-      return;
-    }
-  }
-}
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/billing-shared.module.ts b/apps/web/src/app/billing/shared/billing-shared.module.ts
index 7322f047551..fb593b39328 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,40 @@
 import { NgModule } from "@angular/core";
 
 import { BannerModule } from "@bitwarden/components";
+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,
   ],
   declarations: [
-    AddCreditDialogComponent,
     BillingHistoryComponent,
-    PaymentMethodComponent,
     SecretsManagerSubscribeComponent,
     UpdateLicenseComponent,
     UpdateLicenseDialogComponent,
     OffboardingSurveyComponent,
-    AdjustPaymentDialogComponent,
     AdjustStorageDialogComponent,
     IndividualSelfHostingLicenseUploaderComponent,
     OrganizationSelfHostingLicenseUploaderComponent,
@@ -50,14 +44,11 @@ import { VerifyBankAccountComponent } from "./verify-bank-account/verify-bank-ac
   ],
   exports: [
     SharedModule,
-    TaxInfoComponent,
     BillingHistoryComponent,
     SecretsManagerSubscribeComponent,
     UpdateLicenseComponent,
     UpdateLicenseDialogComponent,
     OffboardingSurveyComponent,
-    VerifyBankAccountComponent,
-    PaymentComponent,
     IndividualSelfHostingLicenseUploaderComponent,
     OrganizationSelfHostingLicenseUploaderComponent,
   ],
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/payment-method.component.html b/apps/web/src/app/billing/shared/payment-method.component.html
deleted file mode 100644
index 16e1939907d..00000000000
--- a/apps/web/src/app/billing/shared/payment-method.component.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<bit-banner
-  id="free-trial-banner"
-  class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
-  bannerType="premium"
-  icon="bwi-billing"
-  [showClose]="false"
-  *ngIf="freeTrialData?.shownBanner"
->
-  {{ freeTrialData?.message }}
-  <a
-    bitLink
-    linkType="secondary"
-    (click)="changePayment()"
-    class="tw-cursor-pointer"
-    rel="noreferrer noopener"
-  >
-    {{ "clickHereToAddPaymentMethod" | i18n }}
-  </a>
-</bit-banner>
-
-<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 91d5925669a..00000000000
--- a/apps/web/src/app/billing/shared/payment-method.component.ts
+++ /dev/null
@@ -1,280 +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 {
-  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 { 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 { TrialFlowService } from "../services/trial-flow.service";
-import { FreeTrial } from "../types/free-trial";
-
-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;
-  protected freeTrialData?: FreeTrial;
-
-  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 trialFlowService: TrialFlowService,
-    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,
-      ]);
-      this.determineOrgsWithUpcomingPaymentIssues();
-    } 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();
-  };
-
-  determineOrgsWithUpcomingPaymentIssues() {
-    if (!this.organization || !this.org || !this.billing) {
-      throw new Error("Organization, organization subscription, or billing is not defined");
-    }
-
-    this.freeTrialData = this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
-      this.organization,
-      this.org,
-      this.billing?.paymentSource,
-    );
-  }
-
-  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.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/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..1b416eae1bc 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
@@ -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..ed59e2a2d97 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";
 
@@ -60,10 +71,10 @@ interface OnSuccessArgs {
   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 {
+  @ViewChild(EnterPaymentMethodComponent) enterPaymentMethodComponent!: EnterPaymentMethodComponent;
 
   currentPlan!: PlanResponse;
   currentPlanName!: string;
@@ -78,10 +89,16 @@ export class TrialPaymentDialogComponent implements OnInit {
 
   @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 +110,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 +152,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 +222,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 +242,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 +254,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 +317,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 +366,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 +382,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/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..baccabdc763 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,13 +30,10 @@ 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 =
@@ -95,7 +92,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,
@@ -338,14 +334,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 +422,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/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..51b7f0c7117
--- /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-semibold">{{ "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-semibold">{{ "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..0f185564c2e
--- /dev/null
+++ b/apps/web/src/app/billing/trial-initiation/trial-billing-step/trial-billing-step.component.ts
@@ -0,0 +1,160 @@
+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;
+}
+
+@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 {
+  @ViewChild(EnterPaymentMethodComponent) enterPaymentMethodComponent!: EnterPaymentMethodComponent;
+
+  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..9e4f45ede92
--- /dev/null
+++ b/apps/web/src/app/billing/trial-initiation/trial-billing-step/trial-billing-step.service.ts
@@ -0,0 +1,209 @@
+import { Injectable } from "@angular/core";
+import { 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 { 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 plans$ = from(this.apiService.getPlans()).pipe(
+    shareReplay({ bufferSize: 1, refCount: true }),
+  );
+
+  getPrices$ = (product: Product, tier: Tier) =>
+    this.plans$.pipe(
+      map((plans) => {
+        switch (tier) {
+          case "families": {
+            const annually = plans.data.find((plan) => plan.type === PlanType.FamiliesAnnually);
+            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$);
+      switch (tier) {
+        case "families":
+          return plans.data.find((plan) => plan.type === PlanType.FamiliesAnnually)!.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/types/free-trial.ts b/apps/web/src/app/billing/types/free-trial.ts
deleted file mode 100644
index ee5fb921621..00000000000
--- a/apps/web/src/app/billing/types/free-trial.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export type FreeTrial = {
-  remainingDays: number;
-  message: string;
-  shownBanner: boolean;
-  organizationId: string;
-  organizationName: string;
-};
diff --git a/apps/web/src/app/billing/types/index.ts b/apps/web/src/app/billing/types/index.ts
index 50c007677f3..de1c7a584a0 100644
--- a/apps/web/src/app/billing/types/index.ts
+++ b/apps/web/src/app/billing/types/index.ts
@@ -1,2 +1 @@
 export * from "./bitwarden-subscriber";
-export * from "./free-trial";
diff --git a/apps/web/src/app/billing/types/subscription-pricing-tier.ts b/apps/web/src/app/billing/types/subscription-pricing-tier.ts
new file mode 100644
index 00000000000..8febc4b86db
--- /dev/null
+++ b/apps/web/src/app/billing/types/subscription-pricing-tier.ts
@@ -0,0 +1,85 @@
+export const PersonalSubscriptionPricingTierIds = {
+  Premium: "premium",
+  Families: "families",
+} as const;
+
+export const BusinessSubscriptionPricingTierIds = {
+  Free: "free",
+  Teams: "teams",
+  Enterprise: "enterprise",
+  Custom: "custom",
+} as const;
+
+export const SubscriptionCadenceIds = {
+  Annually: "annually",
+  Monthly: "monthly",
+} as const;
+
+export type PersonalSubscriptionPricingTierId =
+  (typeof PersonalSubscriptionPricingTierIds)[keyof typeof PersonalSubscriptionPricingTierIds];
+export type BusinessSubscriptionPricingTierId =
+  (typeof BusinessSubscriptionPricingTierIds)[keyof typeof BusinessSubscriptionPricingTierIds];
+export type SubscriptionCadence =
+  (typeof SubscriptionCadenceIds)[keyof typeof SubscriptionCadenceIds];
+
+type HasFeatures = {
+  features: { key: string; value: string }[];
+};
+
+type HasAdditionalStorage = {
+  annualPricePerAdditionalStorageGB: number;
+};
+
+type StandalonePasswordManager = HasFeatures &
+  HasAdditionalStorage & {
+    type: "standalone";
+    annualPrice: number;
+  };
+
+type PackagedPasswordManager = HasFeatures &
+  HasAdditionalStorage & {
+    type: "packaged";
+    users: number;
+    annualPrice: number;
+  };
+
+type FreePasswordManager = HasFeatures & {
+  type: "free";
+};
+
+type CustomPasswordManager = HasFeatures & {
+  type: "custom";
+};
+
+type ScalablePasswordManager = HasFeatures &
+  HasAdditionalStorage & {
+    type: "scalable";
+    annualPricePerUser: number;
+  };
+
+type FreeSecretsManager = HasFeatures & {
+  type: "free";
+};
+
+type ScalableSecretsManager = HasFeatures & {
+  type: "scalable";
+  annualPricePerUser: number;
+  annualPricePerAdditionalServiceAccount: number;
+};
+
+export type PersonalSubscriptionPricingTier = {
+  id: PersonalSubscriptionPricingTierId;
+  name: string;
+  description: string;
+  availableCadences: Omit<SubscriptionCadence, "monthly">[]; // personal plans are only ever annual
+  passwordManager: StandalonePasswordManager | PackagedPasswordManager;
+};
+
+export type BusinessSubscriptionPricingTier = {
+  id: BusinessSubscriptionPricingTierId;
+  name: string;
+  description: string;
+  availableCadences: SubscriptionCadence[];
+  passwordManager: FreePasswordManager | ScalablePasswordManager | CustomPasswordManager;
+  secretsManager?: FreeSecretsManager | ScalableSecretsManager;
+};
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 7527ef8f0b7..55fa0c0f439 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
@@ -90,12 +90,7 @@ type GetWarning$ = () => Observable<TaxIdWarningType | null>;
       @let view = view$ | async;
 
       @if (view) {
-        <bit-banner
-          id="tax-id-warning-banner"
-          class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
-          bannerType="warning"
-          (onClose)="trackDismissal()"
-        >
+        <bit-banner id="tax-id-warning-banner" bannerType="warning" (onClose)="trackDismissal()">
           {{ view.message }}
           <a
             bitLink
diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts
index 22386144732..29b84ddc382 100644
--- a/apps/web/src/app/core/core.module.ts
+++ b/apps/web/src/app/core/core.module.ts
@@ -41,8 +41,6 @@ import {
   InternalUserDecryptionOptionsServiceAbstraction,
   LoginEmailService,
 } from "@bitwarden/auth/common";
-// eslint-disable-next-line no-restricted-imports
-import { OrganizationIntegrationApiService } from "@bitwarden/bit-common/dirt/integrations";
 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";
@@ -100,6 +98,7 @@ import {
   DefaultThemeStateService,
   ThemeStateService,
 } from "@bitwarden/common/platform/theming/theme-state.service";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 import {
@@ -111,9 +110,13 @@ import { LockComponentService } 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 { WebVaultPremiumUpgradePromptService } from "@bitwarden/web-vault/app/vault/services/web-premium-upgrade-prompt.service";
 
 import { flagEnabled } from "../../utils/flags";
-import { PolicyListService } from "../admin-console/core/policy-list.service";
+import {
+  POLICY_EDIT_REGISTER,
+  ossPolicyEditRegister,
+} from "../admin-console/organizations/policies";
 import {
   WebChangePasswordService,
   WebRegistrationFinishService,
@@ -152,7 +155,10 @@ const safeProviders: SafeProvider[] = [
   safeProvider(InitService),
   safeProvider(RouterService),
   safeProvider(EventService),
-  safeProvider(PolicyListService),
+  safeProvider({
+    provide: POLICY_EDIT_REGISTER,
+    useValue: ossPolicyEditRegister,
+  }),
   safeProvider({
     provide: DEFAULT_VAULT_TIMEOUT,
     deps: [PlatformUtilsService],
@@ -400,9 +406,9 @@ const safeProviders: SafeProvider[] = [
     deps: [],
   }),
   safeProvider({
-    provide: OrganizationIntegrationApiService,
-    useClass: OrganizationIntegrationApiService,
-    deps: [ApiService],
+    provide: PremiumUpgradePromptService,
+    useClass: WebVaultPremiumUpgradePromptService,
+    deps: [DialogService, Router],
   }),
 ];
 
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/web-platform-utils.service.spec.ts b/apps/web/src/app/core/web-platform-utils.service.spec.ts
index 6dba3fda782..b177bffcce9 100644
--- a/apps/web/src/app/core/web-platform-utils.service.spec.ts
+++ b/apps/web/src/app/core/web-platform-utils.service.spec.ts
@@ -203,4 +203,35 @@ describe("Web Platform Utils Service", () => {
       },
     );
   });
+
+  describe("isChromium", () => {
+    const chromiumDevices = [
+      DeviceType.ChromeBrowser,
+      DeviceType.EdgeBrowser,
+      DeviceType.OperaBrowser,
+      DeviceType.VivaldiBrowser,
+    ];
+
+    const nonChromiumDevices = [
+      DeviceType.FirefoxBrowser,
+      DeviceType.SafariBrowser,
+      DeviceType.IEBrowser,
+      DeviceType.DuckDuckGoBrowser,
+      DeviceType.UnknownBrowser,
+    ];
+
+    afterEach(() => {
+      jest.restoreAllMocks();
+    });
+
+    test.each(chromiumDevices)("returns true when getDevice() is %s", (deviceType) => {
+      jest.spyOn(webPlatformUtilsService, "getDevice").mockReturnValue(deviceType);
+      expect(webPlatformUtilsService.isChromium()).toBe(true);
+    });
+
+    test.each(nonChromiumDevices)("returns false when getDevice() is %s", (deviceType) => {
+      jest.spyOn(webPlatformUtilsService, "getDevice").mockReturnValue(deviceType);
+      expect(webPlatformUtilsService.isChromium()).toBe(false);
+    });
+  });
 });
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 ada0b09aa17..dea4323bcc4 100644
--- a/apps/web/src/app/core/web-platform-utils.service.ts
+++ b/apps/web/src/app/core/web-platform-utils.service.ts
@@ -90,6 +90,10 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
     return this.getDevice() === DeviceType.SafariBrowser;
   }
 
+  isChromium(): boolean {
+    return this.isChrome() || this.isEdge() || this.isOpera() || this.isVivaldi();
+  }
+
   isWebKit(): boolean {
     return true;
   }
diff --git a/apps/web/src/app/dirt/reports/pages/breach-report.component.spec.ts b/apps/web/src/app/dirt/reports/pages/breach-report.component.spec.ts
index 9af15749a91..143dce3915e 100644
--- a/apps/web/src/app/dirt/reports/pages/breach-report.component.spec.ts
+++ b/apps/web/src/app/dirt/reports/pages/breach-report.component.spec.ts
@@ -8,7 +8,7 @@ import { BehaviorSubject } from "rxjs";
 import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { AccountInfo, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { BreachAccountResponse } from "@bitwarden/common/models/response/breach-account.response";
+import { BreachAccountResponse } from "@bitwarden/common/dirt/models/response/breach-account.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { UserId } from "@bitwarden/common/types/guid";
 
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 47bf0844468..b197c7dcae8 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
@@ -6,7 +6,7 @@ import { firstValueFrom, map } from "rxjs";
 
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { BreachAccountResponse } from "@bitwarden/common/models/response/breach-account.response";
+import { BreachAccountResponse } from "@bitwarden/common/dirt/models/response/breach-account.response";
 
 @Component({
   selector: "app-breach-report",
diff --git a/apps/web/src/app/dirt/reports/reports.ts b/apps/web/src/app/dirt/reports/reports.ts
index d7437382961..eb24f780021 100644
--- a/apps/web/src/app/dirt/reports/reports.ts
+++ b/apps/web/src/app/dirt/reports/reports.ts
@@ -1,11 +1,11 @@
 import {
-  MemberAccess,
+  NoCredentialsIcon,
   ReportBreach,
   ReportExposedPasswords,
-  ReportInactiveTwoFactor,
-  ReportReusedPasswords,
   ReportUnsecuredWebsites,
-  ReportWeakPasswords,
+  TwoFactorAuthSecurityKeyFailedIcon,
+  UnlockedIcon,
+  UserLockIcon,
 } from "@bitwarden/assets/svg";
 
 import { ReportEntry } from "./shared";
@@ -35,13 +35,13 @@ export const reports: Record<ReportType, ReportWithoutVariant> = {
     title: "reusedPasswordsReport",
     description: "reusedPasswordsReportDesc",
     route: "reused-passwords-report",
-    icon: ReportReusedPasswords,
+    icon: NoCredentialsIcon,
   },
   [ReportType.WeakPasswords]: {
     title: "weakPasswordsReport",
     description: "weakPasswordsReportDesc",
     route: "weak-passwords-report",
-    icon: ReportWeakPasswords,
+    icon: UnlockedIcon,
   },
   [ReportType.UnsecuredWebsites]: {
     title: "unsecuredWebsitesReport",
@@ -53,7 +53,7 @@ export const reports: Record<ReportType, ReportWithoutVariant> = {
     title: "inactive2faReport",
     description: "inactive2faReportDesc",
     route: "inactive-two-factor-report",
-    icon: ReportInactiveTwoFactor,
+    icon: TwoFactorAuthSecurityKeyFailedIcon,
   },
   [ReportType.DataBreach]: {
     title: "dataBreachReport",
@@ -65,6 +65,6 @@ export const reports: Record<ReportType, ReportWithoutVariant> = {
     title: "memberAccessReport",
     description: "memberAccessReportDesc",
     route: "member-access-report",
-    icon: MemberAccess,
+    icon: UserLockIcon,
   },
 };
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 5553daf6e7b..8db0db3b5e6 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
@@ -7,7 +7,9 @@
       class="tw-flex tw-h-28 tw-bg-background-alt2 tw-text-center tw-text-primary-300"
       [ngClass]="{ 'tw-grayscale': disabled }"
     >
-      <div class="tw-m-auto"><bit-icon [icon]="icon" aria-hidden="true"></bit-icon></div>
+      <div class="tw-m-auto tw-size-20 tw-content-center">
+        <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>
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 d6a330b55d7..76951bf9451 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
@@ -2,11 +2,11 @@ import { importProvidersFrom } from "@angular/core";
 import { RouterTestingModule } from "@angular/router/testing";
 import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { BadgeModule, IconModule } from "@bitwarden/components";
 
 import { PreloadedEnglishI18nModule } from "../../../../core/tests";
-import { PremiumBadgeComponent } from "../../../../vault/components/premium-badge.component";
 import { ReportVariant } from "../models/report-variant";
 
 import { ReportCardComponent } from "./report-card.component";
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 13523174913..22c7e851bed 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
@@ -2,11 +2,11 @@ import { importProvidersFrom } from "@angular/core";
 import { RouterTestingModule } from "@angular/router/testing";
 import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { BadgeModule, IconModule } from "@bitwarden/components";
 
 import { PreloadedEnglishI18nModule } from "../../../../core/tests";
-import { PremiumBadgeComponent } from "../../../../vault/components/premium-badge.component";
 import { reports } from "../../reports";
 import { ReportVariant } from "../models/report-variant";
 import { ReportCardComponent } from "../report-card/report-card.component";
diff --git a/apps/web/src/app/auth/settings/security/change-kdf/change-kdf-confirmation.component.html b/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.html
similarity index 100%
rename from apps/web/src/app/auth/settings/security/change-kdf/change-kdf-confirmation.component.html
rename to apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.html
diff --git a/apps/web/src/app/auth/settings/security/change-kdf/change-kdf-confirmation.component.ts b/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.ts
similarity index 58%
rename from apps/web/src/app/auth/settings/security/change-kdf/change-kdf-confirmation.component.ts
rename to apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.ts
index 5aa8eeb907c..3e09f710062 100644
--- a/apps/web/src/app/auth/settings/security/change-kdf/change-kdf-confirmation.component.ts
+++ b/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.ts
@@ -4,13 +4,13 @@ import { Component, Inject } from "@angular/core";
 import { FormGroup, FormControl, Validators } from "@angular/forms";
 import { firstValueFrom } from "rxjs";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { KdfRequest } from "@bitwarden/common/models/request/kdf.request";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { ChangeKdfService } from "@bitwarden/common/key-management/kdf/change-kdf-service.abstraction";
 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 { KdfConfig, KdfType, KeyService } from "@bitwarden/key-management";
+import { KdfConfig, KdfType } from "@bitwarden/key-management";
 
 @Component({
   selector: "app-change-kdf-confirmation",
@@ -28,13 +28,12 @@ export class ChangeKdfConfirmationComponent {
   loading = false;
 
   constructor(
-    private apiService: ApiService,
     private i18nService: I18nService,
-    private keyService: KeyService,
     private messagingService: MessagingService,
     @Inject(DIALOG_DATA) params: { kdf: KdfType; kdfConfig: KdfConfig },
     private accountService: AccountService,
     private toastService: ToastService,
+    private changeKdfService: ChangeKdfService,
   ) {
     this.kdfConfig = params.kdfConfig;
     this.masterPassword = null;
@@ -56,37 +55,17 @@ export class ChangeKdfConfirmationComponent {
   };
 
   private async makeKeyAndSaveAsync() {
-    const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
-    if (activeAccount == null) {
-      throw new Error("No active account found.");
-    }
     const masterPassword = this.form.value.masterPassword;
 
     // Ensure the KDF config is valid.
     this.kdfConfig.validateKdfConfigForSetting();
 
-    const request = new KdfRequest();
-    request.kdf = this.kdfConfig.kdfType;
-    request.kdfIterations = this.kdfConfig.iterations;
-    if (this.kdfConfig.kdfType === KdfType.Argon2id) {
-      request.kdfMemory = this.kdfConfig.memory;
-      request.kdfParallelism = this.kdfConfig.parallelism;
-    }
-    const masterKey = await this.keyService.getOrDeriveMasterKey(masterPassword, activeAccount.id);
-    request.masterPasswordHash = await this.keyService.hashMasterKey(masterPassword, masterKey);
+    const activeAccountId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
 
-    const newMasterKey = await this.keyService.makeMasterKey(
+    await this.changeKdfService.updateUserKdfParams(
       masterPassword,
-      activeAccount.email,
       this.kdfConfig,
+      activeAccountId,
     );
-    request.newMasterPasswordHash = await this.keyService.hashMasterKey(
-      masterPassword,
-      newMasterKey,
-    );
-    const newUserKey = await this.keyService.encryptUserKeyWithMasterKey(newMasterKey);
-    request.key = newUserKey[1].encryptedString;
-
-    await this.apiService.postAccountKdf(request);
   }
 }
diff --git a/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.html b/apps/web/src/app/key-management/change-kdf/change-kdf.component.html
similarity index 100%
rename from apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.html
rename to apps/web/src/app/key-management/change-kdf/change-kdf.component.html
diff --git a/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.ts b/apps/web/src/app/key-management/change-kdf/change-kdf.component.ts
similarity index 100%
rename from apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.ts
rename to apps/web/src/app/key-management/change-kdf/change-kdf.component.ts
diff --git a/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.module.ts b/apps/web/src/app/key-management/change-kdf/change-kdf.module.ts
similarity index 90%
rename from apps/web/src/app/auth/settings/security/change-kdf/change-kdf.module.ts
rename to apps/web/src/app/key-management/change-kdf/change-kdf.module.ts
index 3ef1fef03f8..342ad43e368 100644
--- a/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.module.ts
+++ b/apps/web/src/app/key-management/change-kdf/change-kdf.module.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../../../../shared";
+import { SharedModule } from "../../shared";
 
 import { ChangeKdfConfirmationComponent } from "./change-kdf-confirmation.component";
 import { ChangeKdfComponent } from "./change-kdf.component";
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 9a67506c400..f7f611b75ee 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,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import { firstValueFrom, Observable } from "rxjs";
+import { firstValueFrom } from "rxjs";
 
 import { Account } from "@bitwarden/common/auth/abstractions/account.service";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -7,6 +7,7 @@ import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/a
 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 { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -103,18 +104,18 @@ export class UserKeyRotationService {
     }
 
     // Read current cryptographic state / settings
-    const masterKeyKdfConfig: KdfConfig = (await this.firstValueFromOrThrow(
+    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 this.firstValueFromOrThrow(
+    const currentUserKey: UserKey = (await firstValueFromOrThrow(
       this.keyService.userKey$(user.id),
       "User key",
     ))!;
     const currentUserKeyWrappedPrivateKey = new EncString(
-      (await this.firstValueFromOrThrow(
+      (await firstValueFromOrThrow(
         this.keyService.userEncryptedPrivateKey$(user.id),
         "User encrypted private key",
       ))!,
@@ -515,12 +516,4 @@ export class UserKeyRotationService {
       HashPurpose.ServerAuthorization,
     );
   }
-
-  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;
-  }
 }
diff --git a/apps/web/src/app/layouts/header/web-header.component.html b/apps/web/src/app/layouts/header/web-header.component.html
index 91c31853648..4b833e771dd 100644
--- a/apps/web/src/app/layouts/header/web-header.component.html
+++ b/apps/web/src/app/layouts/header/web-header.component.html
@@ -1,6 +1,6 @@
 <header
   *ngIf="routeData$ | async as routeData"
-  class="-tw-m-6 tw-mb-3 tw-flex tw-flex-col tw-p-6"
+  class="-tw-mt-6 -tw-mx-8 tw-mb-3 tw-flex tw-flex-col tw-py-6 tw-px-8"
   [ngClass]="{
     'tw-border-0 tw-border-b tw-border-solid tw-border-secondary-100 tw-bg-background-alt tw-pb-0':
       tabsContainer.childElementCount !== 0,
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 ef702c7e593..96d17e7ada4 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,7 @@
       [route]="['../', org.id]"
       (mainContentClicked)="toggle()"
       [routerLinkActiveOptions]="{ exact: true }"
-      (click)="handleUnpaidSubscription(org)"
+      (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 4f2707cd1b2..31689914f13 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, map, Observable, switchMap } from "rxjs";
+import { combineLatest, firstValueFrom, map, Observable, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -11,13 +11,13 @@ import type { Organization } from "@bitwarden/common/admin-console/models/domain
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { DialogService, NavigationModule } from "@bitwarden/components";
-
-import { TrialFlowService } from "./../../billing/services/trial-flow.service";
+import { OrganizationWarningsModule } from "@bitwarden/web-vault/app/billing/organizations/warnings/organization-warnings.module";
+import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
 
 @Component({
   selector: "org-switcher",
   templateUrl: "org-switcher.component.html",
-  imports: [CommonModule, JslibModule, NavigationModule],
+  imports: [CommonModule, JslibModule, NavigationModule, OrganizationWarningsModule],
 })
 export class OrgSwitcherComponent {
   protected organizations$: Observable<Organization[]> = this.accountService.activeAccount$.pipe(
@@ -64,9 +64,9 @@ export class OrgSwitcherComponent {
     private route: ActivatedRoute,
     protected dialogService: DialogService,
     private organizationService: OrganizationService,
-    private trialFlowService: TrialFlowService,
     protected billingApiService: BillingApiServiceAbstraction,
     private accountService: AccountService,
+    private organizationWarningsService: OrganizationWarningsService,
   ) {}
 
   protected toggle(event?: MouseEvent) {
@@ -75,8 +75,8 @@ export class OrgSwitcherComponent {
     this.openChange.emit(this.open);
   }
 
-  async handleUnpaidSubscription(org: Organization) {
-    const metaData = await this.billingApiService.getOrganizationBillingMetadata(org.id);
-    await this.trialFlowService.handleUnpaidSubscriptionDialog(org, metaData);
-  }
+  showInactiveSubscriptionDialog = async (organization: Organization) =>
+    await firstValueFrom(
+      this.organizationWarningsService.showInactiveSubscriptionDialog$(organization),
+    );
 }
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 f0660f7d655..b5f10f9158e 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
@@ -1,7 +1,7 @@
 import { Component, Directive, importProvidersFrom, Input } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import { applicationConfig, Meta, moduleMetadata, StoryObj } from "@storybook/angular";
-import { BehaviorSubject, firstValueFrom, Observable, of } from "rxjs";
+import { BehaviorSubject, Observable, of } from "rxjs";
 
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
@@ -47,8 +47,8 @@ class MockOrganizationService implements Partial<OrganizationService> {
 class MockProviderService implements Partial<ProviderService> {
   private static _providers = new BehaviorSubject<Provider[]>([]);
 
-  async getAll() {
-    return await firstValueFrom(MockProviderService._providers);
+  providers$() {
+    return MockProviderService._providers.asObservable();
   }
 
   @Input()
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 cc919a929a9..18cb8e26c70 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
@@ -1,7 +1,7 @@
 import { Component, Directive, importProvidersFrom, Input } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import { applicationConfig, Meta, moduleMetadata, StoryObj } from "@storybook/angular";
-import { BehaviorSubject, firstValueFrom, Observable, of } from "rxjs";
+import { BehaviorSubject, Observable, of } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -47,8 +47,8 @@ class MockOrganizationService implements Partial<OrganizationService> {
 class MockProviderService implements Partial<ProviderService> {
   private static _providers = new BehaviorSubject<Provider[]>([]);
 
-  async getAll() {
-    return await firstValueFrom(MockProviderService._providers);
+  providers$() {
+    return MockProviderService._providers.asObservable();
   }
 
   @Input()
@@ -124,6 +124,7 @@ export default {
               switchProducts: "Switch Products",
               secureYourInfrastructure: "Secure your infrastructure",
               protectYourFamilyOrBusiness: "Protect your family or business",
+              loading: "Loading",
             });
           },
         },
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 f72557ac57f..efbeb786f77 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
@@ -52,7 +52,7 @@ describe("ProductSwitcherService", () => {
     router.url = "/";
     router.events = of({});
     organizationService.organizations$.mockReturnValue(of([{}] as Organization[]));
-    providerService.getAll.mockResolvedValue([] as Provider[]);
+    providerService.providers$.mockReturnValue(of([]) as Observable<Provider[]>);
     platformUtilsService.isSelfHost.mockReturnValue(false);
 
     TestBed.configureTestingModule({
@@ -212,7 +212,7 @@ describe("ProductSwitcherService", () => {
       });
 
       it("is included when there are providers", async () => {
-        providerService.getAll.mockResolvedValue([{ id: "67899" }] as Provider[]);
+        providerService.providers$.mockReturnValue(of([{ id: "67899" }]) as Observable<Provider[]>);
 
         initiateService();
 
@@ -263,7 +263,7 @@ describe("ProductSwitcherService", () => {
     });
 
     it("marks Provider Portal as active", async () => {
-      providerService.getAll.mockResolvedValue([{ id: "67899" }] as Provider[]);
+      providerService.providers$.mockReturnValue(of([{ id: "67899" }]) as Observable<Provider[]>);
       router.url = "/providers/";
 
       initiateService();
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 2d296ac7d62..ba86e9fed28 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,17 +2,7 @@
 // @ts-strict-ignore
 import { Injectable } from "@angular/core";
 import { ActivatedRoute, NavigationEnd, NavigationStart, ParamMap, Router } from "@angular/router";
-import {
-  combineLatest,
-  concatMap,
-  filter,
-  firstValueFrom,
-  map,
-  Observable,
-  ReplaySubject,
-  startWith,
-  switchMap,
-} from "rxjs";
+import { combineLatest, filter, map, Observable, ReplaySubject, startWith, switchMap } from "rxjs";
 
 import {
   canAccessOrgAdmin,
@@ -22,6 +12,7 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { PolicyType, ProviderType } from "@bitwarden/common/admin-console/enums";
 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";
@@ -117,148 +108,159 @@ export class ProductSwitcherService {
     switchMap((id) => this.organizationService.organizations$(id)),
   );
 
+  providers$ = this.accountService.activeAccount$.pipe(
+    getUserId,
+    switchMap((id) => this.providerService.providers$(id)),
+  );
+
+  userHasSingleOrgPolicy$ = this.accountService.activeAccount$.pipe(
+    getUserId,
+    switchMap((userId) => this.policyService.policyAppliesToUser$(PolicyType.SingleOrg, userId)),
+  );
+
   products$: Observable<{
     bento: ProductSwitcherItem[];
     other: ProductSwitcherItem[];
-  }> = combineLatest([this.organizations$, this.route.paramMap, this.triggerProductUpdate$]).pipe(
-    map(([orgs, ...rest]): [Organization[], ParamMap, void] => {
-      return [
+  }> = combineLatest([
+    this.organizations$,
+    this.providers$,
+    this.userHasSingleOrgPolicy$,
+    this.route.paramMap,
+    this.triggerProductUpdate$,
+  ]).pipe(
+    map(
+      ([orgs, providers, userHasSingleOrgPolicy, paramMap]: [
+        Organization[],
+        Provider[],
+        boolean,
+        ParamMap,
+        void,
+      ]) => {
         // Sort orgs by name to match the order within the sidebar
-        orgs.sort((a, b) => a.name.localeCompare(b.name)),
-        ...rest,
-      ];
-    }),
-    concatMap(async ([orgs, paramMap]) => {
-      let routeOrg = orgs.find((o) => o.id === paramMap.get("organizationId"));
+        orgs.sort((a, b) => a.name.localeCompare(b.name));
 
-      let organizationIdViaPath: string | null = null;
+        let routeOrg = orgs.find((o) => o.id === paramMap.get("organizationId"));
 
-      if (["/sm/", "/organizations/"].some((path) => this.router.url.includes(path))) {
-        // Grab the organization ID from the URL
-        organizationIdViaPath = this.router.url.split("/")[2] ?? null;
-      }
+        let organizationIdViaPath: string | null = null;
 
-      // When the user is already viewing an organization within an application use it as the active route org
-      if (organizationIdViaPath && !routeOrg) {
-        routeOrg = orgs.find((o) => o.id === organizationIdViaPath);
-      }
-
-      // If the active route org doesn't have access to SM, find the first org that does.
-      const smOrg =
-        routeOrg?.canAccessSecretsManager && routeOrg?.enabled == true
-          ? routeOrg
-          : orgs.find((o) => o.canAccessSecretsManager && o.enabled == true);
-
-      // If the active route org doesn't have access to AC, find the first org that does.
-      const acOrg =
-        routeOrg != null && canAccessOrgAdmin(routeOrg)
-          ? routeOrg
-          : orgs.find((o) => canAccessOrgAdmin(o));
-
-      // TODO: This should be migrated to an Observable provided by the provider service and moved to the combineLatest above. See AC-2092.
-      const providers = await this.providerService.getAll();
-
-      const providerPortalName =
-        providers[0]?.providerType === ProviderType.BusinessUnit
-          ? "Business Unit Portal"
-          : "Provider Portal";
-
-      const orgsMarketingRoute = this.platformUtilsService.isSelfHost()
-        ? {
-            route: "https://bitwarden.com/products/business/",
-            external: true,
-          }
-        : {
-            route: "/create-organization",
-            external: false,
-          };
-
-      const products = {
-        pm: {
-          name: "Password Manager",
-          icon: "bwi-lock",
-          appRoute: "/vault",
-          marketingRoute: {
-            route: "https://bitwarden.com/products/personal/",
-            external: true,
-          },
-          isActive:
-            !this.router.url.includes("/sm/") &&
-            !this.router.url.includes("/organizations/") &&
-            !this.router.url.includes("/providers/"),
-        },
-        sm: {
-          name: "Secrets Manager",
-          icon: "bwi-cli",
-          appRoute: ["/sm", smOrg?.id],
-          marketingRoute: {
-            route: "/sm-landing",
-            external: false,
-          },
-          isActive: this.router.url.includes("/sm/"),
-          otherProductOverrides: {
-            supportingText: this.i18nService.t("secureYourInfrastructure"),
-          },
-        },
-        ac: {
-          name: "Admin Console",
-          icon: "bwi-business",
-          appRoute: ["/organizations", acOrg?.id],
-          marketingRoute: {
-            route: "https://bitwarden.com/products/business/",
-            external: true,
-          },
-          isActive: this.router.url.includes("/organizations/"),
-        },
-        provider: {
-          name: providerPortalName,
-          icon: "bwi-provider",
-          appRoute: ["/providers", providers[0]?.id],
-          isActive: this.router.url.includes("/providers/"),
-        },
-        orgs: {
-          name: "Organizations",
-          icon: "bwi-business",
-          marketingRoute: orgsMarketingRoute,
-          otherProductOverrides: {
-            name: "Share your passwords",
-            supportingText: this.i18nService.t("protectYourFamilyOrBusiness"),
-          },
-        },
-      } satisfies Record<string, ProductSwitcherItem>;
-
-      const bento: ProductSwitcherItem[] = [products.pm];
-      const other: ProductSwitcherItem[] = [];
-
-      if (smOrg) {
-        bento.push(products.sm);
-      } else {
-        other.push(products.sm);
-      }
-
-      if (acOrg) {
-        bento.push(products.ac);
-      } else {
-        const activeUserId = await firstValueFrom(
-          this.accountService.activeAccount$.pipe(getUserId),
-        );
-        const userHasSingleOrgPolicy = await firstValueFrom(
-          this.policyService.policyAppliesToUser$(PolicyType.SingleOrg, activeUserId),
-        );
-        if (!userHasSingleOrgPolicy) {
-          other.push(products.orgs);
+        if (["/sm/", "/organizations/"].some((path) => this.router.url.includes(path))) {
+          // Grab the organization ID from the URL
+          organizationIdViaPath = this.router.url.split("/")[2] ?? null;
         }
-      }
 
-      if (providers.length > 0) {
-        bento.push(products.provider);
-      }
+        // When the user is already viewing an organization within an application use it as the active route org
+        if (organizationIdViaPath && !routeOrg) {
+          routeOrg = orgs.find((o) => o.id === organizationIdViaPath);
+        }
 
-      return {
-        bento,
-        other,
-      };
-    }),
+        // If the active route org doesn't have access to SM, find the first org that does.
+        const smOrg =
+          routeOrg?.canAccessSecretsManager && routeOrg?.enabled == true
+            ? routeOrg
+            : orgs.find((o) => o.canAccessSecretsManager && o.enabled == true);
+
+        // If the active route org doesn't have access to AC, find the first org that does.
+        const acOrg =
+          routeOrg != null && canAccessOrgAdmin(routeOrg)
+            ? routeOrg
+            : orgs.find((o) => canAccessOrgAdmin(o));
+
+        const providerPortalName =
+          providers[0]?.providerType === ProviderType.BusinessUnit
+            ? "Business Unit Portal"
+            : "Provider Portal";
+
+        const orgsMarketingRoute = this.platformUtilsService.isSelfHost()
+          ? {
+              route: "https://bitwarden.com/products/business/",
+              external: true,
+            }
+          : {
+              route: "/create-organization",
+              external: false,
+            };
+
+        const products = {
+          pm: {
+            name: "Password Manager",
+            icon: "bwi-lock",
+            appRoute: "/vault",
+            marketingRoute: {
+              route: "https://bitwarden.com/products/personal/",
+              external: true,
+            },
+            isActive:
+              !this.router.url.includes("/sm/") &&
+              !this.router.url.includes("/organizations/") &&
+              !this.router.url.includes("/providers/"),
+          },
+          sm: {
+            name: "Secrets Manager",
+            icon: "bwi-cli",
+            appRoute: ["/sm", smOrg?.id],
+            marketingRoute: {
+              route: "/sm-landing",
+              external: false,
+            },
+            isActive: this.router.url.includes("/sm/"),
+            otherProductOverrides: {
+              supportingText: this.i18nService.t("secureYourInfrastructure"),
+            },
+          },
+          ac: {
+            name: "Admin Console",
+            icon: "bwi-business",
+            appRoute: ["/organizations", acOrg?.id],
+            marketingRoute: {
+              route: "https://bitwarden.com/products/business/",
+              external: true,
+            },
+            isActive: this.router.url.includes("/organizations/"),
+          },
+          provider: {
+            name: providerPortalName,
+            icon: "bwi-provider",
+            appRoute: ["/providers", providers[0]?.id],
+            isActive: this.router.url.includes("/providers/"),
+          },
+          orgs: {
+            name: "Organizations",
+            icon: "bwi-business",
+            marketingRoute: orgsMarketingRoute,
+            otherProductOverrides: {
+              name: "Share your passwords",
+              supportingText: this.i18nService.t("protectYourFamilyOrBusiness"),
+            },
+          },
+        } satisfies Record<string, ProductSwitcherItem>;
+
+        const bento: ProductSwitcherItem[] = [products.pm];
+        const other: ProductSwitcherItem[] = [];
+
+        if (smOrg) {
+          bento.push(products.sm);
+        } else {
+          other.push(products.sm);
+        }
+
+        if (acOrg) {
+          bento.push(products.ac);
+        } else {
+          if (!userHasSingleOrgPolicy) {
+            other.push(products.orgs);
+          }
+        }
+
+        if (providers.length > 0) {
+          bento.push(products.provider);
+        }
+
+        return {
+          bento,
+          other,
+        };
+      },
+    ),
   );
 
   /** Poll the `syncService` until a sync is completed */
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index c0b1f9d1622..9ac628752b6 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -14,13 +14,11 @@ import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-manage
 import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.component";
 import {
   DevicesIcon,
-  RegistrationLockAltIcon,
   RegistrationUserAddIcon,
   TwoFactorTimeoutIcon,
-  DeviceVerificationIcon,
+  TwoFactorAuthEmailIcon,
   UserLockIcon,
   VaultIcon,
-  RegistrationExpiredLinkIcon,
   SsoKeyIcon,
   LockIcon,
   BrowserExtensionIcon,
@@ -171,7 +169,7 @@ const routes: Routes = [
         path: "finish-signup",
         canActivate: [unauthGuardFn()],
         data: {
-          pageIcon: RegistrationLockAltIcon,
+          pageIcon: LockIcon,
           titleId: "setAStrongPassword",
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
         children: [
@@ -304,7 +302,7 @@ const routes: Routes = [
         path: "signup-link-expired",
         canActivate: [unauthGuardFn()],
         data: {
-          pageIcon: RegistrationExpiredLinkIcon,
+          pageIcon: TwoFactorTimeoutIcon,
           pageTitle: {
             key: "expiredLink",
           },
@@ -435,7 +433,7 @@ const routes: Routes = [
           },
         ],
         data: {
-          pageIcon: DeviceVerificationIcon,
+          pageIcon: TwoFactorAuthEmailIcon,
           pageTitle: {
             key: "verifyYourIdentity",
           },
diff --git a/apps/web/src/app/settings/preferences.component.html b/apps/web/src/app/settings/preferences.component.html
index 80261ecccb7..050d7395caf 100644
--- a/apps/web/src/app/settings/preferences.component.html
+++ b/apps/web/src/app/settings/preferences.component.html
@@ -67,23 +67,17 @@
       </bit-select>
       <bit-hint>{{ "languageDesc" | i18n }}</bit-hint>
     </bit-form-field>
-    <bit-form-control>
-      <input type="checkbox" bitCheckbox formControlName="enableFavicons" />
-      <bit-label
-        >{{ "enableFavicon" | i18n }}
-        <a
-          bitLink
-          href="https://bitwarden.com/help/website-icons/"
-          target="_blank"
-          rel="noreferrer"
-          appA11yTitle="{{ 'learnMoreAboutWebsiteIcons' | i18n }}"
-          slot="end"
-        >
-          <i class="bwi bwi-question-circle" aria-hidden="true"></i>
-        </a>
-      </bit-label>
-      <bit-hint>{{ "faviconDesc" | i18n }}</bit-hint>
-    </bit-form-control>
+    <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>
     <bit-form-field>
       <bit-label>{{ "theme" | i18n }}</bit-label>
       <bit-select formControlName="theme" id="theme">
diff --git a/apps/web/src/app/settings/preferences.component.ts b/apps/web/src/app/settings/preferences.component.ts
index e6cc35903a7..58a072ce76a 100644
--- a/apps/web/src/app/settings/preferences.component.ts
+++ b/apps/web/src/app/settings/preferences.component.ts
@@ -34,6 +34,7 @@ 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 { PermitCipherDetailsPopoverComponent } from "@bitwarden/vault";
 
 import { HeaderModule } from "../layouts/header/header.module";
 import { SharedModule } from "../shared";
@@ -41,7 +42,12 @@ import { SharedModule } from "../shared";
 @Component({
   selector: "app-preferences",
   templateUrl: "preferences.component.html",
-  imports: [SharedModule, HeaderModule, VaultTimeoutInputComponent],
+  imports: [
+    SharedModule,
+    HeaderModule,
+    VaultTimeoutInputComponent,
+    PermitCipherDetailsPopoverComponent,
+  ],
 })
 export class PreferencesComponent implements OnInit, OnDestroy {
   // For use in template
diff --git a/apps/web/src/app/shared/shared.module.ts b/apps/web/src/app/shared/shared.module.ts
index efb4bb98be6..6012e4867e1 100644
--- a/apps/web/src/app/shared/shared.module.ts
+++ b/apps/web/src/app/shared/shared.module.ts
@@ -22,6 +22,7 @@ import {
   LinkModule,
   MenuModule,
   MultiSelectModule,
+  NoItemsModule,
   ProgressModule,
   RadioButtonModule,
   SectionComponent,
@@ -66,6 +67,7 @@ import {
     LinkModule,
     MenuModule,
     MultiSelectModule,
+    NoItemsModule,
     ProgressModule,
     RadioButtonModule,
     SectionComponent,
@@ -101,6 +103,7 @@ import {
     LinkModule,
     MenuModule,
     MultiSelectModule,
+    NoItemsModule,
     ProgressModule,
     RadioButtonModule,
     SectionComponent,
diff --git a/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.html b/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.html
index 35e03f370ef..fdfe8eb55ff 100644
--- a/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.html
+++ b/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.html
@@ -9,15 +9,9 @@
   </a>
   <a bitMenuItem (click)="createSend(sendType.File)">
     <i class="bwi bwi-file" slot="start" aria-hidden="true"></i>
-    {{ "sendTypeFile" | i18n }}
-    <button
-      type="button"
-      slot="end"
-      *ngIf="!(canAccessPremium$ | async)"
-      bitBadge
-      variant="success"
-    >
-      {{ "premium" | i18n }}
-    </button>
+    <div class="tw-flex tw-items-center tw-gap-2">
+      {{ "sendTypeFile" | i18n }}
+      <app-premium-badge></app-premium-badge>
+    </div>
   </a>
 </bit-menu>
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 64ada8f75d0..bb72ff75a39 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
@@ -1,19 +1,19 @@
 import { CommonModule } from "@angular/common";
 import { Component, Input } from "@angular/core";
-import { Router } from "@angular/router";
 import { firstValueFrom, Observable, of, switchMap } from "rxjs";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 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 { BadgeModule, ButtonModule, DialogService, MenuModule } from "@bitwarden/components";
+import { ButtonModule, DialogService, MenuModule } from "@bitwarden/components";
 import { DefaultSendFormConfigService, SendAddEditDialogComponent } from "@bitwarden/send-ui";
 
 @Component({
   selector: "tools-new-send-dropdown",
   templateUrl: "new-send-dropdown.component.html",
-  imports: [JslibModule, CommonModule, ButtonModule, MenuModule, BadgeModule],
+  imports: [JslibModule, CommonModule, ButtonModule, MenuModule, PremiumBadgeComponent],
   providers: [DefaultSendFormConfigService],
 })
 /**
@@ -30,7 +30,6 @@ export class NewSendDropdownComponent {
   protected canAccessPremium$: Observable<boolean>;
 
   constructor(
-    private router: Router,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private accountService: AccountService,
     private dialogService: DialogService,
@@ -47,16 +46,16 @@ export class NewSendDropdownComponent {
 
   /**
    * Opens the SendAddEditComponent for a new Send with the provided type.
-   * If has user does not have premium access and the type is File, the user will be redirected to the premium settings page.
+   * If has user does not have premium access and the type is File do nothing the PremiumBadgeComponent will handle the flow.
    * @param type The type of Send to create.
    */
   async createSend(type: SendType) {
     if (!(await firstValueFrom(this.canAccessPremium$)) && type === SendType.File) {
-      return await this.router.navigate(["settings/subscription/premium"]);
+      return;
     }
 
     const formConfig = await this.addEditFormConfigService.buildConfig("add", undefined, type);
 
-    await SendAddEditDialogComponent.open(this.dialogService, { formConfig });
+    SendAddEditDialogComponent.open(this.dialogService, { formConfig });
   }
 }
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 2a7514ed854..16c1fcf0747 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,10 +11,10 @@
       (setPasswordEvent)="setPassword($event)"
       *ngIf="passwordRequired && !error"
     ></app-send-access-password>
-    <bit-no-items [icon]="expiredSendIcon" class="tw-text-main" *ngIf="unavailable">
+    <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]="expiredSendIcon" class="tw-text-main" *ngIf="error">
+    <bit-no-items [icon]="sendIcon" class="tw-text-main" *ngIf="error">
       <ng-container slot="description">{{ "unexpectedErrorSend" | i18n }}</ng-container>
     </bit-no-items>
     <div *ngIf="!passwordRequired && send && !error && !unavailable">
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 1636ac37b87..a21644da924 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,7 @@ import { Component, OnInit } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 
-import { ExpiredSendIcon } from "@bitwarden/assets/svg";
+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";
@@ -49,7 +49,7 @@ export class AccessComponent implements OnInit {
   protected hideEmail = false;
   protected decKey: SymmetricCryptoKey;
   protected accessRequest: SendAccessRequest;
-  protected expiredSendIcon = ExpiredSendIcon;
+  protected sendIcon = ActiveSendIcon;
 
   protected formGroup = this.formBuilder.group({});
 
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 a1de4814a13..69dcce52823 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
@@ -1,8 +1,7 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 
+import { isId, OrganizationId } from "@bitwarden/common/types/guid";
 import { ExportComponent } from "@bitwarden/vault-export-ui";
 
 import { HeaderModule } from "../../layouts/header/header.module";
@@ -13,18 +12,27 @@ import { SharedModule } from "../../shared";
   imports: [SharedModule, ExportComponent, HeaderModule],
 })
 export class OrganizationVaultExportComponent implements OnInit {
-  protected routeOrgId: string = null;
+  protected routeOrgId: OrganizationId | undefined = undefined;
   protected loading = false;
   protected disabled = false;
 
   constructor(private route: ActivatedRoute) {}
 
   async ngOnInit() {
-    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;
   }
 
   /**
    * Callback that is called after a successful export.
    */
-  protected async onSuccessfulExport(organizationId: string): Promise<void> {}
+  protected async onSuccessfulExport(organizationId: OrganizationId): Promise<void> {}
 }
diff --git a/apps/web/src/app/vault/components/premium-badge.component.ts b/apps/web/src/app/vault/components/premium-badge.component.ts
deleted file mode 100644
index 4f1d1142f91..00000000000
--- a/apps/web/src/app/vault/components/premium-badge.component.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Component } from "@angular/core";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { BadgeModule } from "@bitwarden/components";
-
-@Component({
-  selector: "app-premium-badge",
-  template: `
-    <button type="button" *appNotPremium bitBadge variant="success" (click)="premiumRequired()">
-      {{ "premium" | i18n }}
-    </button>
-  `,
-  imports: [JslibModule, BadgeModule],
-})
-export class PremiumBadgeComponent {
-  constructor(private messagingService: MessagingService) {}
-
-  premiumRequired() {
-    this.messagingService.send("premiumRequired");
-  }
-}
diff --git a/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.html b/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.html
index cd091e11940..e93b788c528 100644
--- a/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.html
+++ b/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.html
@@ -6,8 +6,8 @@
     [attr.aria-hidden]="!allVideosLoaded"
     class="tw-block tw-max-w-full tw-shadow-md tw-rounded-lg"
     (loadeddata)="onVideoLoad()"
-    src="https://assets.bitwarden.com/extension-animations/new-login-item.mp4"
-    appDarkImgSrc="https://assets.bitwarden.com/extension-animations/new-login-item-dark.mp4"
+    src="/videos/new-login-item.mp4"
+    appDarkImgSrc="/videos/new-login-item-dark.mp4"
     aria-hidden
   ></video>
 </ng-template>
@@ -20,8 +20,8 @@
     [attr.aria-hidden]="!allVideosLoaded"
     class="tw-block tw-max-w-full tw-shadow-md tw-rounded-lg"
     (loadeddata)="onVideoLoad()"
-    src="https://assets.bitwarden.com/extension-animations/browser-extension-easy-access.mp4"
-    appDarkImgSrc="https://assets.bitwarden.com/extension-animations/browser-extension-easy-access-dark.mp4"
+    src="/videos/browser-extension-easy-access.mp4"
+    appDarkImgSrc="/videos/browser-extension-easy-access-dark.mp4"
     aria-hidden
   ></video>
 </ng-template>
@@ -34,8 +34,8 @@
     [attr.aria-hidden]="!allVideosLoaded"
     class="tw-block tw-max-w-full tw-shadow-md tw-rounded-lg"
     (loadeddata)="onVideoLoad()"
-    src="https://assets.bitwarden.com/extension-animations/onboarding-autofill.mp4"
-    appDarkImgSrc="https://assets.bitwarden.com/extension-animations/onboarding-autofill-dark.mp4"
+    src="/videos/onboarding-autofill.mp4"
+    appDarkImgSrc="/videos/onboarding-autofill-dark.mp4"
     aria-hidden
   ></video>
 </ng-template>
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 ac24383a4d3..09bd38c8517 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
@@ -29,13 +29,32 @@
   </div>
 </section>
 
-<section *ngIf="state === SetupExtensionState.Success" class="tw-flex tw-flex-col tw-items-center">
-  <bit-icon [icon]="PartyIcon"></bit-icon>
-  <h1 bitTypography="h2" class="tw-mb-6 tw-mt-4">{{ "bitwardenExtensionInstalled" | i18n }}</h1>
+<section
+  *ngIf="state === SetupExtensionState.Success || state === SetupExtensionState.AlreadyInstalled"
+  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 tw-text-center">
+    {{
+      (state === SetupExtensionState.Success
+        ? "bitwardenExtensionInstalled"
+        : "openTheBitwardenExtension"
+      ) | 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 tw-text-center"
   >
-    <p>{{ "openExtensionToAutofill" | i18n }}</p>
+    <p>
+      {{
+        (state === SetupExtensionState.Success
+          ? "openExtensionToAutofill"
+          : "bitwardenExtensionInstalledOpenExtension"
+        ) | i18n
+      }}
+    </p>
     <button type="button" bitButton buttonType="primary" class="tw-mb-2" (click)="openExtension()">
       {{ "openBitwardenExtension" | i18n }}
     </button>
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..f755c83832f 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
@@ -93,14 +93,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);
 
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..a04c529004c 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
@@ -36,6 +36,7 @@ export const SetupExtensionState = {
   Loading: "loading",
   NeedsExtension: "needs-extension",
   Success: "success",
+  AlreadyInstalled: "already-installed",
   ManualOpen: "manual-open",
 } as const;
 
@@ -99,9 +100,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
diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
index b2a57ffb875..6eb9b89b05b 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
@@ -25,17 +25,10 @@
           type="button"
           (click)="openAttachmentsDialog()"
         >
-          <p class="tw-m-0">
+          <div class="tw-flex tw-items-center tw-gap-2">
             {{ "attachments" | i18n }}
-            <span
-              *ngIf="!(canAccessAttachments$ | async)"
-              bitBadge
-              variant="success"
-              class="tw-ml-2"
-            >
-              {{ "premium" | i18n }}
-            </span>
-          </p>
+            <app-premium-badge></app-premium-badge>
+          </div>
           <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
         </button>
       </bit-item>
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
new file mode 100644
index 00000000000..e45a82d82ba
--- /dev/null
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.spec.ts
@@ -0,0 +1,132 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { provideNoopAnimations } from "@angular/platform-browser/animations";
+import { ActivatedRoute, Router } from "@angular/router";
+
+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 { 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 { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
+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";
+
+import { RoutedVaultFilterService } from "../../individual-vault/vault-filter/services/routed-vault-filter.service";
+
+import { VaultItemDialogComponent } from "./vault-item-dialog.component";
+
+// Create a test subclass to more easily access protected members
+class TestVaultItemDialogComponent extends VaultItemDialogComponent {
+  getTestTitle() {
+    this["updateTitle"]();
+    return this.title;
+  }
+  setTestParams(params: any) {
+    this.params = params;
+  }
+  setTestCipher(cipher: any) {
+    this.cipher = cipher;
+  }
+  setTestFormConfig(formConfig: any) {
+    this.formConfig = formConfig;
+  }
+}
+
+describe("VaultItemDialogComponent", () => {
+  let fixture: ComponentFixture<TestVaultItemDialogComponent>;
+  let component: TestVaultItemDialogComponent;
+
+  const baseFormConfig = {
+    mode: "edit",
+    cipherType: CipherType.Login,
+    collections: [],
+    organizations: [],
+    admin: false,
+    organizationDataOwnershipDisabled: false,
+    folders: [],
+  };
+
+  const baseParams = {
+    mode: "view",
+    formConfig: { ...baseFormConfig },
+    disableForm: false,
+    activeCollectionId: undefined,
+    isAdminConsoleAction: false,
+    restore: undefined,
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TestVaultItemDialogComponent],
+      providers: [
+        provideNoopAnimations(),
+        { provide: I18nService, useValue: { t: (key: string) => key } },
+        { provide: DIALOG_DATA, useValue: { ...baseParams } },
+        { provide: DialogRef, useValue: {} },
+        { provide: DialogService, useValue: {} },
+        { provide: ToastService, useValue: {} },
+        { provide: MessagingService, useValue: {} },
+        { provide: LogService, useValue: {} },
+        { provide: CipherService, useValue: {} },
+        { provide: AccountService, useValue: { activeAccount$: { pipe: () => ({}) } } },
+        { provide: Router, useValue: {} },
+        { provide: ActivatedRoute, useValue: {} },
+        {
+          provide: BillingAccountProfileStateService,
+          useValue: { hasPremiumFromAnySource$: () => ({}) },
+        },
+        { provide: PremiumUpgradePromptService, useValue: {} },
+        { provide: CipherAuthorizationService, useValue: {} },
+        { provide: ApiService, useValue: {} },
+        { provide: EventCollectionService, useValue: {} },
+        { provide: RoutedVaultFilterService, useValue: {} },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TestVaultItemDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe("dialog title", () => {
+    it("sets title for view mode and Login type", () => {
+      component.setTestCipher({ type: CipherType.Login });
+      component.setTestParams({ mode: "view" });
+      component.setTestFormConfig({ ...baseFormConfig, cipherType: CipherType.Login });
+      expect(component.getTestTitle()).toBe("viewItemHeaderLogin");
+    });
+
+    it("sets title for form mode (edit) and Card type", () => {
+      component.setTestCipher(undefined);
+      component.setTestParams({ mode: "form" });
+      component.setTestFormConfig({ ...baseFormConfig, mode: "edit", cipherType: CipherType.Card });
+      expect(component.getTestTitle()).toBe("editItemHeaderCard");
+    });
+
+    it("sets title for form mode (add) and Identity type", () => {
+      component.setTestCipher(undefined);
+      component.setTestParams({ mode: "form" });
+      component.setTestFormConfig({
+        ...baseFormConfig,
+        mode: "add",
+        cipherType: CipherType.Identity,
+      });
+      expect(component.getTestTitle()).toBe("newItemHeaderIdentity");
+    });
+
+    it("sets title for form mode (clone) and Card type", () => {
+      component.setTestCipher(undefined);
+      component.setTestParams({ mode: "form" });
+      component.setTestFormConfig({
+        ...baseFormConfig,
+        mode: "clone",
+        cipherType: CipherType.Card,
+      });
+      expect(component.getTestTitle()).toBe("newItemHeaderCard");
+    });
+  });
+});
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 871ee900e38..b48db2bba91 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
@@ -1,12 +1,22 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { CommonModule } from "@angular/common";
-import { Component, ElementRef, Inject, OnDestroy, OnInit, ViewChild } from "@angular/core";
+import {
+  Component,
+  ElementRef,
+  forwardRef,
+  Inject,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { Router } from "@angular/router";
 import { firstValueFrom, Subject, switchMap } from "rxjs";
 import { map } from "rxjs/operators";
 
 import { CollectionView } from "@bitwarden/admin-console/common";
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { VaultViewPasswordHistoryService } from "@bitwarden/angular/services/view-password-history.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
@@ -54,10 +64,10 @@ import {
 } from "@bitwarden/vault";
 
 import { SharedModule } from "../../../shared/shared.module";
-import { WebVaultPremiumUpgradePromptService } from "../../../vault/services/web-premium-upgrade-prompt.service";
 import { RoutedVaultFilterService } from "../../individual-vault/vault-filter/services/routed-vault-filter.service";
 import { RoutedVaultFilterModel } from "../../individual-vault/vault-filter/shared/models/routed-vault-filter.model";
 import { WebCipherFormGenerationService } from "../../services/web-cipher-form-generation.service";
+import { WebVaultPremiumUpgradePromptService } from "../../services/web-premium-upgrade-prompt.service";
 
 export type VaultItemDialogMode = "view" | "form";
 
@@ -131,9 +141,13 @@ export type VaultItemDialogResult = UnionOfValues<typeof VaultItemDialogResult>;
     CipherFormModule,
     AsyncActionsModule,
     ItemModule,
+    PremiumBadgeComponent,
   ],
   providers: [
-    { provide: PremiumUpgradePromptService, useClass: WebVaultPremiumUpgradePromptService },
+    {
+      provide: PremiumUpgradePromptService,
+      useClass: forwardRef(() => WebVaultPremiumUpgradePromptService),
+    },
     { provide: ViewPasswordHistoryService, useClass: VaultViewPasswordHistoryService },
     { provide: CipherFormGenerationService, useClass: WebCipherFormGenerationService },
     RoutedVaultFilterService,
@@ -275,6 +289,8 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
 
   protected attachmentsButtonDisabled = false;
 
+  protected confirmedPremiumUpgrade = false;
+
   constructor(
     @Inject(DIALOG_DATA) protected params: VaultItemDialogParams,
     private dialogRef: DialogRef<VaultItemDialogResult>,
@@ -294,6 +310,12 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
     private routedVaultFilterService: RoutedVaultFilterService,
   ) {
     this.updateTitle();
+    this.premiumUpgradeService.upgradeConfirmed$
+      .pipe(
+        map((c) => c && (this.confirmedPremiumUpgrade = true)),
+        takeUntilDestroyed(),
+      )
+      .subscribe();
   }
 
   async ngOnInit() {
@@ -337,6 +359,10 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy() {
+    // If the user already confirmed a premium upgrade, don't emit any other result as it will overwrite the premium upgrade result.
+    if (this.confirmedPremiumUpgrade) {
+      return;
+    }
     // If the cipher was modified, be sure we emit the saved result in case the dialog was closed with the X button or ESC key.
     if (this._cipherModified) {
       this.dialogRef.close(VaultItemDialogResult.Saved);
@@ -437,7 +463,7 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
     const canAccessAttachments = await firstValueFrom(this.canAccessAttachments$);
 
     if (!canAccessAttachments) {
-      await this.premiumUpgradeService.promptForPremium();
+      await this.premiumUpgradeService.promptForPremium(this.cipher?.organizationId);
       return;
     }
 
@@ -519,36 +545,41 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
     return await this.cipherService.decrypt(config.originalCipher, activeUserId);
   }
 
-  private updateTitle() {
-    let partOne: string;
+  private updateTitle(): void {
+    const translation: { [key: string]: { [key: number]: string } } = {
+      view: {
+        [CipherType.Login]: "viewItemHeaderLogin",
+        [CipherType.Card]: "viewItemHeaderCard",
+        [CipherType.Identity]: "viewItemHeaderIdentity",
+        [CipherType.SecureNote]: "viewItemHeaderNote",
+        [CipherType.SshKey]: "viewItemHeaderSshKey",
+      },
+      new: {
+        [CipherType.Login]: "newItemHeaderLogin",
+        [CipherType.Card]: "newItemHeaderCard",
+        [CipherType.Identity]: "newItemHeaderIdentity",
+        [CipherType.SecureNote]: "newItemHeaderNote",
+        [CipherType.SshKey]: "newItemHeaderSshKey",
+      },
+      edit: {
+        [CipherType.Login]: "editItemHeaderLogin",
+        [CipherType.Card]: "editItemHeaderCard",
+        [CipherType.Identity]: "editItemHeaderIdentity",
+        [CipherType.SecureNote]: "editItemHeaderNote",
+        [CipherType.SshKey]: "editItemHeaderSshKey",
+      },
+    };
+    const type = this.cipher?.type ?? this.formConfig.cipherType;
+    let mode: "view" | "edit" | "new" = "view";
 
-    if (this.params.mode === "view") {
-      partOne = "viewItemType";
-    } else if (this.formConfig.mode === "edit" || this.formConfig.mode === "partial-edit") {
-      partOne = "editItemHeader";
-    } else {
-      partOne = "newItemHeader";
+    if (this.params.mode === "form") {
+      mode =
+        this.formConfig.mode === "edit" || this.formConfig.mode === "partial-edit" ? "edit" : "new";
     }
 
-    const type = this.cipher?.type ?? this.formConfig.cipherType ?? CipherType.Login;
+    const fullTranslation = translation[mode][type];
 
-    switch (type) {
-      case CipherType.Login:
-        this.title = this.i18nService.t(partOne, this.i18nService.t("typeLogin"));
-        break;
-      case CipherType.Card:
-        this.title = this.i18nService.t(partOne, this.i18nService.t("typeCard"));
-        break;
-      case CipherType.Identity:
-        this.title = this.i18nService.t(partOne, this.i18nService.t("typeIdentity"));
-        break;
-      case CipherType.SecureNote:
-        this.title = this.i18nService.t(partOne, this.i18nService.t("note"));
-        break;
-      case CipherType.SshKey:
-        this.title = this.i18nService.t(partOne, this.i18nService.t("typeSshKey"));
-        break;
-    }
+    this.title = this.i18nService.t(fullTranslation);
   }
 
   /**
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 cb7120cca91..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">
@@ -22,7 +27,7 @@
       bitLink
       [disabled]="disabled"
       type="button"
-      class="tw-flex tw-text-start tw-leading-snug"
+      class="tw-flex tw-text-start tw-leading-snug tw-truncate"
       linkType="secondary"
       title="{{ 'viewCollectionWithName' | i18n: collection.name }}"
       [routerLink]="[]"
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..0b6c8423221 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
@@ -2,7 +2,12 @@
 // @ts-strict-ignore
 import { Component, EventEmitter, Input, Output } 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";
@@ -26,6 +31,7 @@ export class VaultCollectionRowComponent<C extends CipherViewLike> {
   protected RowHeightClass = RowHeightClass;
   protected Unassigned = "unassigned";
   protected CollectionPermission = CollectionPermission;
+  protected DefaultCollectionType = CollectionTypes.DefaultUserCollection;
 
   @Input() disabled: boolean;
   @Input() collection: CollectionView;
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 bfad71aca4b..c09238e7953 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
@@ -138,19 +138,15 @@ export class AddEditComponentV2 implements OnInit {
    * @returns The header text.
    */
   setHeader(mode: CipherFormMode, type: CipherType) {
-    const partOne = mode === "edit" || mode === "partial-edit" ? "editItemHeader" : "newItemHeader";
-    switch (type) {
-      case CipherType.Login:
-        return this.i18nService.t(partOne, this.i18nService.t("typeLogin").toLowerCase());
-      case CipherType.Card:
-        return this.i18nService.t(partOne, this.i18nService.t("typeCard").toLowerCase());
-      case CipherType.Identity:
-        return this.i18nService.t(partOne, this.i18nService.t("typeIdentity").toLowerCase());
-      case CipherType.SecureNote:
-        return this.i18nService.t(partOne, this.i18nService.t("note").toLowerCase());
-      case CipherType.SshKey:
-        return this.i18nService.t(partOne, this.i18nService.t("typeSshKey").toLowerCase());
-    }
+    const isEditMode = mode === "edit" || mode === "partial-edit";
+    const translation = {
+      [CipherType.Login]: isEditMode ? "editItemHeaderLogin" : "newItemHeaderLogin",
+      [CipherType.Card]: isEditMode ? "editItemHeaderCard" : "newItemHeaderCard",
+      [CipherType.Identity]: isEditMode ? "editItemHeaderIdentity" : "newItemHeaderIdentity",
+      [CipherType.SecureNote]: isEditMode ? "editItemHeaderNote" : "newItemHeaderNote",
+      [CipherType.SshKey]: isEditMode ? "editItemHeaderSshKey" : "newItemHeaderSshKey",
+    };
+    return this.i18nService.t(translation[type]);
   }
 
   /**
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 e97f1579f57..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
@@ -1,26 +1,14 @@
-<bit-banner
-  id="free-trial-banner"
-  class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
-  bannerType="premium"
-  icon="bwi-billing"
-  [showClose]="false"
-  *ngFor="let organization of organizationsPaymentStatus; trackBy: trackBy; index as i"
->
-  {{ freeTrialMessage(organization) }}
-  <a
-    bitLink
-    linkType="secondary"
-    (click)="navigateToPaymentMethod(organization?.organizationId)"
-    rel="noreferrer noopener"
-    class="tw-cursor-pointer"
+@for (organization of organizations; track organization.id) {
+  <app-organization-free-trial-warning
+    [organization]="organization"
+    [includeOrganizationNameInMessaging]="true"
+    (clicked)="navigateToPaymentMethod(organization.id)"
   >
-    {{ "clickHereToAddPaymentMethod" | i18n }}
-  </a>
-</bit-banner>
+  </app-organization-free-trial-warning>
+}
 
 <bit-banner
   id="update-browser-banner"
-  class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
   bannerType="warning"
   *ngIf="visibleBanners.includes(VisibleVaultBanner.OutdatedBrowser)"
   (onClose)="dismissBanner(VisibleVaultBanner.OutdatedBrowser)"
@@ -37,22 +25,8 @@
   </a>
 </bit-banner>
 
-<bit-banner
-  id="kdf-settings-banner"
-  class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
-  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"
-  class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
   bannerType="info"
   icon="bwi-info-circle"
   *ngIf="visibleBanners.includes(VisibleVaultBanner.PendingAuthRequest)"
@@ -67,14 +41,12 @@
 <app-verify-email
   id="verify-email-banner"
   *ngIf="visibleBanners.includes(VisibleVaultBanner.VerifyEmail)"
-  class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
   (onDismiss)="dismissBanner(VisibleVaultBanner.VerifyEmail)"
   (onVerified)="dismissBanner(VisibleVaultBanner.VerifyEmail)"
 ></app-verify-email>
 
 <bit-banner
   id="premium-banner"
-  class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
   bannerType="premium"
   *ngIf="premiumBannerVisible$ | async"
   (onClose)="dismissBanner(VisibleVaultBanner.Premium)"
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..f3a859e17bf 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
@@ -35,7 +35,6 @@ describe("VaultBannersComponent", () => {
     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 +47,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);
 
@@ -137,11 +135,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 4dd5bb7ff2d..cd32eaf2858 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
@@ -3,16 +3,14 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { Router } from "@angular/router";
 import { 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";
-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 { MessageListener } from "@bitwarden/common/platform/messaging";
 import { UserId } from "@bitwarden/common/types/guid";
 import { BannerModule } from "@bitwarden/components";
+import { OrganizationFreeTrialWarningComponent } from "@bitwarden/web-vault/app/billing/organizations/warnings/components";
 
 import { VerifyEmailComponent } from "../../../auth/settings/verify-email.component";
-import { FreeTrial } from "../../../billing/types/free-trial";
 import { SharedModule } from "../../../shared";
 
 import { VaultBannersService, VisibleVaultBanner } from "./services/vault-banners.service";
@@ -20,24 +18,27 @@ import { VaultBannersService, VisibleVaultBanner } from "./services/vault-banner
 @Component({
   selector: "app-vault-banners",
   templateUrl: "./vault-banners.component.html",
-  imports: [VerifyEmailComponent, SharedModule, BannerModule],
+  imports: [
+    VerifyEmailComponent,
+    SharedModule,
+    BannerModule,
+    OrganizationFreeTrialWarningComponent,
+  ],
   providers: [VaultBannersService],
 })
 export class VaultBannersComponent implements OnInit {
   visibleBanners: VisibleVaultBanner[] = [];
   premiumBannerVisible$: Observable<boolean>;
   VisibleVaultBanner = VisibleVaultBanner;
-  @Input() organizationsPaymentStatus: FreeTrial[] = [];
+  @Input() organizations: Organization[] = [];
 
   private activeUserId$ = this.accountService.activeAccount$.pipe(map((a) => a?.id));
 
   constructor(
     private vaultBannerService: VaultBannersService,
     private router: Router,
-    private i18nService: I18nService,
     private accountService: AccountService,
     private messageListener: MessageListener,
-    private configService: ConfigService,
   ) {
     this.premiumBannerVisible$ = this.activeUserId$.pipe(
       filter((userId): userId is UserId => userId != null),
@@ -71,16 +72,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,
     );
   }
@@ -96,33 +93,13 @@ 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);
   }
-
-  freeTrialMessage(organization: FreeTrial) {
-    if (organization.remainingDays >= 2) {
-      return this.i18nService.t(
-        "freeTrialEndPromptMultipleDays",
-        organization.organizationName,
-        organization.remainingDays.toString(),
-      );
-    } else if (organization.remainingDays === 1) {
-      return this.i18nService.t("freeTrialEndPromptTomorrow", organization.organizationName);
-    } else {
-      return this.i18nService.t("freeTrialEndPromptToday", organization.organizationName);
-    }
-  }
-
-  trackBy(index: number) {
-    return index;
-  }
 }
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 e95ea669725..fe5ef281b2d 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
@@ -1,5 +1,13 @@
 import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
-import { combineLatest, map, Observable, Subject, switchMap, takeUntil } from "rxjs";
+import {
+  combineLatest,
+  firstValueFrom,
+  map,
+  Observable,
+  Subject,
+  switchMap,
+  takeUntil,
+} from "rxjs";
 
 import {
   OrganizationUserApiService,
@@ -14,8 +22,10 @@ import { PolicyType } 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 { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+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";
@@ -65,6 +75,7 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
     private keyService: KeyService,
     private accountService: AccountService,
     private linkSsoService: LinkSsoService,
+    private ssoLoginService: SsoLoginServiceAbstraction,
   ) {}
 
   async ngOnInit() {
@@ -167,6 +178,14 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
         title: "",
         message: this.i18nService.t("unlinkedSso"),
       });
+
+      const disableAlternateLoginMethodsFlagEnabled = await this.configService.getFeatureFlag(
+        FeatureFlag.PM22110_DisableAlternateLoginMethods,
+      );
+
+      if (disableAlternateLoginMethodsFlagEnabled) {
+        await this.removeEmailFromSsoRequiredCacheIfPresent();
+      }
     } catch (e) {
       this.logService.error(e);
     }
@@ -186,16 +205,36 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
     try {
       this.actionPromise = this.organizationApiService.leave(org.id);
       await this.actionPromise;
+
       this.toastService.showToast({
         variant: "success",
         title: "",
         message: this.i18nService.t("leftOrganization"),
       });
+
+      const disableAlternateLoginMethodsFlagEnabled = await this.configService.getFeatureFlag(
+        FeatureFlag.PM22110_DisableAlternateLoginMethods,
+      );
+
+      if (disableAlternateLoginMethodsFlagEnabled) {
+        await this.removeEmailFromSsoRequiredCacheIfPresent();
+      }
     } catch (e) {
       this.logService.error(e);
     }
   }
 
+  private async removeEmailFromSsoRequiredCacheIfPresent() {
+    const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
+
+    if (!activeAccount) {
+      this.logService.error("Active account not found.");
+      return;
+    }
+
+    await this.ssoLoginService.removeFromSsoRequiredCacheIfPresent(activeAccount.email);
+  }
+
   async toggleResetPasswordEnrollment(org: Organization) {
     if (!this.organization.resetPasswordEnrolled) {
       await EnrollMasterPasswordReset.open(
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 4525d702153..278ae62aaa6 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
@@ -1,5 +1,4 @@
 import { Component, EventEmitter, inject, Input, OnDestroy, OnInit, Output } from "@angular/core";
-import { Router } from "@angular/router";
 import {
   combineLatest,
   distinctUntilChanged,
@@ -18,16 +17,16 @@ import { getFirstPolicy } from "@bitwarden/common/admin-console/services/policy/
 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 { 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 { 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 { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
 
-import { TrialFlowService } from "../../../../billing/services/trial-flow.service";
 import { VaultFilterService } from "../services/abstractions/vault-filter.service";
 import {
   VaultFilterList,
@@ -61,11 +60,12 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
   isLoaded = false;
 
   protected destroy$: Subject<void> = new Subject<void>();
-  private router = inject(Router);
   get filtersList() {
     return this.filters ? Object.values(this.filters) : [];
   }
 
+  protected organizationWarningsService = inject(OrganizationWarningsService);
+
   allTypeFilters: CipherTypeFilter[] = [
     {
       id: "favorites",
@@ -112,6 +112,9 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     if (this.activeFilter.isDeleted) {
       return "searchTrash";
     }
+    if (this.activeFilter.isArchived) {
+      return "searchArchive";
+    }
     if (this.activeFilter.cipherType === CipherType.Login) {
       return "searchLogin";
     }
@@ -143,7 +146,6 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     return "searchVault";
   }
 
-  private trialFlowService = inject(TrialFlowService);
   protected activeUserId$ = this.accountService.activeAccount$.pipe(getUserId);
 
   constructor(
@@ -154,10 +156,10 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     protected toastService: ToastService,
     protected billingApiService: BillingApiServiceAbstraction,
     protected dialogService: DialogService,
-    protected configService: ConfigService,
     protected accountService: AccountService,
     protected restrictedItemTypesService: RestrictedItemTypesService,
     protected cipherService: CipherService,
+    protected cipherArchiveService: CipherArchiveService,
   ) {}
 
   async ngOnInit(): Promise<void> {
@@ -206,14 +208,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"),
-      });
-      const metadata = await this.billingApiService.getOrganizationBillingMetadata(orgNode.node.id);
-      await this.trialFlowService.handleUnpaidSubscriptionDialog(orgNode.node, metadata);
-    }
     const filter = this.activeFilter;
     if (orgNode?.node.id === "AllVaults") {
       filter.resetOrganization();
@@ -248,11 +242,18 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
   };
 
   async buildAllFilters(): Promise<VaultFilterList> {
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
     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)))
+    ) {
+      builderFilter.archiveFilter = await this.addArchiveFilter();
+    }
     builderFilter.trashFilter = await this.addTrashFilter();
     return builderFilter;
   }
@@ -336,9 +337,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
           .map((r) => r.cipherType);
 
         const toExclude = [...excludeTypes, ...restrictedForUser];
-        return this.allTypeFilters.filter(
-          (f) => typeof f.type === "string" || !toExclude.includes(f.type),
-        );
+        return this.allTypeFilters.filter((f) => !toExclude.includes(f.type));
       }),
       switchMap((allowed) => this.vaultFilterService.buildTypeTree(allFilter, allowed)),
       distinctUntilChanged(),
@@ -412,4 +411,31 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     };
     return trashFilterSection;
   }
+
+  protected async addArchiveFilter(): Promise<VaultFilterSection> {
+    const archiveFilterSection: VaultFilterSection = {
+      data$: this.vaultFilterService.buildTypeTree(
+        {
+          id: "headArchive",
+          name: "HeadArchive",
+          type: "archive",
+          icon: "bwi-archive",
+        },
+        [
+          {
+            id: "archive",
+            name: this.i18nService.t("archiveNoun"),
+            type: "archive",
+            icon: "bwi-archive",
+          },
+        ],
+      ),
+      header: {
+        showHeader: false,
+        isSelectable: true,
+      },
+      action: this.applyTypeFilter as (filterNode: TreeNode<VaultFilterType>) => Promise<void>,
+    };
+    return archiveFilterSection;
+  }
 }
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts
index 25874d683be..936dfb0e675 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts
@@ -174,6 +174,11 @@ function createLegacyFilterForEndUser(
       { id: "trash", name: "", type: "trash", icon: "" },
       null,
     );
+  } else if (filter.type !== undefined && filter.type === "archive") {
+    legacyFilter.selectedCipherTypeNode = new TreeNode<CipherTypeFilter>(
+      { id: "archive", name: "", type: "archive", icon: "" },
+      null,
+    );
   } else if (filter.type !== undefined && filter.type !== "trash") {
     legacyFilter.selectedCipherTypeNode = ServiceUtils.getTreeNodeObject(
       cipherTypeTree,
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts
index f2c60651ed9..c05459250c0 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts
@@ -247,6 +247,9 @@ describe("vault filter service", () => {
           createCollectionView("id-3", "Collection 1/Collection 3", "org test id"),
         ];
         collectionViews.next(storedCollections);
+        collectionService.groupByOrganization.mockReturnValue(
+          new Map([["org test id" as OrganizationId, storedCollections]]),
+        );
 
         const result = await firstValueFrom(vaultFilterService.collectionTree$);
 
@@ -260,6 +263,9 @@ describe("vault filter service", () => {
           createCollectionView("id-3", "Collection 1/Collection 2/Collection 3", "org test id"),
         ];
         collectionViews.next(storedCollections);
+        collectionService.groupByOrganization.mockReturnValue(
+          new Map([["org test id" as OrganizationId, storedCollections]]),
+        );
 
         const result = await firstValueFrom(vaultFilterService.collectionTree$);
 
@@ -276,6 +282,9 @@ describe("vault filter service", () => {
           createCollectionView("id-4", "Collection 1/Collection 4", "org test id"),
         ];
         collectionViews.next(storedCollections);
+        collectionService.groupByOrganization.mockReturnValue(
+          new Map([["org test id" as OrganizationId, storedCollections]]),
+        );
 
         const result = await firstValueFrom(vaultFilterService.collectionTree$);
 
@@ -294,6 +303,9 @@ describe("vault filter service", () => {
           createCollectionView("id-3", "Collection 1/Collection 2/Collection 3", "org test id"),
         ];
         collectionViews.next(storedCollections);
+        collectionService.groupByOrganization.mockReturnValue(
+          new Map([["org test id" as OrganizationId, storedCollections]]),
+        );
 
         const result = await firstValueFrom(vaultFilterService.collectionTree$);
 
@@ -302,7 +314,7 @@ describe("vault filter service", () => {
         expect(c3.parent.node.id).toEqual("id-1");
       });
 
-      it.only("calls sortDefaultCollections with the correct args", async () => {
+      it("calls sortDefaultCollections with the correct args", async () => {
         const storedOrgs = [
           createOrganization("id-defaultOrg1", "org1"),
           createOrganization("id-defaultOrg2", "org2"),
@@ -326,6 +338,9 @@ describe("vault filter service", () => {
           ),
         ];
         collectionViews.next(storedCollections);
+        collectionService.groupByOrganization.mockReturnValue(
+          new Map([["org test id" as OrganizationId, storedCollections]]),
+        );
 
         await firstValueFrom(vaultFilterService.collectionTree$);
 
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 eeecccc87d6..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";
@@ -243,22 +247,29 @@ export class VaultFilterService implements VaultFilterServiceAbstraction {
     if (!collections) {
       return headNode;
     }
-    const nodes: TreeNode<CollectionFilter>[] = [];
+    const all: TreeNode<CollectionFilter>[] = [];
 
     if (defaultCollectionsFlagEnabled) {
       collections = sortDefaultCollections(collections, orgs, this.i18nService.collator);
     }
 
-    collections.forEach((c) => {
-      const collectionCopy = cloneCollection(
-        new CollectionView({ ...c, name: c.name }),
-      ) as CollectionFilter;
-      collectionCopy.icon = "bwi-collection-shared";
-      const parts = c.name != null ? c.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
-      ServiceUtils.nestedTraverse(nodes, 0, parts, collectionCopy, null, NestingDelimiter);
-    });
+    const groupedByOrg = this.collectionService.groupByOrganization(collections);
 
-    nodes.forEach((n) => {
+    for (const group of groupedByOrg.values()) {
+      const nodes: TreeNode<CollectionFilter>[] = [];
+      for (const c of group) {
+        const collectionCopy = cloneCollection(
+          new CollectionView({ ...c, name: c.name }),
+        ) as CollectionFilter;
+        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);
+      }
+      all.push(...nodes);
+    }
+
+    all.forEach((n) => {
       n.parent = headNode;
       headNode.children.push(n);
     });
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts
index 7fdd0804c08..c15dd51a969 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts
@@ -9,7 +9,10 @@ import { All, RoutedVaultFilterModel } from "./routed-vault-filter.model";
 
 export type FilterFunction = (cipher: CipherViewLike) => boolean;
 
-export function createFilterFunction(filter: RoutedVaultFilterModel): FilterFunction {
+export function createFilterFunction(
+  filter: RoutedVaultFilterModel,
+  archiveEnabled?: boolean,
+): FilterFunction {
   return (cipher) => {
     const type = CipherViewLikeUtils.getType(cipher);
     const isDeleted = CipherViewLikeUtils.isDeleted(cipher);
@@ -39,6 +42,15 @@ export function createFilterFunction(filter: RoutedVaultFilterModel): FilterFunc
     if (filter.type !== "trash" && isDeleted) {
       return false;
     }
+    // Archive filter logic is only applied if the feature flag is enabled
+    if (archiveEnabled) {
+      if (filter.type === "archive" && !CipherViewLikeUtils.isArchived(cipher)) {
+        return false;
+      }
+      if (filter.type !== "archive" && CipherViewLikeUtils.isArchived(cipher)) {
+        return false;
+      }
+    }
     // No folder
     if (filter.folderId === Unassigned && cipher.folderId != null) {
       return false;
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts
index 02d536eb6ab..f9a80791030 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts
@@ -130,6 +130,9 @@ export class RoutedVaultFilterBridge implements VaultFilter {
   get isDeleted(): boolean {
     return this.legacyFilter.isDeleted;
   }
+  get isArchived(): boolean {
+    return this.legacyFilter.isArchived;
+  }
   get organizationId(): string {
     return this.legacyFilter.organizationId;
   }
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model.ts
index 280ffd15732..13f1ed7b1a3 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model.ts
@@ -15,6 +15,7 @@ const itemTypes = [
   "identity",
   "note",
   "sshKey",
+  "archive",
   "trash",
   All,
 ] as const;
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts
index 4210a6c8129..f1e6222b57a 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts
@@ -21,6 +21,7 @@ export const VaultFilterLabel = {
   TypeFilter: "typeFilter",
   FolderFilter: "folderFilter",
   CollectionFilter: "collectionFilter",
+  ArchiveFilter: "archiveFilter",
   TrashFilter: "trashFilter",
 } as const;
 
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
index 7f001f3aab2..4617102cebe 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
@@ -72,6 +72,10 @@ export class VaultFilter {
     return this.selectedCipherTypeNode?.node.type === "trash" ? true : null;
   }
 
+  get isArchived(): boolean {
+    return this.selectedCipherTypeNode?.node.type === "archive";
+  }
+
   get organizationId(): string {
     return this.selectedOrganizationNode?.node.id;
   }
@@ -121,6 +125,9 @@ export class VaultFilter {
       if (this.isDeleted && cipherPassesFilter) {
         cipherPassesFilter = cipher.isDeleted;
       }
+      if (this.isArchived && cipherPassesFilter) {
+        cipherPassesFilter = cipher.isArchived;
+      }
       if (this.cipherType && cipherPassesFilter) {
         cipherPassesFilter = cipher.type === this.cipherType;
       }
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts
index 9259dd08114..7a92db6a381 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts
@@ -4,7 +4,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
-export type CipherStatus = "all" | "favorites" | "trash" | CipherType;
+export type CipherStatus = "all" | "favorites" | "archive" | "trash" | CipherType;
 
 export type CipherTypeFilter = ITreeNodeObject & { type: CipherStatus; icon: string };
 export type CollectionFilter = CollectionAdminView & {
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/vault-filter.module.ts b/apps/web/src/app/vault/individual-vault/vault-filter/vault-filter.module.ts
index 1f2d5652735..dc70561bcb2 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/vault-filter.module.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/vault-filter.module.ts
@@ -1,6 +1,7 @@
 import { NgModule } from "@angular/core";
 
 import { SearchModule } from "@bitwarden/components";
+import { OrganizationWarningsModule } from "@bitwarden/web-vault/app/billing/organizations/warnings/organization-warnings.module";
 
 import { VaultFilterSharedModule } from "../../individual-vault/vault-filter/shared/vault-filter-shared.module";
 
@@ -10,7 +11,7 @@ import { VaultFilterService as VaultFilterServiceAbstraction } from "./services/
 import { VaultFilterService } from "./services/vault-filter.service";
 
 @NgModule({
-  imports: [VaultFilterSharedModule, SearchModule],
+  imports: [VaultFilterSharedModule, SearchModule, OrganizationWarningsModule],
   declarations: [VaultFilterComponent, OrganizationOptionsComponent],
   exports: [VaultFilterComponent],
   providers: [
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 216564e6254..929a8d07881 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";
@@ -139,6 +140,10 @@ export class VaultHeaderComponent {
       return this.i18nService.t("myVault");
     }
 
+    if (this.filter.type === "archive") {
+      return this.i18nService.t("archiveNoun");
+    }
+
     const activeOrganization = this.activeOrganization;
     if (activeOrganization) {
       return `${activeOrganization.name} ${this.i18nService.t("vault").toLowerCase()}`;
@@ -148,9 +153,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.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html
index 35b1a1876a1..68219173deb 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault.component.html
@@ -1,6 +1,4 @@
-<app-vault-banners
-  [organizationsPaymentStatus]="organizationsPaymentStatus$ | async"
-></app-vault-banners>
+<app-vault-banners [organizations]="organizations$ | async"></app-vault-banners>
 
 <app-vault-header
   [filter]="filter"
@@ -67,21 +65,28 @@
       <span class="tw-sr-only">{{ "loading" | i18n }}</span>
     </div>
     <div
-      *ngIf="isEmpty && !performingInitialLoad"
       class="tw-mt-6 tw-flex tw-h-full tw-flex-col tw-items-center tw-justify-start"
+      *ngIf="isEmpty && !performingInitialLoad"
     >
-      <bit-icon [icon]="noItemIcon" aria-hidden="true"></bit-icon>
-      <p>{{ "noItemsInList" | i18n }}</p>
-      <button
-        type="button"
-        buttonType="primary"
-        bitButton
-        (click)="addCipher()"
-        *ngIf="filter.type !== 'trash'"
-      >
-        <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-        {{ "newItem" | i18n }}
-      </button>
+      <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>
+        <button
+          type="button"
+          buttonType="primary"
+          bitButton
+          (click)="addCipher()"
+          slot="button"
+          *ngIf="showAddCipherBtn"
+        >
+          <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
+          {{ "newItem" | i18n }}
+        </button>
+      </bit-no-items>
     </div>
   </div>
 </div>
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 e27847d5267..5ca8dfd5ad2 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -6,14 +6,11 @@ import {
   BehaviorSubject,
   combineLatest,
   firstValueFrom,
-  from,
   lastValueFrom,
   Observable,
-  of,
   Subject,
 } from "rxjs";
 import {
-  catchError,
   concatMap,
   debounceTime,
   distinctUntilChanged,
@@ -35,10 +32,16 @@ import {
   Unassigned,
 } from "@bitwarden/admin-console/common";
 import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
-import { Search } 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 { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import {
   getOrganizationById,
   OrganizationService,
@@ -46,12 +49,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 { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 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 { 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";
@@ -60,6 +61,7 @@ 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 { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
@@ -89,6 +91,8 @@ import {
   DefaultCipherFormConfigService,
   PasswordRepromptService,
 } from "@bitwarden/vault";
+import { OrganizationWarningsModule } from "@bitwarden/web-vault/app/billing/organizations/warnings/organization-warnings.module";
+import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
 
 import {
   getNestedCollectionTree,
@@ -99,9 +103,6 @@ import {
   CollectionDialogTabType,
   openCollectionDialog,
 } from "../../admin-console/organizations/shared/components/collection-dialog";
-import { BillingNotificationService } from "../../billing/services/billing-notification.service";
-import { TrialFlowService } from "../../billing/services/trial-flow.service";
-import { FreeTrial } from "../../billing/types/free-trial";
 import { SharedModule } from "../../shared/shared.module";
 import { AssignCollectionsWebComponent } from "../components/assign-collections";
 import {
@@ -140,6 +141,16 @@ 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>;
+
 @Component({
   selector: "app-vault",
   templateUrl: "vault.component.html",
@@ -150,6 +161,7 @@ const BroadcasterSubscriptionId = "VaultComponent";
     VaultFilterModule,
     VaultItemsModule,
     SharedModule,
+    OrganizationWarningsModule,
   ],
   providers: [
     RoutedVaultFilterService,
@@ -165,7 +177,11 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
   kdfIterations: number;
   activeFilter: VaultFilter = new VaultFilter();
 
-  protected noItemIcon = Search;
+  protected deactivatedOrgIcon = DeactivatedOrg;
+  protected emptyTrashIcon = EmptyTrash;
+  protected favoritesIcon = FavoritesIcon;
+  protected itemTypesIcon = ItemTypes;
+  protected noResultsIcon = NoResults;
   protected performingInitialLoad = true;
   protected refreshing = false;
   protected processingEvent = false;
@@ -179,73 +195,83 @@ 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 hasSubscription$ = new BehaviorSubject<boolean>(false);
 
   private vaultItemDialogRef?: DialogRef<VaultItemDialogResult> | undefined;
-  private organizations$ = this.accountService.activeAccount$
+  protected showAddCipherBtn: boolean = false;
+
+  organizations$ = this.accountService.activeAccount$
     .pipe(map((a) => a?.id))
     .pipe(switchMap((id) => this.organizationService.organizations$(id)));
 
-  private readonly unpaidSubscriptionDialog$ = this.organizations$.pipe(
-    filter((organizations) => organizations.length === 1),
-    map(([organization]) => organization),
-    switchMap((organization) =>
-      from(this.billingApiService.getOrganizationBillingMetadata(organization.id)).pipe(
-        tap((organizationMetaData) => {
-          this.hasSubscription$.next(organizationMetaData.hasSubscription);
-        }),
-        switchMap((organizationMetaData) =>
-          from(
-            this.trialFlowService.handleUnpaidSubscriptionDialog(
-              organization,
-              organizationMetaData,
-            ),
-          ),
-        ),
-      ),
-    ),
-  );
-  protected organizationsPaymentStatus$: Observable<FreeTrial[]> = combineLatest([
-    this.organizations$.pipe(
-      map(
-        (organizations) =>
-          organizations?.filter((org) => org.isOwner && org.canViewBillingHistory) ?? [],
-      ),
-    ),
-    this.hasSubscription$,
-  ]).pipe(
-    switchMap(([ownerOrgs, hasSubscription]) => {
-      if (!ownerOrgs || ownerOrgs.length === 0 || !hasSubscription) {
-        return of([]);
-      }
-      return combineLatest(
-        ownerOrgs.map((org) =>
-          combineLatest([
-            this.organizationApiService.getSubscription(org.id),
-            from(this.organizationBillingService.getPaymentSource(org.id)).pipe(
-              catchError((error: unknown) => {
-                this.billingNotificationService.handleError(error);
-                return of(null);
-              }),
-            ),
-          ]).pipe(
-            map(([subscription, paymentSource]) =>
-              this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
-                org,
-                subscription,
-                paymentSource,
-              ),
-            ),
-          ),
-        ),
-      );
+  private 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: "archivedItemsDescription",
+          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,
+      };
     }),
-    map((results) => results.filter((result) => result !== null && result.shownBanner)),
-    shareReplay({ refCount: false, bufferSize: 1 }),
   );
 
   constructor(
@@ -276,13 +302,10 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     private toastService: ToastService,
     private accountService: AccountService,
     private cipherFormConfigService: DefaultCipherFormConfigService,
-    private organizationApiService: OrganizationApiServiceAbstraction,
     protected billingApiService: BillingApiServiceAbstraction,
-    private trialFlowService: TrialFlowService,
-    private organizationBillingService: OrganizationBillingServiceAbstraction,
-    private billingNotificationService: BillingNotificationService,
-    private configService: ConfigService,
     private restrictedItemTypesService: RestrictedItemTypesService,
+    private cipherArchiveService: CipherArchiveService,
+    private organizationWarningsService: OrganizationWarningsService,
   ) {}
 
   async ngOnInit() {
@@ -358,8 +381,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));
@@ -378,12 +399,17 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
       ),
     );
 
-    const ciphers$ = combineLatest([allowedCiphers$, filter$, this.currentSearchText$]).pipe(
+    const ciphers$ = combineLatest([
+      allowedCiphers$,
+      filter$,
+      this.currentSearchText$,
+      this.userCanArchive$,
+    ]).pipe(
       filter(([ciphers, filter]) => ciphers != undefined && filter != undefined),
-      concatMap(async ([ciphers, filter, searchText]) => {
+      concatMap(async ([ciphers, filter, searchText, archiveEnabled]) => {
         const failedCiphers =
           (await firstValueFrom(this.cipherService.failedToDecryptCiphers$(activeUserId))) ?? [];
-        const filterFunction = createFilterFunction(filter);
+        const filterFunction = createFilterFunction(filter, archiveEnabled);
         // Append any failed to decrypt ciphers to the top of the cipher list
         const allCiphers = [...failedCiphers, ...ciphers];
 
@@ -520,7 +546,16 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
         });
       });
 
-    this.unpaidSubscriptionDialog$.pipe(takeUntil(this.destroy$)).subscribe();
+    this.organizations$
+      .pipe(
+        filter((organizations) => organizations.length === 1),
+        map((organizations) => organizations[0]),
+        switchMap((organization) =>
+          this.organizationWarningsService.showInactiveSubscriptionDialog$(organization),
+        ),
+        takeUntil(this.destroy$),
+      )
+      .subscribe();
 
     firstSetup$
       .pipe(
diff --git a/apps/web/src/app/vault/individual-vault/view.component.ts b/apps/web/src/app/vault/individual-vault/view.component.ts
index 97f3037407c..6de29f8e328 100644
--- a/apps/web/src/app/vault/individual-vault/view.component.ts
+++ b/apps/web/src/app/vault/individual-vault/view.component.ts
@@ -15,7 +15,6 @@ 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 { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.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";
@@ -33,7 +32,6 @@ import {
 import { CipherViewComponent } from "@bitwarden/vault";
 
 import { SharedModule } from "../../shared/shared.module";
-import { WebVaultPremiumUpgradePromptService } from "../../vault/services/web-premium-upgrade-prompt.service";
 
 export interface ViewCipherDialogParams {
   cipher: CipherView;
@@ -75,10 +73,7 @@ export interface ViewCipherDialogCloseResult {
   selector: "app-vault-view",
   templateUrl: "view.component.html",
   imports: [CipherViewComponent, CommonModule, AsyncActionsModule, DialogModule, SharedModule],
-  providers: [
-    { provide: ViewPasswordHistoryService, useClass: VaultViewPasswordHistoryService },
-    { provide: PremiumUpgradePromptService, useClass: WebVaultPremiumUpgradePromptService },
-  ],
+  providers: [{ provide: ViewPasswordHistoryService, useClass: VaultViewPasswordHistoryService }],
 })
 export class ViewComponent implements OnInit {
   cipher: CipherView;
@@ -194,15 +189,15 @@ export class ViewComponent implements OnInit {
 
     switch (this.cipher.type) {
       case CipherType.Login:
-        return this.i18nService.t("viewItemType", this.i18nService.t("typeLogin").toLowerCase());
+        return this.i18nService.t("viewItemHeaderLogin");
       case CipherType.SecureNote:
-        return this.i18nService.t("viewItemType", this.i18nService.t("note").toLowerCase());
+        return this.i18nService.t("viewItemHeaderCard");
       case CipherType.Card:
-        return this.i18nService.t("viewItemType", this.i18nService.t("typeCard").toLowerCase());
+        return this.i18nService.t("viewItemHeaderIdentity");
       case CipherType.Identity:
-        return this.i18nService.t("viewItemType", this.i18nService.t("typeIdentity").toLowerCase());
+        return this.i18nService.t("viewItemHeaderNote");
       case CipherType.SshKey:
-        return this.i18nService.t("viewItemType", this.i18nService.t("typeSshKey").toLowerCase());
+        return this.i18nService.t("viewItemHeaderSshKey");
       default:
         return null;
     }
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 ad34d11f45a..87fcdc345d8 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,5 +1,6 @@
-import { Injectable } from "@angular/core";
+import { Injectable, Optional } from "@angular/core";
 import { Router } from "@angular/router";
+import { Subject } from "rxjs";
 
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
@@ -7,46 +8,52 @@ import { DialogRef, DialogService } from "@bitwarden/components";
 
 import { VaultItemDialogResult } from "../components/vault-item-dialog/vault-item-dialog.component";
 
-/**
- * This service is used to prompt the user to upgrade to premium.
- */
 @Injectable()
 export class WebVaultPremiumUpgradePromptService implements PremiumUpgradePromptService {
+  private readonly _upgradeConfirmed$ = new Subject<boolean>();
+  readonly upgradeConfirmed$ = this._upgradeConfirmed$.asObservable();
+
   constructor(
     private dialogService: DialogService,
     private router: Router,
-    private dialog: DialogRef<VaultItemDialogResult>,
+    @Optional() private dialog?: DialogRef<VaultItemDialogResult>,
   ) {}
 
   /**
-   * Prompts the user to upgrade to premium.
-   * @param organizationId The ID of the organization to upgrade.
+   * Prompts the user for a premium upgrade.
    */
   async promptForPremium(organizationId?: OrganizationId) {
-    let upgradeConfirmed;
+    let confirmed = false;
+    let route: string[] | null = null;
+
     if (organizationId) {
-      upgradeConfirmed = await this.dialogService.openSimpleDialog({
+      confirmed = await this.dialogService.openSimpleDialog({
         title: { key: "upgradeOrganization" },
         content: { key: "upgradeOrganizationDesc" },
         acceptButtonText: { key: "upgradeOrganization" },
         type: "info",
       });
-      if (upgradeConfirmed) {
-        await this.router.navigate(["organizations", organizationId, "billing", "subscription"]);
+      if (confirmed) {
+        route = ["organizations", organizationId, "billing", "subscription"];
       }
     } else {
-      upgradeConfirmed = await this.dialogService.openSimpleDialog({
+      confirmed = await this.dialogService.openSimpleDialog({
         title: { key: "premiumRequired" },
         content: { key: "premiumRequiredDesc" },
         acceptButtonText: { key: "upgrade" },
         type: "success",
       });
-      if (upgradeConfirmed) {
-        await this.router.navigate(["settings/subscription/premium"]);
+      if (confirmed) {
+        route = ["settings/subscription/premium"];
       }
     }
 
-    if (upgradeConfirmed) {
+    this._upgradeConfirmed$.next(confirmed);
+
+    if (route) {
+      await this.router.navigate(route);
+    }
+    if (confirmed && this.dialog) {
       this.dialog.close(VaultItemDialogResult.PremiumUpgrade);
     }
   }
diff --git a/apps/web/src/connectors/webauthn-fallback.html b/apps/web/src/connectors/webauthn-fallback.html
index 662eb0b6baf..43da5b1a485 100644
--- a/apps/web/src/connectors/webauthn-fallback.html
+++ b/apps/web/src/connectors/webauthn-fallback.html
@@ -15,75 +15,67 @@
       </a>
 
       <div class="tw-text-center tw-mb-6 tw-max-w-md tw-mx-auto">
-        <div class="tw-mx-auto tw-max-w-28 sm:tw-max-w-32">
-          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
+        <div class="tw-mx-auto tw-max-w-20 sm:tw-max-w-24">
+          <!-- Matches TwoFactorAuthWebAuthnIcon -->
+          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="3.33 3.33 76.49 75.83">
             <path
-              class="tw-fill-art-primary"
-              d="M19.258 16.434c0-3.635 2.966-6.58 6.626-6.58H56.88c3.659 0 6.625 2.946 6.625 6.58v27.788l-2.208 2.667V16.434c0-2.423-1.978-4.387-4.417-4.387H25.884c-2.44 0-4.418 1.964-4.418 4.387v67.09c0 2.422 1.978 4.386 4.418 4.386h16.389l-.814 2.194H25.884c-3.66 0-6.626-2.947-6.626-6.58v-67.09Z"
+              class="tw-fill-illustration-bg-primary"
+              d="M3.333 8.334a5 5 0 0 1 5-5H35a5 5 0 0 1 5 5v56.667a5 5 0 0 1-5 5H8.333a5 5 0 0 1-5-5V8.334Z"
             />
             <path
-              class="tw-fill-art-primary"
+              class="tw-fill-illustration-outline"
               fill-rule="evenodd"
-              d="M40.119 19.287a.55.55 0 0 1 .552-.548h2.208a.55.55 0 0 1 .553.548.55.55 0 0 1-.553.549h-2.208a.55.55 0 0 1-.552-.549Z"
+              d="M35 5H8.333A3.333 3.333 0 0 0 5 8.335v56.667a3.333 3.333 0 0 0 3.333 3.333H35a3.333 3.333 0 0 0 3.333-3.333V8.334A3.333 3.333 0 0 0 35 5.001ZM8.333 3.335a5 5 0 0 0-5 5v56.667a5 5 0 0 0 5 5H35a5 5 0 0 0 5-5V8.334a5 5 0 0 0-5-5H8.333Z"
               clip-rule="evenodd"
             />
             <path
-              class="tw-fill-art-accent"
+              class="tw-fill-illustration-outline"
               fill-rule="evenodd"
-              d="M31.994 38.828c2.103-3.001 5.541-4.957 9.425-4.957 5.66 0 10.376 4.155 11.392 9.653a.567.567 0 0 1-.439.664.553.553 0 0 1-.646-.451c-.918-4.969-5.183-8.73-10.307-8.73-3.515 0-6.625 1.769-8.53 4.485a.542.542 0 0 1-.77.129.579.579 0 0 1-.125-.793Zm-.623 2.186c.282.117.42.448.305.74a10.928 10.928 0 0 0-.748 3.992v3.46a.56.56 0 0 1-.553.569.56.56 0 0 1-.552-.568v-3.461c0-1.56.294-3.051.829-4.417a.547.547 0 0 1 .718-.315Zm21.09 4.164a.56.56 0 0 1 .553.568v3.23a.56.56 0 0 1-.552.568.56.56 0 0 1-.552-.568v-3.23a.56.56 0 0 1 .552-.568Z"
+              d="M18.333 9.167c0-.46.373-.833.834-.833h5a.833.833 0 0 1 0 1.667h-5a.833.833 0 0 1-.834-.834Z"
               clip-rule="evenodd"
             />
             <path
-              class="tw-fill-art-accent"
+              class="tw-fill-illustration-tertiary"
+              d="M36.667 38.333c0 10.126-6.716 18.334-15 18.334-8.285 0-15-8.208-15-18.334 0-10.125 6.715-18.333 15-18.333 8.284 0 15 8.208 15 18.333Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
               fill-rule="evenodd"
-              d="M32.823 41.892c1.451-3.427 4.75-5.827 8.596-5.827 1.98 0 3.819.638 5.333 1.725.25.18.31.532.135.788a.544.544 0 0 1-.769.138 8.02 8.02 0 0 0-4.7-1.52c-3.382 0-6.297 2.111-7.582 5.146a.547.547 0 0 1-.726.294.57.57 0 0 1-.287-.744Zm14.94-2.495a.543.543 0 0 1 .778.066 9.936 9.936 0 0 1 2.265 6.35v7.783a.559.559 0 0 1-.552.566.559.559 0 0 1-.553-.566v-7.782a8.788 8.788 0 0 0-2.002-5.62.575.575 0 0 1 .064-.797Zm-15.06 4.804a.562.562 0 0 1 .487.625 9.062 9.062 0 0 0-.053.988v7.782a.559.559 0 0 1-.553.566.559.559 0 0 1-.552-.566v-7.782c0-.377.02-.748.06-1.114a.555.555 0 0 1 .611-.499Z"
+              d="M21.667 55C28.733 55 35 47.866 35 38.333c0-9.533-6.267-16.666-13.333-16.666-7.067 0-13.334 7.133-13.334 16.666C8.333 47.866 14.6 55 21.667 55Zm0 1.667c8.284 0 15-8.208 15-18.334 0-10.125-6.716-18.333-15-18.333-8.285 0-15 8.208-15 18.333 0 10.126 6.715 18.334 15 18.334Z"
               clip-rule="evenodd"
             />
             <path
-              class="tw-fill-art-accent"
+              class="tw-fill-illustration-bg-tertiary"
+              d="M68.333 35c0 6.444-5.223 11.667-11.666 11.667C50.223 46.667 45 41.444 45 35.001c0-6.444 5.223-11.667 11.667-11.667 6.443 0 11.666 5.223 11.666 11.667Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
               fill-rule="evenodd"
-              d="M34.24 45.704c0-4.105 3.207-7.446 7.178-7.446 3.972 0 7.178 3.341 7.178 7.446V55.79a.559.559 0 0 1-.552.565.559.559 0 0 1-.552-.565V45.704c0-3.495-2.726-6.315-6.074-6.315-3.347 0-6.073 2.82-6.073 6.315v3.948a.559.559 0 0 1-.553.566.559.559 0 0 1-.552-.566v-3.948Zm.552 5.572c.305 0 .553.253.553.565v3.949a.559.559 0 0 1-.553.565.559.559 0 0 1-.552-.565V51.84c0-.312.247-.565.552-.565Z"
+              d="M56.667 45c5.523 0 10-4.477 10-10 0-5.522-4.477-10-10-10s-10 4.478-10 10c0 5.523 4.477 10 10 10Zm0 1.667c6.443 0 11.666-5.223 11.666-11.666 0-6.444-5.223-11.667-11.666-11.667C50.223 23.334 45 28.557 45 35.001c0 6.443 5.223 11.666 11.667 11.666Z"
               clip-rule="evenodd"
             />
             <path
-              class="tw-fill-art-accent"
+              class="tw-fill-illustration-bg-tertiary"
               fill-rule="evenodd"
-              d="M38.89 41.142a4.955 4.955 0 0 1 2.529-.69 4.966 4.966 0 0 1 4.97 4.962v3.044a.55.55 0 0 1-.553.548.55.55 0 0 1-.552-.548v-3.044a3.865 3.865 0 0 0-5.83-3.33.554.554 0 0 1-.757-.19.546.546 0 0 1 .192-.752Zm-.911 1.45c.258.16.335.5.173.756a3.844 3.844 0 0 0-.599 2.066v11.49a.55.55 0 0 1-.552.548.55.55 0 0 1-.552-.548v-11.49c0-.974.282-1.884.768-2.651a.554.554 0 0 1 .762-.172Zm7.857 7.904a.55.55 0 0 1 .552.549v5.859a.55.55 0 0 1-.552.548.55.55 0 0 1-.552-.548v-5.86a.55.55 0 0 1 .552-.547Z"
+              d="M78.255 59.98a22.918 22.918 0 0 1 1.559 5.854H41.667v-8.333h-4.549a22.916 22.916 0 0 1 41.137 2.48Z"
               clip-rule="evenodd"
             />
             <path
-              class="tw-fill-art-accent"
+              class="tw-fill-illustration-outline"
               fill-rule="evenodd"
-              d="M38.658 45.306c0-1.488 1.256-2.66 2.76-2.66 1.505 0 2.761 1.172 2.761 2.66v4.829a.55.55 0 0 1-.552.548.55.55 0 0 1-.552-.548v-4.828c0-.845-.722-1.564-1.657-1.564-.934 0-1.656.72-1.656 1.563v12.146a.55.55 0 0 1-.552.549.55.55 0 0 1-.552-.549V45.307Zm4.97 6.317a.55.55 0 0 1 .551.549v5.28a.55.55 0 0 1-.552.549.55.55 0 0 1-.552-.549v-5.28a.55.55 0 0 1 .552-.549Z"
+              d="M43.333 55.834v8.333h34.5a21.238 21.238 0 0 0-5.724-10.442 21.25 21.25 0 0 0-31.9 2.109h3.124Zm-5.18 0c-.368.54-.714 1.096-1.035 1.667h4.549v8.333h38.147a22.875 22.875 0 0 0-1.558-5.853 22.915 22.915 0 0 0-40.102-4.147Z"
               clip-rule="evenodd"
             />
             <path
-              class="tw-fill-art-accent"
+              class="tw-fill-illustration-bg-secondary"
               fill-rule="evenodd"
-              d="M41.419 44.84a.55.55 0 0 1 .552.548v1.9a.55.55 0 0 1-.552.548.55.55 0 0 1-.552-.549v-1.9a.55.55 0 0 1 .552-.548Zm0 4a.55.55 0 0 1 .552.548V58a.55.55 0 0 1-.552.549.55.55 0 0 1-.552-.549v-8.612a.55.55 0 0 1 .552-.549Z"
+              d="M39.167 79.167c5.272 0 9.829-3.06 11.993-7.5h5.65c.442 0 .866-.176 1.178-.489L60 69.168l1.91 1.91a.833.833 0 0 0 1.18 0l.66-.66.66.66a.833.833 0 0 0 1.18 0l1.91-1.91 2.012 2.011c.312.313.736.489 1.178.489h2.786c.442 0 .866-.176 1.179-.489l5.05-5.05a.417.417 0 0 0 0-.59l-5.05-5.05A1.667 1.667 0 0 0 73.476 60H51.16c-2.164-4.44-6.721-7.5-11.993-7.5-7.364 0-13.334 5.97-13.334 13.333 0 7.364 5.97 13.334 13.334 13.334Zm-5-10.834a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5Z"
               clip-rule="evenodd"
             />
             <path
-              class="tw-fill-art-primary"
+              class="tw-fill-illustration-outline"
               fill-rule="evenodd"
-              d="M48.904 87.97c2.492 0 4.542-2.042 4.542-4.616 0-2.51-1.986-4.616-4.542-4.616-2.55 0-4.543 2.049-4.543 4.616 0 2.574 2.05 4.616 4.543 4.616Zm3.016-4.616c0 1.739-1.376 3.086-3.016 3.086-1.64 0-3.017-1.347-3.017-3.086 0-1.745 1.333-3.086 3.017-3.086 1.677 0 3.016 1.385 3.016 3.086Z"
-              clip-rule="evenodd"
-            />
-            <path
-              class="tw-fill-art-primary"
-              fill-rule="evenodd"
-              d="M108.913 84.456a.767.767 0 0 0 0-1.074l-6.098-6.213a.76.76 0 0 0-.544-.228H70.225c-2.438-5.616-7.969-9.602-14.417-9.602-8.75 0-15.73 7.185-15.73 16.015 0 8.832 7.032 16.015 15.73 16.015 6.498 0 12.081-4.036 14.475-9.756h8.303c.204 0 .4-.082.544-.228l2.933-2.989 3.034 3.091a.762.762 0 0 0 1.088 0l.918-.934.766.78a.762.762 0 0 0 1.08.008l3.135-3.107 3.294 3.356c.143.146.339.229.543.229h7.408a.76.76 0 0 0 .544-.229l5.04-5.134Zm-5.903 3.832h-6.769l-3.606-3.674a.762.762 0 0 0-1.08-.007l-3.135 3.106-.774-.788a.762.762 0 0 0-1.087 0l-.918.935-3.034-3.091a.762.762 0 0 0-1.088 0l-3.253 3.314h-8.5c-.316 0-.6.196-.712.493-2.06 5.419-7.23 9.263-13.246 9.263-7.832 0-14.204-6.475-14.204-14.485 0-8.011 6.323-14.485 14.204-14.485 5.966 0 11.09 3.795 13.2 9.12a.763.763 0 0 0 .709.482h32.235l5.346 5.448-4.288 4.37Z"
-              clip-rule="evenodd"
-            />
-            <path
-              class="tw-fill-art-accent"
-              d="M100.357 80.991a.382.382 0 0 0-.382-.382H73.651a.382.382 0 0 0 0 .765h26.324c.211 0 .382-.171.382-.383ZM65.693 77.56c-2.04-3.686-5.74-6.133-9.95-6.133-.895 0-1.766.11-2.602.319a.382.382 0 0 1-.184-.743 11.478 11.478 0 0 1 2.785-.341c4.52 0 8.46 2.627 10.618 6.528a14.09 14.09 0 0 1 1.563 4.503.382.382 0 1 1-.752.126 13.324 13.324 0 0 0-1.478-4.258Z"
-            />
-            <path
-              class="tw-fill-art-primary tw-stroke-art-primary"
-              fill-rule="evenodd"
-              stroke-width=".355"
-              d="M75.94 32.403c8.007 0 14.498 6.51 14.498 14.538a14.542 14.542 0 0 1-9.26 13.56c8.849 1.9 15.896 8.519 18.221 17.036l-1.472.404C95.343 68.475 86.492 61.48 75.95 61.48c-6.743 0-12.796 2.861-16.96 7.404l-1.123-1.036a24.374 24.374 0 0 1 12.842-7.344 14.542 14.542 0 0 1-9.265-13.563c0-8.029 6.49-14.538 14.497-14.538Zm12.972 14.538c0-7.184-5.808-13.007-12.972-13.007S62.97 39.757 62.97 46.94c0 7.184 5.807 13.008 12.971 13.008s12.972-5.823 12.972-13.008Z"
+              d="M50.118 70h6.692L60 66.81l2.5 2.5 1.25-1.25L65 69.31l2.5-2.5L70.69 70h2.786l4.167-4.167-4.167-4.166H50.118l-.457-.937a11.667 11.667 0 0 0-10.494-6.563c-6.444 0-11.667 5.223-11.667 11.666 0 6.444 5.223 11.667 11.667 11.667 4.61 0 8.6-2.674 10.494-6.563l.457-.937Zm29.587-3.872a.417.417 0 0 0 0-.59l-5.05-5.05A1.667 1.667 0 0 0 73.476 60H51.16c-2.164-4.44-6.721-7.5-11.993-7.5-7.364 0-13.334 5.97-13.334 13.333 0 7.364 5.97 13.334 13.334 13.334 5.272 0 9.829-3.06 11.993-7.5h5.65c.442 0 .866-.176 1.178-.489L60 69.168l1.91 1.91a.833.833 0 0 0 1.179.001l.661-.661.66.66.002.001a.833.833 0 0 0 1.177 0l1.911-1.911 2.012 2.011c.312.313.736.489 1.178.489h2.786c.442 0 .866-.176 1.179-.489l5.05-5.05Zm-41.372-.295a4.167 4.167 0 1 1-8.333 0 4.167 4.167 0 0 1 8.333 0Zm-1.666 0a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0ZM16.126 28.497a15.793 15.793 0 0 1 5.542-.996c1.95 0 3.818.352 5.541.996a.833.833 0 0 0 .584-1.56 17.462 17.462 0 0 0-6.125-1.103c-2.154 0-4.218.39-6.125 1.102a.833.833 0 1 0 .583 1.561Zm5.542 2.337a11.648 11.648 0 0 0-9.335 4.667.833.833 0 1 1-1.332-1 13.314 13.314 0 0 1 10.667-5.334c4.331 0 7.947 1.77 10.59 4.41a.833.833 0 1 1-1.179 1.18c-2.36-2.36-5.564-3.923-9.411-3.923Zm-.117 1.667c-5.377 0-9.63 4.555-9.26 9.92l.075 1.081c.097 1.4.428 2.772.98 4.061l.47 1.099a.833.833 0 1 0 1.532-.656l-.47-1.1a10.835 10.835 0 0 1-.85-3.519l-.074-1.08a7.615 7.615 0 1 1 15.212-.524v.718a.833.833 0 0 1-1.666 0v-.834a5.848 5.848 0 0 0-1.522-3.927c-1.054-1.146-2.637-1.906-4.728-1.906-2.173 0-3.575.99-4.397 2.254-.79 1.216-1.02 2.639-1.02 3.58 0 2.326.209 4.02.794 5.424.593 1.425 1.54 2.465 2.84 3.549a.833.833 0 1 0 1.067-1.28c-1.2-1-1.921-1.835-2.369-2.91-.457-1.097-.665-2.527-.665-4.784 0-.726.187-1.803.75-2.67.533-.82 1.423-1.496 3-1.496 1.659 0 2.785.589 3.501 1.368a4.181 4.181 0 0 1 1.082 2.798v.834a2.5 2.5 0 0 0 5 0v-.718a9.282 9.282 0 0 0-9.282-9.282Zm-.754 9.116c0-.42.347-.783.823-.783a.88.88 0 0 1 .88.88v1.364a4.68 4.68 0 0 0 1.872 3.743l.684.513a5 5 0 0 0 3 1h.277a.833.833 0 0 0 0-1.667h-.277a3.334 3.334 0 0 1-2-.666l-.684-.513a3.013 3.013 0 0 1-1.205-2.41v-1.364a2.547 2.547 0 0 0-2.547-2.547c-1.342 0-2.492 1.056-2.49 2.453.001.82.033 1.85.148 2.804.125 1.035.627 1.848 1.163 2.526.244.31.509.608.757.887l.066.074c.274.308.526.597.752.895.553.729.7 1.326.544 1.719a.833.833 0 0 0 1.547.619c.504-1.26-.137-2.52-.763-3.345-.27-.356-.562-.688-.834-.994l-.06-.069a18.78 18.78 0 0 1-.701-.819c-.456-.577-.745-1.1-.817-1.693a23.012 23.012 0 0 1-.135-2.607Z"
               clip-rule="evenodd"
             />
           </svg>
diff --git a/apps/web/src/images/domain-verification/domain.svg b/apps/web/src/images/domain-verification/domain.svg
deleted file mode 100644
index 66b0ece2b10..00000000000
--- a/apps/web/src/images/domain-verification/domain.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="129" height="123" fill="none"><circle cx="67.071" cy="61.444" r="59.684" fill="#F0F0F0" stroke="#89929F" stroke-width="3"/><path stroke="#89929F" stroke-linecap="round" stroke-width="1.5" d="M21.55 100.351c30.98 2.459 58.077-20.525 60.522-51.335 1.482-18.666-6.06-34.632-19.411-45.882"/><path stroke="#89929F" stroke-linecap="round" stroke-width="1.5" d="M14.496 33.785C12.136 66.27 38.456 95.843 72.6 98.322c1.593.116 5.962.174 7.528.177 4.43-.177 17.611-2.407 26.618-7.151 6.626-3.49 12.932-7.15 17.831-12.737"/><path stroke="#89929F" stroke-linecap="round" stroke-width="1.5" d="M124.435 48.005c-17.949-24.123-55.678-26.834-83.084-6.443-16.604 12.353-26.685 30.356-27.493 48.08"/><circle cx="78.336" cy="27.893" r="5" fill="#89929F"/><circle cx="19.703" cy="66.052" r="5" fill="#89929F"/><circle cx="52.277" cy="93.973" r="5" fill="#89929F"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/locales/af/messages.json b/apps/web/src/locales/af/messages.json
index 25dddae897c..11195502289 100644
--- a/apps/web/src/locales/af/messages.json
+++ b/apps/web/src/locales/af/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Welke tipe item is dit?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Bekyk item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nuut",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Het u toegang tot al u tweestapaanbieders verloor? Gebruik dan u terugstelkode om alle tweestapaanbieders op u rekening te deaktiveer."
-  },
   "recoveryCodeTitle": {
     "message": "Terugstelkode"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Verander die taal wat deur die webkluis gebruik word."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Verstek"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Weens ’n ondernemingsbeleid mag u geen wagwoorde in u persoonlike kluis bewaar nie. Verander die eienaarskap na ’n organisasie en kies uit ’n van die beskikbare versamelings."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Deaktiveer Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO gedeaktiveer"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Geaktiveerde Key Connector"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Toegang geweiger. U het nie toestemming om hierdie blad te sien nie."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Lede"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/ar/messages.json b/apps/web/src/locales/ar/messages.json
index dab2ef77242..7dfe8fe7cee 100644
--- a/apps/web/src/locales/ar/messages.json
+++ b/apps/web/src/locales/ar/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "كل التطبيقات"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "شعار بيتواردن"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "إنشاء عنصر تسجيل دخول جديد"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "الأعضاء المبلّغون ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "وضع علامة على التطبيقات الحساسة"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "تعيين كتطبيق حساس"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "الأعضاء المعرضون للخطر"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "الأعضاء المعرضون للخطر ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "تم إلغاء تصنيف التطبيق الحرج بنجاح"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "ما هو نوع العنصر؟"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "عرض العنصر"
   },
-  "newItemHeader": {
-    "message": "جديد $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "تحرير $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "عرض $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "جديد",
@@ -1395,6 +1542,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": "كلمة مرور الملف غير صالحة، الرجاء استخدام كلمة المرور التي أدخلتها عند إنشاء ملف التصدير."
   },
@@ -1404,6 +1560,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": "ليس لديك الصلاحية لعرض جميع العناصر في هذه المجموعة."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "رمز الاسترداد"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "تغيير اللغة المستخدمة في خزانة الويب."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "الافتراضي"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "الأعضاء"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/az/messages.json b/apps/web/src/locales/az/messages.json
index 26147b2b512..e4a4149d9d6 100644
--- a/apps/web/src/locales/az/messages.json
+++ b/apps/web/src/locales/az/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Bütün tətbiqlər"
   },
+  "activity": {
+    "message": "Fəaliyyət"
+  },
   "appLogoLabel": {
     "message": "Bitwarden loqosu"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Yeni giriş elementi yarat"
   },
+  "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, they will display here."
+  },
+  "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 tətbiqlər ($COUNT$)",
     "placeholders": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ kritik tətbiq",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Məlumatlandırılan üzvlər ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
-    "message": "Heç bir tətbiqi Kritik olaraq işarələməmisiniz"
+  "noCriticalApplicationsTitle": {
+    "message": "Heç bir tətbiqi kritik olaraq işarələməmisiniz"
   },
-  "noCriticalAppsDescription": {
-    "message": "Riskli parolları kəşf etmək üçün ən kritik tətbiqlərinizi seçin və bu parolları dəyişdirməsi üçün istifadəçiləri məlumatlandırın."
+  "noCriticalApplicationsDescription": {
+    "message": "İstifadəçilərinizin risk altında olan parollara müraciət etmələri üçün təhlükəsizlik tədbirlərinə üstünlük verməsi məqsədilə ən kritik tətbiqlərinizi seçin."
   },
-  "markCriticalApps": {
-    "message": "Kritik tətbiqləri işarələ"
+  "markCriticalApplications": {
+    "message": "Kritik tətbiqləri seç"
   },
   "markAppAsCritical": {
     "message": "Tətbiqi kritik olaraq işarələ"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Riskli üzvlər"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Risk altındakı üzvlər ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Kritik olaraq işarələməni götür"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Kritik tətbiq işarəsi uğurla götürüldü"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Tətbiqin kritik olaraq işarələnməsi uğurla götürüldü"
   },
   "whatTypeOfItem": {
     "message": "Bu elementin növü nədir?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Elementə bax"
   },
-  "newItemHeader": {
-    "message": "Yeni $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Yeni giriş",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ - düzəliş et",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Yeni kart",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "$ITEMTYPE$ - bax",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Yeni kimlik",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Yeni not",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Yeni SSH açarı",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Yeni Send mətni",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Yeni Send faylı",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Girişə düzəliş et",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Karta düzəliş et",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Kimliyə düzəliş et",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Nota düzəliş et",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "SSH açarına düzəliş et",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Send mətninə düzəliş et",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Send faylına düzəliş et",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Girişə bax",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Karta bax",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Kimliyə bax",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Nota bax",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "SSH açarına bax",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Yeni",
@@ -1395,6 +1542,15 @@
   "invalidMasterPassword": {
     "message": "Yararsız ana parol"
   },
+  "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": "Yararsız fayl parolu, lütfən xaricə köçürmə faylını yaradarkən daxil etdiyiniz parolu istifadə edin."
   },
@@ -1404,6 +1560,30 @@
   "noItemsInList": {
     "message": "Sadalanacaq heç bir element yoxdur."
   },
+  "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": "Bu kolleksiyadakı bütün elementlərə baxmaq üçün icazəniz yoxdur."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "İki addımlı giriş üsulunu seçin"
   },
-  "recoveryCodeDesc": {
-    "message": "İki addımlı giriş provayderlərinizə erişə bilmirsiniz? Geri qaytarma kodunuzu istifadə edərək hesabınızdakı bütün iki addımlı giriş provayderlərini söndürə bilərsiniz."
-  },
   "recoveryCodeTitle": {
     "message": "Geri qaytarma kodu"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Veb seyfdə istifadə olunan dili dəyişdirin."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Veb sayt ikonlarını göstər və parol dəyişdirmə URL-lərini al"
   },
   "default": {
     "message": "İlkin"
@@ -4702,6 +4876,12 @@
   "organizationIsDisabled": {
     "message": "Təşkilat sıradan çıxarıldı."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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": "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 əlaqəsini kəs"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Müəssisə siyasətinə görə, elementləri şəxsi seyfinizdə saxlamağınız məhdudlaşdırılıb. Sahiblik seçimini təşkilat olaraq dəyişdirin və mövcud kolleksiyalar arasından seçim edin."
   },
+  "desktopAutotypePolicy": {
+    "message": "Masaüstü avto-yazma ilkin ayarı"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Üzvlər üçün Masaüstü avto-yazma ayarını ilkin olaraq işə salın. Üzvlər Masaüstü client-ində avto-yazma ayarını manual olaraq söndürə bilər.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "\"Send\"i sıradan çıxart"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO sıradan çıxarılıb"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$, Vahid Daxil olma üsulu ilə giriş etməlidir",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector aktivdir"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Erişim rədd edildi. Bu səhifəyə baxmaq üçün icazəniz yoxdur."
   },
@@ -7043,6 +7258,9 @@
   "unknownSecret": {
     "message": "Bilinməyən sirr, bu sirrə erişmək üçün icazə istəməli ola bilərsiniz."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Bilinməyən layihə, bu layihəyə erişmək üçün icazə istəməli ola bilərsiniz."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Bağlı"
   },
+  "connected": {
+    "message": "Bağlantılıdır"
+  },
   "members": {
     "message": "Üzvlər"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "$PROJECT_ID$ kimliyinə sahib bir layihəyə erişildi.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "$SECRET_ID$ identifikatoruna sahib bir layihəyə düzəliş edildi.",
     "placeholders": {
@@ -8432,6 +8656,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$ identifikatoruna sahib bir layihə silindi.",
     "placeholders": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Təyin et"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Kolleksiyalara təyin et"
   },
@@ -9666,6 +9963,12 @@
   "failedToSaveIntegration": {
     "message": "İnteqrasiya saxlanılmadı. Lütfən daha sonra yenidən sınayın."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
+  "failedToDeleteIntegration": {
+    "message": "İnteqrasiya silinmədi. Lütfən daha sonra yenidən sınayın."
+  },
   "deviceIdMissing": {
     "message": "Cihaz kimliyi əskikdir"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Güncəllə: $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "$INTEGRATION$ icra bələdçisini başlat.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Tokeni"
   },
+  "repositoryNameHint": {
+    "message": "Daxil ediləcək repozitoriyanın adı"
+  },
   "index": {
     "message": "İndeks"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Bitwarden-nin API-si haqqında daha ətraflı"
   },
-  "fileSend": {
-    "message": "Fayl \"Send\"i"
-  },
   "fileSends": {
     "message": "Fayl \"Send\"ləri"
   },
-  "textSend": {
-    "message": "Mətn \"Send\"i"
-  },
   "textSends": {
     "message": "Mətn \"Send\"ləri"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Riskli parolları dəyişdir"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Bu giriş risk altındadır və bir veb sayt əskikdir. Daha güclü təhlükəsizlik üçün bir veb sayt əlavə edin və parolu dəyişdirin."
+  },
+  "missingWebsite": {
+    "message": "Əskik veb sayt"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Kilidi PIN ilə açmanı ləğv et"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Ödənişsiz təşkilatların ən çox 2 kolleksiyası ola bilər. Daha çox kolleksiya əlavə etmək üçün ödənişli bir plana yüksəldin."
   },
+  "searchArchive": {
+    "message": "Arxivdə axtar"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Arxivdə element yoxdur"
+  },
+  "archivedItemsDescription": {
+    "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."
+  },
   "businessUnit": {
     "message": "Biznes vahidi"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden uzantısı quraşdırıldı!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Giriş etmək üçün uzantını aç və avto-doldurmağa başla."
   },
@@ -11071,6 +11403,12 @@
     "message": "Kredit əlavə etmək üçün faktura ünvanı tələb olunur.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "Bu ayar barədə"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden, təcrübənizi təkmilləşdirmək üçün hansı ikonun və ya parol dəyişdirmə URL-sinin istifadə olunmalı olduğunu müəyyənləşdirmək məqsədilə saxlanılmış giriş URL-lərini istifadə edəcək. Bu xidməti istifadə etdiyiniz zaman heç bir məlumat yığılmır və ya saxlanılmır."
+  },
   "billingAddress": {
     "message": "Faktura ünvanı"
   },
@@ -11189,7 +11527,7 @@
     "message": "Əməliyyat tələb olunur: Ödəniş detallarında Vergi kimlik nömrəsini buraxmısınız. Əgər əlavə edilməyəcəksə, fakturalarınıza əlavə vergi daxil ola bilər."
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "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."
   },
   "addTaxId": {
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Key Connector domenini təsdiqlə"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Bank hesabı ilə ödəniş, yalnız Amerika Birləşmiş Ştatlarındakı müştərilər üçün əlçatandır. Bank hesabınızı doğrulamağınız tələb olunacaq. Növbəti 1-2 iş günü ərzində mikro depozit qoyacağıq. Bank hesabı doğrulanmadıqda ödəniş buraxılacaq və abunəliyiniz dayandırılacaq."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Bank hesabınıza mikro depozit qoymuşuq. Bu, 1-2 iş günü çəkə bilər. Hesabınızda depoziti gördüyünüz zaman bank hesabınızı doğrulaya biləcəksiniz. Bank hesabı doğrulanmadıqda ödəniş buraxılacaq və abunəliyiniz dayandırılacaq."
+  },
+  "verifyNow": {
+    "message": "İndi doğrula."
+  },
+  "additionalStorageGB": {
+    "message": "Əlavə anbar sahəsi GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Əlavə maşın hesabları"
+  },
+  "secretsManagerSeats": {
+    "message": "Sirr Meneceri yerləri"
+  },
+  "additionalStorage": {
+    "message": "Əlavə anbar sahəsi"
+  },
+  "expandPurchaseDetails": {
+    "message": "Satın alma detallarını genişləndir"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Satın alma detallarını yığcamlaşdır"
+  },
+  "familiesMembership": {
+    "message": "Ailə üzvlüyü"
+  },
+  "planDescPremium": {
+    "message": "Tam onlayn təhlükəsizlik"
+  },
+  "planDescFamiliesV2": {
+    "message": "Ailəniz üçün Premium təhlükəsizlik"
+  },
+  "planDescFreeV2": {
+    "message": "Digər $COUNT$ istifadəçi ilə paylaş",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Hər bir təşkilat üçün qabaqcıl imkanlar"
+  },
+  "planNameCustom": {
+    "message": "Özəl plan"
+  },
+  "planDescCustom": {
+    "message": "Bitwarden, parolların və həssas məlumatların təhlükəsizliyini təmin etmək üçün istənilən miqyaslı şirkətə uyğunlaşır. Əgər böyük bir müəssisənin bir hissəsisinizsə, qiymət təklifi üçün satış şöbəsi ilə əlaqə saxlayın."
+  },
+  "builtInAuthenticator": {
+    "message": "Daxili kimlik doğrulayıcı"
+  },
+  "breachMonitoring": {
+    "message": "Pozuntu monitorinqi"
+  },
+  "andMoreFeatures": {
+    "message": "Və daha çoxu!"
+  },
+  "secureFileStorage": {
+    "message": "Güvənli fayl anbarı"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Limitsiz paylaşım - kimin nəyi görəcəyini seçin"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Limitsiz ailə kolleksiyaları"
+  },
+  "familiesSharedStorage": {
+    "message": "Vacib ailə məlumatları üçün paylaşılan anbar sahəsi"
+  },
+  "limitedUsersV2": {
+    "message": "$COUNT$ üzvə qədər",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "$COUNT$ kolleksiyaya qədər",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Həmişə ödənişsiz"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 sirr"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ layihə",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Güvənli element paylaşımı"
+  },
+  "scimSupport": {
+    "message": "SCIM dəstəyi"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ maşın hesabı",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Müəssisə təhlükəsizlik siyasətləri"
+  },
+  "selfHostOption": {
+    "message": "Self-host seçimi"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Bütün istifadəçilər üçün ödənişsiz ailə planı"
+  },
+  "strengthenCybersecurity": {
+    "message": "Gücləndirilmiş kibertəhlükəsizlik"
+  },
+  "boostProductivity": {
+    "message": "Məhsuldarlığı artırın"
+  },
+  "seamlessIntegration": {
+    "message": "Problemsiz inteqrasiya"
   }
 }
-
diff --git a/apps/web/src/locales/be/messages.json b/apps/web/src/locales/be/messages.json
index 746e609c918..8c6000c3f38 100644
--- a/apps/web/src/locales/be/messages.json
+++ b/apps/web/src/locales/be/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Усе праграмы"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Стварыць новы элемент запісу ўваходу"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Апавешчаныя ўдзельнікі ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "Тут будуць адлюстроўвацца праграмы па меры таго, як карыстальнікі будуць захоўваць запісы ўваходу, якія знаходзяцца ў зоне рызыкі. Пазначце крытычныя праграмы і апавяшчайце карыстальнікаў аб неабходнасці абнавіць паролі."
   },
-  "noCriticalAppsTitle": {
-    "message": "Вы не пазначылі ніводную праграму ў якасці кратычнай"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Выберыце найбольш крытычныя праграмы для выяўлення пароляў, якія знаходзяцца ў зоне рызыкі. Апавяшчайце карыстальнікаў аб неабходнасці змяніць іх."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Пазначыць крытычныя праграмы"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Пазначыць праграму як крытычную"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Удзельнікі ў зоне рызыкі"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Удзельнікі ў зоне рызыкі ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Пазнака з крытычнай праграмы паспяхова знята"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Які гэта элемент запісу?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Прагледзець элемент"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Новы",
@@ -1395,6 +1542,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": "Памылковы пароль файла. Скарыстайцеся паролем, які вы ўводзілі пры стварэнні файла экспартавання."
   },
@@ -1404,6 +1560,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": "У вас няма правоў для прагляду ўсіх элементаў у гэтай калекцыі."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Згубілі доступ да ўсіх варыянтаў доступу пастаўшчыкоў двухэтапнай аўтэнтыфікацыі? Скарыстайцеся кодам аднаўлення, каб адключыць праверку пастаўшчыкоў двухэтапнай аўтэнтыфікацыі для вашага ўліковага запісу."
-  },
   "recoveryCodeTitle": {
     "message": "Код аднаўлення"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Змяніць мову інтэрфейсу вэб-сховішча."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Прадвызначана"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Доступ да элементаў у адключаных арганізацыях немагчымы. Звяжыце з уладальнікам арганізацыі для атрымання дапамогі."
-  },
   "licenseIsExpired": {
     "message": "Ліцэнзія пратэрмінавана."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "У адпаведнасці з палітыкай прадпрыемства вам забаронена захоўваць элементы ў асабістым сховішчы. Змяніце параметры ўласнасці на арганізацыю і выберыце з даступных калекцый."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Выдаліць Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO адключаны"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector уключаны"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Доступ забаронены. У вас не дастаткова правоў для прагляду гэтай старонкі."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Удзельнікі"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/bg/messages.json b/apps/web/src/locales/bg/messages.json
index 870efcbcc09..dd0c14b8f76 100644
--- a/apps/web/src/locales/bg/messages.json
+++ b/apps/web/src/locales/bg/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Всички приложения"
   },
+  "activity": {
+    "message": "Дейност"
+  },
   "appLogoLabel": {
     "message": "Лого на Битуорден"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Създаване на нов елемент за вписване"
   },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ важни приложения",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ прилжения са в риск",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ пароли в риск",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Известени членове ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "Когато потребителите запазват данните си за вписване, тук ще се появяват приложения, а също и ще се показват паролите в риск. Можете да отбелязвате важните приложения и да напомняте на потребителите да сменят паролите си."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "Не сте отбелязали нито едно приложение като важно"
   },
-  "noCriticalAppsDescription": {
-    "message": "Изберете най-важните си приложения, за да откриете паролите, които може да са в риск, и да известите потребителите да ги сменят."
+  "noCriticalApplicationsDescription": {
+    "message": "Изберете най важните си приложения, за да приоритизирате действията по сигурността за своите потребители, както и да адресирате паролите в риск."
   },
-  "markCriticalApps": {
-    "message": "Отбележете важните приложения"
+  "markCriticalApplications": {
+    "message": "Изберете важните приложения"
   },
   "markAppAsCritical": {
     "message": "Отбелязване на приложението като важно"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Членове в риск"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Членове с достъп до елементи в риск за важни приложения"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ членове в риск",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Членове в риск ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Премахване от важните"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Приложението е премахнато от важните"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Успешно премахване на приложението от важните"
   },
   "whatTypeOfItem": {
     "message": "Вид на елемента"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Преглед на елемента"
   },
-  "newItemHeader": {
-    "message": "Ново $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Нов елемент за вписване",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Редактиране на $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Нова карта",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Преглед на $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Нова самоличност",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Нова бележка",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Нов SSH ключ",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Ново текстово Изпращане",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Ново файлово Изпращане",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Редактиране на елемента за вписване",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Редактиране на картата",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Редактиране на самоличността",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Редактиране на бележката",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Редактиране на SSH ключа",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Редактиране на текстовото Изпращане",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Редактиране на файловото Изпращане",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Преглед на елемента за вписване",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Преглед на картата",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Преглед на самоличността",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Преглед на бележката",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Преглед на SSH ключа",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Ново",
@@ -1395,6 +1542,15 @@
   "invalidMasterPassword": {
     "message": "Грешна главна парола"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Грешна главна парола. Проверете дали е-пощата е правилна и дали акаунтът Ви е създаден в $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Неправилна парола за файла. Използвайте паролата, която сте въвели при създаването на изнесения файл."
   },
@@ -1404,6 +1560,30 @@
   "noItemsInList": {
     "message": "Няма елементи за показване."
   },
+  "noItemsInTrash": {
+    "message": "Няма елементи в кошчето"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Елементите, които изтривате, ще бъдат премествани тук и изтривани окончателно след 30 дни"
+  },
+  "noItemsInVault": {
+    "message": "Няма елементи в трезора"
+  },
+  "emptyVaultDescription": {
+    "message": "Трезорът може да пази не само паролите Ви. Тум можете да съхранявате сигурно данни за вписване, идентификационни данни, карти и бележки."
+  },
+  "emptyFavorites": {
+    "message": "Все още нямате любими неща"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Добавете често ползваните неща в любимите си, за бърз достъп."
+  },
+  "noSearchResults": {
+    "message": "Няма резултати от търсенето"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Изчистете филтрите или опитайте да търсите нещо друго"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Нямате права да преглеждате всички елементи в тази колекция."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Изберете начин за двустепенно удостоверяване"
   },
-  "recoveryCodeDesc": {
-    "message": "Ако сте загубили достъп до двустепенното удостоверяване, може да използвате код за възстановяване, за да изключите двустепенното удостоверяване в абонамента си."
-  },
   "recoveryCodeTitle": {
     "message": "Код за възстановяване"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Смяна на езика на интерфейса. Ще трябва да пуснете програмата повторно."
   },
-  "enableFavicon": {
-    "message": "Показване на иконките на уеб сайтовете"
-  },
-  "faviconDesc": {
-    "message": "Показване на разпознаваемо изображение до всеки запис."
+  "showIconsChangePasswordUrls": {
+    "message": "Показване на иконките на уеб сайтовете и извличане на адресите за смяна на паролата"
   },
   "default": {
     "message": "Стандартно"
@@ -3510,7 +3684,7 @@
     "description": "Browser extension/addon"
   },
   "desktop": {
-    "message": "Десктоп",
+    "message": "Настолно приложение",
     "description": "Desktop app"
   },
   "webVault": {
@@ -4702,6 +4876,12 @@
   "organizationIsDisabled": {
     "message": "Организацията е изключена."
   },
+  "organizationIsSuspended": {
+    "message": "Организацията е с преустановен достъп"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Записите в организации с преустановен достъп не са достъпни. Свържете се със собственика на организацията си за помощ."
+  },
   "secretsAccessSuspended": {
     "message": "Изключените организации са недостъпни. Свържете се със собственика на организацията си за помощ."
   },
@@ -4714,9 +4894,6 @@
   "serviceAccountsCannotCreate": {
     "message": "В изключени организации не могат да се създават сервизни акаунти. Свържете се със собственика на организацията си за помощ."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Записите в изключени организации не са достъпни. Свържете се със собственика на организацията си за помощ."
-  },
   "licenseIsExpired": {
     "message": "Изтекъл лиценз."
   },
@@ -5090,9 +5267,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": "Прекъсване на еднократна идентификация"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Заради някоя политика за голяма организация не може да запазвате елементи в собствения си трезор. Променете собствеността да е на организация и изберете от наличните колекции."
   },
+  "desktopAutotypePolicy": {
+    "message": "Настройка по подразбиране за авт. попълване за работен плот"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Включете автоматичното попълване за работен плот по подразбиране за всички членове. Всеки от тях ще може поотделно да изключи автоматичното попълване ръчно от настолното приложение.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Без изпращане"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "Еднократното удостоверяване е изключено"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ трябва да се впише чрез еднократно удостоверяване",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Конекторът за ключове е включен"
   },
@@ -6889,6 +7086,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Ще бъдат изнесени само записите от трезора свързан с $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Ще бъдат изнесени само записите от трезора свързан с $ORGANIZATION$. Моите колекции няма да бъдат включени.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Достъпът е отказан. Нямате право за преглед на тази страница."
   },
@@ -7043,6 +7258,9 @@
   "unknownSecret": {
     "message": "Неизвестна тайна. Може да се нуждаете от правомощие за достъп до тази тайна."
   },
+  "unknownServiceAccount": {
+    "message": "Неизвестен машинен акаунт. Може да се нуждаете от правомощие за достъп до този машинен акаунт."
+  },
   "unknownProject": {
     "message": "Неизвестен проект. Може да се нуждаете от правомощие за достъп до този проект."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Изключено"
   },
+  "connected": {
+    "message": "Свързано"
+  },
   "members": {
     "message": "Членове"
   },
@@ -8287,12 +8508,6 @@
   "groupSlashUser": {
     "message": "Група/потребител"
   },
-  "lowKdfIterations": {
-    "message": "Малко повторения за KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Променете настройките си за шифроване, така че да отговарят на новите препоръки за сигурността и да подобрите защитата на регистрацията си."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Ако продължите, ще излезете от всички активни сесии. Ще трябва да се впишете отново и да извършите двустепенно удостоверяване, ако такова е настроено. Препоръчително е да изнесете трезора си преди да променяте настройките за шифроване, за да избегнете загуба на данни."
   },
@@ -8396,7 +8611,7 @@
       }
     }
   },
-  "accessedProjectWithId": {
+  "accessedProjectWithIdentifier": {
     "message": "Осъществен е достъп до проект с идентификатор: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
@@ -8423,6 +8638,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Изтрит е машинен акаунт с идентификатор: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Редактиран е проект с идентификатор: $PROJECT_ID$",
     "placeholders": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Свързване"
   },
+  "assignTasks": {
+    "message": "Назначаване на задачи"
+  },
   "assignToCollections": {
     "message": "Свързване с колекции"
   },
@@ -9666,6 +9963,12 @@
   "failedToSaveIntegration": {
     "message": "Интеграцията не беше запазена. Опитайте отново по-късно."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Трябва да бъдете собственик на организацията, за да извършите това действие."
+  },
+  "failedToDeleteIntegration": {
+    "message": "Интеграцията не беше изтрита. Опитайте отново по-късно."
+  },
   "deviceIdMissing": {
     "message": "Липсва идентификатор на устройството"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Обновяване на $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Стартиране на ръководството за внедряване за $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Идентификатор „Bearer“"
   },
+  "repositoryNameHint": {
+    "message": "Име на хранилището, към което да се праща"
+  },
   "index": {
     "message": "Индекс"
   },
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Малък брой повторения за KDF. Увеличете броя повторения, за да подсилите защитата на регистрацията си."
-  },
-  "changeKDFSettings": {
-    "message": "Промяна на настройките за KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Подсигурете инфраструктурата си"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Научете повече относно ППИ на Биуорден"
   },
-  "fileSend": {
-    "message": "Файлово изпращане"
-  },
   "fileSends": {
     "message": "Файлови изпращания"
   },
-  "textSend": {
-    "message": "Текстово изпращане"
-  },
   "textSends": {
     "message": "Текстови изпращания"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Промяна на парола в риск"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Този елемент за вписване е в риск и в него липсва уеб сайт. Добавете уеб сайт и сменете паролата, за по-добра сигурност."
+  },
+  "missingWebsite": {
+    "message": "Липсващ уеб сайт"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Премахване на отключването чрез ПИН"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Безплатните организации могат да имат не повече от 2 колекции. Надградете до платен план, ако искате да имате повече колекции."
   },
+  "searchArchive": {
+    "message": "Търсене в архива"
+  },
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архивиране",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Няма елементи в архива"
+  },
+  "archivedItemsDescription": {
+    "message": "Архивираните елементи ще се показват тук и ще бъдат изключени от общите резултати при търсене и от предложенията за автоматично попълване."
+  },
   "businessUnit": {
     "message": "Бизнес единица"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Добавката на Битуорден е инсталирана!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Отварете добавката на Битуорден"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "Добавката на Битуорден е инсталирана! Отворете я, за да се впишете и да можете да се вписвате автоматично."
+  },
   "openExtensionToAutofill": {
     "message": "Отворете добавката, за да се впишете и да можете да използвате автоматичното попълване."
   },
@@ -11071,6 +11403,12 @@
     "message": "Адресът за таксуване е задължителен за добавянето на средства.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "Относно тази настройка"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Битуорден ще използва запазените адреси за вписване, за да определи коя иконка или адрес за смяна на паролата да се ползва, за да улесни работата Ви. Никакви данни не се събират или съхраняват, когато използвате тази услуга."
+  },
   "billingAddress": {
     "message": "Адрес за фактуриране"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Потвърждаване на домейна на конектора за ключове"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Плащането чрез банкова сметка е налично само за клиенти от САЩ. Ще трябва да потвърдите банковата си сметка. В следващите 1-2 работни дни ще направим малък депозит. Ако не потвърдите банковата сметка, може да пропуснете плащането и абонаментът Ви да бъде спрян."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Направихме малък депозит по банковата Ви сметка. Може да отнеме 1-2 работни дни преди да го видите. Когато видите депозита, ще можете да потвърдите банковата си сметка. Ако не потвърдите банковата сметка, може да пропуснете плащането и абонаментът Ви да бъде спрян."
+  },
+  "verifyNow": {
+    "message": "Потвърдете сега."
+  },
+  "additionalStorageGB": {
+    "message": "Допълнително място в ГБ"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Допълнителни машинни акаунти"
+  },
+  "secretsManagerSeats": {
+    "message": "Брой потребители за Управлението на тайни"
+  },
+  "additionalStorage": {
+    "message": "Допълнително място"
+  },
+  "expandPurchaseDetails": {
+    "message": "Разгъване на подробностите за покупката"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Свиване на подробностите за покупката"
+  },
+  "familiesMembership": {
+    "message": "Членство за семейства"
+  },
+  "planDescPremium": {
+    "message": "Пълна сигурност в Интернет"
+  },
+  "planDescFamiliesV2": {
+    "message": "Допълнителна защита за Вашето семейство"
+  },
+  "planDescFreeV2": {
+    "message": "Споделяне с още $COUNT$ потребител",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Допълнителни възможности за всякакви организации"
+  },
+  "planNameCustom": {
+    "message": "Персонализиран план"
+  },
+  "planDescCustom": {
+    "message": "Битуорден работи за компании от всякакви размери, когато става въпрос за пароли и поверителна информация. Ако сте част от голяма компания, свържете се с отдела по продажби, за да попитате за цена."
+  },
+  "builtInAuthenticator": {
+    "message": "Вграден удостоверител"
+  },
+  "breachMonitoring": {
+    "message": "Наблюдение за пробиви"
+  },
+  "andMoreFeatures": {
+    "message": "И още!"
+  },
+  "secureFileStorage": {
+    "message": "Сигурно съхранение на файлове"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Неограничено споделяне – изберете кой и какво може да вижда"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Неограничен брой колекции за семейства"
+  },
+  "familiesSharedStorage": {
+    "message": "Споделено пространство за важните семейни данни"
+  },
+  "limitedUsersV2": {
+    "message": "До $COUNT$ членове",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "До $COUNT$ колекции",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Винаги безплатно"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 тайни"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ проект(а)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Сигурно споделяне на елементи"
+  },
+  "scimSupport": {
+    "message": "Поддръжка на SCIM"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ машинни акаунти",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Политики за сигурност за големи компании"
+  },
+  "selfHostOption": {
+    "message": "Възможност за собствен хостинг"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Допълнителен безплатен семеен план за всички потребители"
+  },
+  "strengthenCybersecurity": {
+    "message": "Затвърдете киберсигурността"
+  },
+  "boostProductivity": {
+    "message": "Увеличете продуктивността"
+  },
+  "seamlessIntegration": {
+    "message": "Безпроблемна интеграция"
   }
 }
-
diff --git a/apps/web/src/locales/bn/messages.json b/apps/web/src/locales/bn/messages.json
index 248145d21c5..a0d38221ef2 100644
--- a/apps/web/src/locales/bn/messages.json
+++ b/apps/web/src/locales/bn/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "এটি কোন ধরণের বস্তু?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "বস্তু দেখুন"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "আপনার সমস্ত দ্বি-গুণক সরবরাহকারীদের অ্যাক্সেস হারিয়েছেন? আপনার অ্যাকাউন্ট থেকে সমস্ত দ্বি-গুণক সরবরাহকারীদের অক্ষম করতে আপনার পুনরুদ্ধার কোডটি ব্যবহার করুন।"
-  },
   "recoveryCodeTitle": {
     "message": "পুনরুদ্ধার কোড"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "পূর্ব-নির্ধারিত"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/bs/messages.json b/apps/web/src/locales/bs/messages.json
index 57d12cf742b..3f723a74e80 100644
--- a/apps/web/src/locales/bs/messages.json
+++ b/apps/web/src/locales/bs/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Koja je ovo vrsta stavke?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Prikaz Stavke"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Novo",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Izgubljen je pristup uređaju za dvostruku autentifikaciju? Koristite svoj kôd za oporavak za onemogućavanje svih pružatelja usluga dvostruke autentifikacije na tvojem računu."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/ca/messages.json b/apps/web/src/locales/ca/messages.json
index bcdbc3aeb5c..90d69ca33ad 100644
--- a/apps/web/src/locales/ca/messages.json
+++ b/apps/web/src/locales/ca/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Totes les aplicacions"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Logotip de Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Crea un nou element d'inici de sessió"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Membres notificats ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Quin tipus d'element és aquest?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Visualitza l'element"
   },
-  "newItemHeader": {
-    "message": "Nou $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edita $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Mostra $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nou",
@@ -1395,6 +1542,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ó."
   },
@@ -1404,6 +1560,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ó."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Heu perdut l'accés a tots els vostres proveïdors de dos factors? Utilitzeu el vostre codi de recuperació per desactivar tots els proveïdors de dos factors del vostre compte."
-  },
   "recoveryCodeTitle": {
     "message": "Codi de recuperació"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Canvia l'idioma utilitzat per la caixa forta web."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Per defecte"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "A causa d'una política empresarial, no podeu guardar elements a la vostra caixa forta personal. Canvieu l'opció Propietat en organització i trieu entre les col·leccions disponibles."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Suprimeix Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO inhabilitat"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Connector de claus habilitat"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Accés denegat. No teniu permís per veure aquesta pàgina."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Desactivat"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Membres"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assigna"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assigna a col·leccions"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Unitat de negoci"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/cs/messages.json b/apps/web/src/locales/cs/messages.json
index 3e761da97b7..62af2581a57 100644
--- a/apps/web/src/locales/cs/messages.json
+++ b/apps/web/src/locales/cs/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Všechny aplikace"
   },
+  "activity": {
+    "message": "Aktivita"
+  },
   "appLogoLabel": {
     "message": "Logo Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Vytvořit novou položku přihlášení"
   },
+  "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 a označíte aplikace jako kritické, zobrazí se zde."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ kritických aplikací",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "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"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Obeznámení členové ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "Neoznačili jste žádné aplikace jako kritické"
   },
-  "noCriticalAppsDescription": {
-    "message": "Vyberte své nejkritičtější aplikace, abyste objevili ohrožená hesla a upozorněte uživatele na změnu těchto hesel."
+  "noCriticalApplicationsDescription": {
+    "message": "Vyberte nejdůležitější aplikace a stanovte priority bezpečnostních opatření, která mají uživatelé provést, aby vyřešili problém rizikových hesel."
   },
-  "markCriticalApps": {
-    "message": "Označit kritické aplikace"
+  "markCriticalApplications": {
+    "message": "Vyberte kritické aplikace"
   },
   "markAppAsCritical": {
     "message": "Označit aplikaci jako kritickou"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Ohrožení členové"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Členové s přístupem k rizikovým položkám pro kritické aplikace"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ členů v ohrožení",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Ohrožení členové ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Zrušit označení jako kritické"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Kritická aplikace úspěšně odoznačena"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Úspěšné zrušení označení aplikace jako kritické"
   },
   "whatTypeOfItem": {
     "message": "O jaký typ položky se jedná?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Zobrazit položku"
   },
-  "newItemHeader": {
-    "message": "Nové $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nové přihlášení",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Upravit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nová karta",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Zobrazit $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nová identita",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nová poznámka",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nový SSH klíč",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Nový textový Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Nový Send se soubory",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Upravit přihlášení",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Upravit kartu",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Upravit identitu",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Upravit poznámku",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Upravit SSH klíč",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Upravit textový Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Upravit Send se soubory",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Zobrazit přihlášení",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Zobrazit kartu",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Zobrazit identitu",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Zobrazit poznámku",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Zobrazit SSH klíč",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nová",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Vyberte metodu dvoufázového přihlášení"
   },
-  "recoveryCodeDesc": {
-    "message": "Ztratili jste přístup ke všem nastaveným poskytovatelům dvoufázového přihlášení? Použijte obnovovací kód pro vypnutí dvoufázového přihlášení."
-  },
   "recoveryCodeTitle": {
     "message": "Kód pro obnovení"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Změní jazyk používaný ve webovém trezoru."
   },
-  "enableFavicon": {
-    "message": "Zobrazit ikony webových stránek"
-  },
-  "faviconDesc": {
-    "message": "Zobrazí rozeznatelný obrázek vedle každého přihlášení."
+  "showIconsChangePasswordUrls": {
+    "message": "Zobrazit ikony webových stránek a načíst URL adresy pro změnu hesla"
   },
   "default": {
     "message": "Výchozí"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Z důvodu podnikových zásad nemůžete ukládat položky do svého osobního trezoru. Změňte vlastnictví položky na organizaci a poté si vyberte z dostupných sbírek."
   },
+  "desktopAutotypePolicy": {
+    "message": "Výchozí nastavení Desktop Autotype"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Ve výchozím nastavení pro členy zapne Desktop Autotype. Uživatelé mohou v klientovi na počítači vypnout Desktop Autotype ručně.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Odebrat Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO je vypnuto"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ se musí přihlásit jednotným přihlášením",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Je aktivován Key Connector"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Přístup byl odepřen. Nemáte oprávnění k zobrazení této stránky."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "VYP."
   },
+  "connected": {
+    "message": "Připojeno"
+  },
   "members": {
     "message": "Členové"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,7 +8611,7 @@
       }
     }
   },
-  "accessedProjectWithId": {
+  "accessedProjectWithIdentifier": {
     "message": "Přístup k projektu s ID: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Přiřadit"
   },
+  "assignTasks": {
+    "message": "Přiřadit úkoly"
+  },
   "assignToCollections": {
     "message": "Přiřadit ke sbírkám"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Chybí ID zařízení"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Aktualizovat $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Spustí průvodce implementací $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Token na doručitele"
   },
+  "repositoryNameHint": {
+    "message": "Název úložiště, do kterého má být vpuštěno"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Další informace o API Bitwardenu"
   },
-  "fileSend": {
-    "message": "Send souboru"
-  },
   "fileSends": {
     "message": "Sends se soubory"
   },
-  "textSend": {
-    "message": "Send textu"
-  },
   "textSends": {
     "message": "Sends s texty"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Změnit ohrožené heslo"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Tyto přihlašovací údaje jsou ohrožené a chybí jim webová stránka. Přidejte webovou stránku a změňte heslo pro větší bezpečnost."
+  },
+  "missingWebsite": {
+    "message": "Chybějící webová stránka"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Odebrat odemknutí pomocí PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Bezplatné organizace mohou mít až 2 sbírky. Chcete-li přidat více sbírek, přejděte na placený tarif."
   },
+  "searchArchive": {
+    "message": "Hledat v archivu"
+  },
+  "archiveNoun": {
+    "message": "Archiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archivovat",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Žádné položky v archivu"
+  },
+  "archivedItemsDescription": {
+    "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í."
+  },
   "businessUnit": {
     "message": "Obchodní jednotka"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Rozšíření Bitwarden nainstalováno!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Otevřít rozšíření Bitwarden"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "Rozšíření Bitwarden je nainstalováno! Otevřete rozšíření pro přihlášení a začněte používat automatické vyplňování."
+  },
   "openExtensionToAutofill": {
     "message": "Otevřete rozšíření pro příhlášení a spuštění automatického vyplňování."
   },
@@ -11071,6 +11403,12 @@
     "message": "Pro přidání kreditu je vyžadována fakturační adresa.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "O tomto nastavení"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden bude používat uložené přihlašovací URI k identifikaci, která ikona nebo změna adresy URL by měla být použita pro zlepšení Vašeho zážitku. Při používání této služby nejsou shromažďovány ani ukládány žádné informace."
+  },
   "billingAddress": {
     "message": "Fakturační adresa"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Potvrdit doménu Key Connectoru"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Platba z bankovního účtu je k dispozici jen zákazníkům ve Spojených státech. Budete požádáni o ověření svého bankovního účtu. V průběhu následujících 1–2 pracovních dnů provedeme mikroplatbu. Pokud bankovní účet neověříte, platba nebude provedena a Vaše předplatné bude pozastaveno."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Provedli jsme mikroplatbu na Váš bankovní účet. To může trvat 1–2 pracovní dny. Jakmile se platba objeví na Vašem účtu, můžete svůj bankovní účet ověřit. Pokud svůj bankovní účet neověříte, dojde k neprovedení platby a Vaše předplatné bude pozastaveno."
+  },
+  "verifyNow": {
+    "message": "Ověřit nyní"
+  },
+  "additionalStorageGB": {
+    "message": "Další úložiště (GB)"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Další strojové účty"
+  },
+  "secretsManagerSeats": {
+    "message": "Uživatelé Správce tajných klíčů"
+  },
+  "additionalStorage": {
+    "message": "Další úložiště"
+  },
+  "expandPurchaseDetails": {
+    "message": "Rozbalit podrobnosti o nákupu"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Sbalit podrobnosti o nákupu"
+  },
+  "familiesMembership": {
+    "message": "Členství v rodinách"
+  },
+  "planDescPremium": {
+    "message": "Dokončit online zabezpečení"
+  },
+  "planDescFamiliesV2": {
+    "message": "Prémiové zabezpečení pro Vaši rodinu"
+  },
+  "planDescFreeV2": {
+    "message": "Sdílet s dalšími $COUNT$ uživateli",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Pokročilé funkce pro jakékoli organizace"
+  },
+  "planNameCustom": {
+    "message": "Vlastní plán"
+  },
+  "planDescCustom": {
+    "message": "Bitwarden se přizpůsobí firmám všech velikostí a zajistí bezpečnost hesel a citlivých informací. Pokud jste součástí velké společnosti, kontaktujte obchodní oddělení a požádejte o cenovou nabídku."
+  },
+  "builtInAuthenticator": {
+    "message": "Vestavěný autentifikátor"
+  },
+  "breachMonitoring": {
+    "message": "Sledování úniků"
+  },
+  "andMoreFeatures": {
+    "message": "A ještě více!"
+  },
+  "secureFileStorage": {
+    "message": "Zabezpečené úložiště souborů"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Neomezené sdílení - vyberte kdo co vidí"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Neomezené rodinné sbírky"
+  },
+  "familiesSharedStorage": {
+    "message": "Sdílené úložiště pro důležité rodinné informace"
+  },
+  "limitedUsersV2": {
+    "message": "Pro až $COUNT$ členů",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Pro až $COUNT$ sbírek",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Vždy zdarma"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 tajné klíče"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ projektů",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Zabezpečené sdílení položek"
+  },
+  "scimSupport": {
+    "message": "Podpora SCIM"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ strojových účtů",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Bezpečnosti zásady podniků"
+  },
+  "selfHostOption": {
+    "message": "Volba vlastního hostitele"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Bezplatný rodinný plán pro všechny uživatele"
+  },
+  "strengthenCybersecurity": {
+    "message": "Posílená kybernetická bezpečnost"
+  },
+  "boostProductivity": {
+    "message": "Zvýšená produktivita"
+  },
+  "seamlessIntegration": {
+    "message": "Hladká integrace"
   }
 }
-
diff --git a/apps/web/src/locales/cy/messages.json b/apps/web/src/locales/cy/messages.json
index 404d26bc5f9..59dd63da969 100644
--- a/apps/web/src/locales/cy/messages.json
+++ b/apps/web/src/locales/cy/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "What type of item is this?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/da/messages.json b/apps/web/src/locales/da/messages.json
index a92cefbeb66..2ffab8a80c9 100644
--- a/apps/web/src/locales/da/messages.json
+++ b/apps/web/src/locales/da/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Alle applikationer"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Opret nyt login-emne"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Underrettede medlemmer ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
-    "message": "Ingen apps markret som Kritisk"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Vælg de mest kritiske apps for at afsløre udsatte adgangskoder og give brugerne besked om at ændre disse."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Markér kritiske apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Markér app som kritisk"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Udsatte medlemmer"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Udsatte medlemmer ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Kritisk app afmarkeret"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Hvilken emnetype er denne?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Vis emne"
   },
-  "newItemHeader": {
-    "message": "Nyt $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Redigér $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Vis $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nyt",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Mistet adgang til alle totrinsudbyderene? Brug din genoprettelseskode til at deaktivere dem alle på kontoen."
-  },
   "recoveryCodeTitle": {
     "message": "Gendannelseskode"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Skift sproget brugt af web-boksen."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Standard"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Grundet en virksomhedspolitik kan du ikke gemme emner i din personlige boks. Skift ejerskabsindstillingen til en organisation, og vælg fra de tilgængelige samlinger."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Fjern Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO deaktiveret"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector aktiveret"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Adgang nægtet. Nødvendig tilladelse til at se siden mangler."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Fra"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Medlemmer"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Tildel"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Tildel til samlinger"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Start $INTEGRATION$-implementeringsguiden.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Få KDF-iterationer. Forøg iterationer for at forbedre kontosikkerheden."
-  },
-  "changeKDFSettings": {
-    "message": "Skift KDF-indstillinger"
-  },
   "secureYourInfrastructure": {
     "message": "Sikr infrastrukturen"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Læs mere om Bitwardens API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "Fil-Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Tekst-Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/de/messages.json b/apps/web/src/locales/de/messages.json
index 895b2a050b9..d45bf25a138 100644
--- a/apps/web/src/locales/de/messages.json
+++ b/apps/web/src/locales/de/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Alle Anwendungen"
   },
+  "activity": {
+    "message": "Aktivität"
+  },
   "appLogoLabel": {
     "message": "Bitwarden-Logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Neuen Zugangsdaten-Eintrag erstellen"
   },
+  "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, werden sie hier angezeigt."
+  },
+  "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$)",
     "placeholders": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ kritische Anwendungen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "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"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Benachrichtigte Mitglieder ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
-    "message": "Du hast keine Anwendungen als kritisch markiert"
+  "noCriticalApplicationsTitle": {
+    "message": "Du hast keine Anwendung als kritisch markiert"
   },
-  "noCriticalAppsDescription": {
-    "message": "Wähle deine wichtigsten Anwendungen aus, um gefährdete Passwörter zu ermitteln, und benachrichtige die Benutzer, damit sie diese Passwörter ändern."
+  "noCriticalApplicationsDescription": {
+    "message": "Wähle deine kritischsten Anwendungen aus, um Sicherheitsmaßnahmen für deine Benutzer zu priorisieren und gefährdete Passwörter zu beheben."
   },
-  "markCriticalApps": {
-    "message": "Kritische Anwendungen markieren"
+  "markCriticalApplications": {
+    "message": "Kritische Anwendungen auswählen"
   },
   "markAppAsCritical": {
     "message": "Anwendung als kritisch markieren"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Gefährdete Mitglieder"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Mitglieder mit Zugriff auf gefährdete Einträge für kritische Anwendungen"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ gefährdete Mitglieder",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Gefährdete Mitglieder ($COUNT$)",
     "placeholders": {
@@ -177,10 +275,10 @@
     "message": "Anwendungen insgesamt"
   },
   "unmarkAsCritical": {
-    "message": "Unmark as critical"
+    "message": "Markierung als kritisch aufheben"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Markierung als kritische Anwendung erfolgreich aufgehoben"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Markierung der Anwendung als kritisch erfolgreich aufgehoben"
   },
   "whatTypeOfItem": {
     "message": "Um welche Art von Eintrag handelt es sich hierbei?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Eintrag anzeigen"
   },
-  "newItemHeader": {
-    "message": "Neue $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Neue Zugangsdaten",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ bearbeiten",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Neue Karte",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "$ITEMTYPE$ anzeigen",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Neue Identität",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Neue Notiz",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Neuer SSH-Schlüssel",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Neues Text-Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Neues Datei-Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Zugangsdaten bearbeiten",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Karte bearbeiten",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Identität bearbeiten",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Notiz bearbeiten",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "SSH-Schlüssel bearbeiten",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Text-Send bearbeiten",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Datei-Send bearbeiten",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Zugangsdaten anzeigen",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Karte anzeigen",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Identität anzeigen",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Notiz anzeigen",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "SSH-Schlüssel anzeigen",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Neu",
@@ -868,13 +1015,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"
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,14 +1690,11 @@
   "selectTwoStepLoginMethod": {
     "message": "Zwei-Faktor-Authentifizierungsmethode auswählen"
   },
-  "recoveryCodeDesc": {
-    "message": "Zugang zu allen Zwei-Faktor-Anbietern verloren? Benutze deinen Wiederherstellungscode, um alle Zwei-Faktor-Anbieter in deinem Konto zu deaktivieren."
-  },
   "recoveryCodeTitle": {
     "message": "Wiederherstellungscode"
   },
   "invalidRecoveryCode": {
-    "message": "Invalid recovery code"
+    "message": "Ungültiger Wiederherstellungscode"
   },
   "authenticatorAppTitle": {
     "message": "Authenticator App"
@@ -2063,10 +2240,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."
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Die Sprache des Web-Tresors ändern."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Website-Symbole anzeigen und URLs zum Ändern von Passwörtern abrufen"
   },
   "default": {
     "message": "Standard"
@@ -2830,10 +3004,10 @@
     }
   },
   "showPricingSummary": {
-    "message": "Show pricing summary"
+    "message": "Preisübersicht anzeigen"
   },
   "hidePricingSummary": {
-    "message": "Hide pricing summary"
+    "message": "Preisübersicht ausblenden"
   },
   "summary": {
     "message": "Zusammenfassung"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "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-Standard­einstellung"
+  },
+  "desktopAutotypePolicyDesc": {
+    "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": {
     "message": "Send entfernen"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO deaktiviert"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ muss sich mit Single Sign-On anmelden",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector aktiviert"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Zugriff verweigert. Du hast keine Berechtigung, diese Seite zu sehen."
   },
@@ -7041,10 +7256,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."
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Aus"
   },
+  "connected": {
+    "message": "Verbunden"
+  },
   "members": {
     "message": "Mitglieder"
   },
@@ -8287,12 +8508,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."
   },
@@ -8370,7 +8585,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",
@@ -8379,7 +8594,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",
@@ -8396,8 +8611,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",
@@ -8406,7 +8621,7 @@
     }
   },
   "nameUnavailableProjectDeleted": {
-    "message": "Deleted project Id: $PROJECT_ID$",
+    "message": "Projekt mit der ID $PROJECT_ID$ gelöscht",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8415,7 +8630,7 @@
     }
   },
   "nameUnavailableSecretDeleted": {
-    "message": "Deleted secret Id: $SECRET_ID$",
+    "message": "Geheimnis mit der ID $SECRET_ID$ gelöscht",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8423,8 +8638,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",
@@ -8432,8 +8656,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",
@@ -8442,7 +8736,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",
@@ -8939,23 +9233,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": {
@@ -9035,7 +9329,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",
@@ -9044,7 +9338,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",
@@ -9053,7 +9347,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",
@@ -9062,7 +9356,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",
@@ -9071,7 +9365,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",
@@ -9080,7 +9374,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",
@@ -9089,7 +9383,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",
@@ -9098,7 +9392,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",
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Zuweisen"
   },
+  "assignTasks": {
+    "message": "Aufgaben zuweisen"
+  },
   "assignToCollections": {
     "message": "Sammlungen zuweisen"
   },
@@ -9666,6 +9963,12 @@
   "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": "Löschen der Integration fehlgeschlagen. Bitte versuche es später erneut."
+  },
   "deviceIdMissing": {
     "message": "Geräte-ID fehlt"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "$INTEGRATION$ aktualisieren",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "$INTEGRATION$-Implementierungsanleitung starten.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer-Token"
   },
+  "repositoryNameHint": {
+    "message": "Name des Codespeichers, in den importiert werden soll"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Erfahre mehr über die API von Bitwarden"
   },
-  "fileSend": {
-    "message": "Datei-Send"
-  },
   "fileSends": {
     "message": "Datei-Sends"
   },
-  "textSend": {
-    "message": "Text-Send"
-  },
   "textSends": {
     "message": "Text-Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Gefährdetes Passwort ändern"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "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"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Entsperren mit PIN entfernen"
   },
@@ -10912,11 +11221,28 @@
     "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": "Archiv durchsuchen"
+  },
+  "archiveNoun": {
+    "message": "Archiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archivieren",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Keine Einträge im Archiv"
+  },
+  "archivedItemsDescription": {
+    "message": "Archivierte Einträge werden hier angezeigt und von allgemeinen Suchergebnissen sowie Auto-Ausfüllen-Vorschlägen ausgeschlossen."
+  },
   "businessUnit": {
     "message": "Geschäftsbereich"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden-Erweiterung installiert!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Die Bitwarden-Erweiterung öffnen"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "Die Bitwarden-Erweiterung ist installiert! Öffne die Erweiterung, um dich anzumelden und das automatische Ausfüllen zu starten."
+  },
   "openExtensionToAutofill": {
     "message": "Öffne die Erweiterung, um dich anzumelden und Auto-Ausfüllen zu nutzen."
   },
@@ -11071,6 +11403,12 @@
     "message": "Rechnungsadresse erforderlich, um Guthaben hinzuzufügen.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "Über diese Einstellung"
+  },
+  "permitCipherDetailsDescription": {
+    "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"
   },
@@ -11189,7 +11527,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": {
@@ -11233,7 +11571,147 @@
     }
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Key Connector-Domain bestätigen"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "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": "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": "Jetzt verifizieren."
+  },
+  "additionalStorageGB": {
+    "message": "Zusätzlicher Speicher GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Zusätzliche Gerätekonten"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets-Manager-Plätze"
+  },
+  "additionalStorage": {
+    "message": "Zusätzlicher Speicher"
+  },
+  "expandPurchaseDetails": {
+    "message": "Kaufdetails erweitern"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Kaufdetails einklappen"
+  },
+  "familiesMembership": {
+    "message": "Families-Mitgliedschaft"
+  },
+  "planDescPremium": {
+    "message": "Umfassende Online-Sicherheit"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium-Sicherheit für deine Familie"
+  },
+  "planDescFreeV2": {
+    "message": "Mit $COUNT$ anderen Benutzer teilen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Erweiterte Funktionen für jede Organisation"
+  },
+  "planNameCustom": {
+    "message": "Individueller Plan"
+  },
+  "planDescCustom": {
+    "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": "Integrierter Authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Datenpannen-Überwachung"
+  },
+  "andMoreFeatures": {
+    "message": "Und mehr!"
+  },
+  "secureFileStorage": {
+    "message": "Sicherer Dateispeicher"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unbegrenztes Teilen – wähle, wer was sieht"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unbegrenzte Familiensammlungen"
+  },
+  "familiesSharedStorage": {
+    "message": "Gemeinsamer Speicher für wichtige Familieninformationen"
+  },
+  "limitedUsersV2": {
+    "message": "Bis zu $COUNT$ Mitglieder",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Bis zu $COUNT$ Sammlungen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Immer kostenlos"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 Geheimnisse"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ Projekt(e)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Sicheres Teilen von Einträgen"
+  },
+  "scimSupport": {
+    "message": "SCIM-Unterstützung"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ Gerätekonten",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Sicherheitsrichtlinien für Unternehmen"
+  },
+  "selfHostOption": {
+    "message": "Selbsthosting-Option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Kostenloser Families-Plan für alle Benutzer"
+  },
+  "strengthenCybersecurity": {
+    "message": "Cybersicherheit stärken"
+  },
+  "boostProductivity": {
+    "message": "Produktivität steigern"
+  },
+  "seamlessIntegration": {
+    "message": "Nahtlose Integration"
   }
 }
-
diff --git a/apps/web/src/locales/el/messages.json b/apps/web/src/locales/el/messages.json
index d5c0c2b8fcb..436f2176efb 100644
--- a/apps/web/src/locales/el/messages.json
+++ b/apps/web/src/locales/el/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Όλες οι εφαρμογές"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Λογότυπο του Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Ειδοποιημένα μέλη ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Επισήμανση κρίσιμων εφαρμογών"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Τι είδους στοιχείο είναι αυτό;"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Προβολή Στοιχείου"
   },
-  "newItemHeader": {
-    "message": "Νέα $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Επεξεργασία $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Προβολή $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Νέο",
@@ -1395,6 +1542,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": "Μη έγκυρος κωδικός πρόσβασης αρχείου, χρησιμοποιήστε τον κωδικό πρόσβασης που καταχωρήσατε όταν δημιουργήσατε το αρχείο εξαγωγής."
   },
@@ -1404,6 +1560,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": "Δεν έχετε άδεια να δείτε όλα τα στοιχεία σε αυτήν τη συλλογή."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Έχετε χάσει την πρόσβαση σε όλους τους παρόχους δύο παραγόντων; Χρησιμοποιήστε τον κωδικό ανάκτησης για να απενεργοποιήσετε όλους τους παρόχους δύο παραγόντων από το λογαριασμό σας."
-  },
   "recoveryCodeTitle": {
     "message": "Κωδικός Ανάκτησης"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Αλλάξτε γλώσσα που χρησιμοποιείται από το web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Προεπιλογή"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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": "Η άδεια χρήσης έληξε."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Λόγω μιας Πολιτικής Επιχειρήσεων, δεν επιτρέπεται η αποθήκευση στοιχείων στο προσωπικό σας vault. Αλλάξτε την επιλογή Ιδιοκτησίας σε έναν οργανισμό και επιλέξτε από τις διαθέσιμες Συλλογές."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Απενεργοποίηση Αποστολής"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "Απενεργοποιημένο SSO"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Ενεργοποιημένος Σύνδεσμος Κλειδιών"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Ανενεργό"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Μέλη"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Ανάθεση"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Ανάθεση σε συλλογές"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Λίγες επαναλήψεις KDF. Αυξήστε τις επαναλήψεις σας για να βελτιώσετε την ασφάλεια του λογαριασμού σας."
-  },
-  "changeKDFSettings": {
-    "message": "Αλλαγή ρυθμίσεων KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Ασφαλίστε την υποδομή σας"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Μάθετε περισσότερα για το API του Bitwarden"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "Send αρχείων"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Send κειμένων"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Κατάργηση ξεκλειδώματος με PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 5223dff9b2d..5ed393c0295 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1511,9 +1691,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2115,11 +2292,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4706,6 +4880,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."
   },
@@ -4718,9 +4898,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."
   },
@@ -5094,9 +5271,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"
@@ -5491,6 +5672,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6655,6 +6843,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6893,6 +7090,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7047,6 +7262,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."
   },
@@ -7437,6 +7655,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8291,12 +8512,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."
   },
@@ -8400,8 +8615,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-  "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+  "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8426,6 +8641,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$",
@@ -8435,6 +8659,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$",
@@ -9272,6 +9566,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9670,6 +9967,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9694,6 +9997,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9757,6 +10069,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9896,12 +10211,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"
   },
@@ -10205,15 +10514,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10927,6 +11230,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11034,6 +11354,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11081,6 +11407,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11253,5 +11585,137 @@
   },
   "verifyNow": {
     "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
diff --git a/apps/web/src/locales/en_GB/messages.json b/apps/web/src/locales/en_GB/messages.json
index f9f9c84e783..e5e5d8f972c 100644
--- a/apps/web/src/locales/en_GB/messages.json
+++ b/apps/web/src/locales/en_GB/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritise security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "What type of item is this?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognisable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organisation and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned off"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organisations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organisation"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/en_IN/messages.json b/apps/web/src/locales/en_IN/messages.json
index c2e369c76e9..c00b02f1e6f 100644
--- a/apps/web/src/locales/en_IN/messages.json
+++ b/apps/web/src/locales/en_IN/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritise security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "What type of item is this?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to disable all two-factor providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognisable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise Policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organization and choose from available Collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Disable Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organisations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organisation"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/eo/messages.json b/apps/web/src/locales/eo/messages.json
index f7b5c8e3fa7..4634635f277 100644
--- a/apps/web/src/locales/eo/messages.json
+++ b/apps/web/src/locales/eo/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Ĉiuj aplikaĵoj"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Krei novan salutan eron"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Sciigitaj membroj ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Marki kritikajn apojn"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Kiuspeca estas ĉi tiu ero?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Vidi la eron"
   },
-  "newItemHeader": {
-    "message": "Nova $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Redakti $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Vidi $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nova",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Elekti dupaŝan salutan metodon"
   },
-  "recoveryCodeDesc": {
-    "message": "Ĉu vi perdis aliron al ĉiuj viaj du-faktoraj provizantoj? Uzu vian reakiran kodon por malŝalti ĉiujn du-faktorajn provizantojn de via konto."
-  },
   "recoveryCodeTitle": {
     "message": "Rekuperiga Kodo"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Ŝanĝi la lingvon uzatan por la retejo de la kaso."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Implicita"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Pro entreprena politiko, vi ne rajtas konservi artikolojn al via persona trezorejo. Ŝanĝu la opcion Proprieto al organizo kaj elektu el disponeblaj Kolektoj."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Neebligi la Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Aktiviĝis Key Connector"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Membroj"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/es/messages.json b/apps/web/src/locales/es/messages.json
index 7b371e5c796..85305249a91 100644
--- a/apps/web/src/locales/es/messages.json
+++ b/apps/web/src/locales/es/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Todas las aplicaciones"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Logo de Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Crear nuevo elemento de inicio de sesión"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Miembros notificados ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "¿Qué tipo de elemento es este?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Ver elemento"
   },
-  "newItemHeader": {
-    "message": "Nuevo $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Editar $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Ver $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nuevo",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Selecciona un método de inicio de sesión en dos pasos"
   },
-  "recoveryCodeDesc": {
-    "message": "¿Has perdido el acceso a todos tus métodos de autenticación en dos pasos? Utiliza tu código de recuperación para deshabilitar todos los métodos de autenticación en dos pasos de tu cuenta."
-  },
   "recoveryCodeTitle": {
     "message": "Código de recuperación"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Cambiar el idioma utilizado en la caja fuerte web."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Por defecto"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Debido a una política empresarial, usted está restringido a guardar artículos en su caja fuerte personal. Cambie la opción Propiedad a una organización y elija de entre las colecciones disponibles."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Desactivar envío"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO desactivado"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Conector de claves habilitado"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Acceso denegado. No tiene permiso para ver esta página."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Apagado"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Miembros"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Asignar"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Asignar a colecciones"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Falta el ID del dispositivo"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/et/messages.json b/apps/web/src/locales/et/messages.json
index 1e805e77b06..23c1a1312eb 100644
--- a/apps/web/src/locales/et/messages.json
+++ b/apps/web/src/locales/et/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Kõik rakendused"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwardeni logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Loo uus kirje"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Teavitatud liikmed ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Mis tüüpi kirje see on?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Kirje vaatamine"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Vaata $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Uus",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Vali kaheastmelise sisselogimise meetod"
   },
-  "recoveryCodeDesc": {
-    "message": "Sul ei ole ligipääsu ühelegi kaheastmelise kinnitamise teenusele? Kasuta taastamise koodi, et kaheastmeline kinnitamine oma kontol välja lülitada."
-  },
   "recoveryCodeTitle": {
     "message": "Taastamise kood"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Siin saab veebihoidla keelt muuta."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Vaikimisi"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Ettevõtte poliitika tõttu ei saa sa andmeid oma personaalsesse Hoidlasse salvestada. Vali Omanikuks organisatsioon ja vali mõni saadavaolevatest Kogumikest."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Keela Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO välja lülitatud"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Ligipääs keelatud. Sul pole lubatud seda lehekülge vaadata."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Väljas"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Liikmed"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/eu/messages.json b/apps/web/src/locales/eu/messages.json
index b0f96d9cbfe..8e86873841d 100644
--- a/apps/web/src/locales/eu/messages.json
+++ b/apps/web/src/locales/eu/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Zein elementu mota da hau?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Bistaratu elementua"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Bi urratseko egiaztatzeko modu guztietarako sarbidea galdu duzu? Erabili zure berreskuratze-kodea zure kontuko bi urratseko egiaztatze hornitzaile guztiak desaktibatzeko."
-  },
   "recoveryCodeTitle": {
     "message": "Berreskuratze-kodea"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Aldatu webguneko kutxa gotorrean erabiltzen den hizkuntza."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Lehenetsia"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Erakundeko politika bat dela eta, ezin dituzu elementuak zure kutxa gotor pertsonalean gorde. Aldatu jabe aukera erakunde aukera batera, eta aukeratu bilduma erabilgarrien artean."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Kendu Send-ak"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO desgaituta"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector gaituta"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Sarbidea ukatuta. Ez duzu baimenik orri hau ikusteko."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Kideak"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/fa/messages.json b/apps/web/src/locales/fa/messages.json
index ec3fab7000a..10b51babfc1 100644
--- a/apps/web/src/locales/fa/messages.json
+++ b/apps/web/src/locales/fa/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "همه‌ برنامه‌ها"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "لوگو Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "ایجاد مورد ورود جدید"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "اعضا مطلع شدند ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "با ذخیره‌ی اطلاعات ورود توسط کاربران، برنامه‌ها در اینجا نمایش داده می‌شوند و کلمات عبور در معرض خطر مشخص می‌گردند. برنامه‌های حیاتی را علامت‌گذاری کرده و کاربران را برای به‌روزرسانی کلمات عبور مطلع کنید."
   },
-  "noCriticalAppsTitle": {
-    "message": "شما هیچ برنامه‌ای را به عنوان حیاتی علامت‌گذاری نکرده‌اید"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "مهم‌ترین برنامه‌های خود را انتخاب کنید تا کلمات عبور در معرض خطر شناسایی شوند و کاربران برای تغییر آن‌ها مطلع شوند."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "برنامه‌های حیاتی را علامت‌گذاری کنید"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "برنامه را به عنوان حیاتی علامت‌گذاری کنید"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "اعضای در معرض خطر"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "اعضای در معرض خطر ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "برنامه حیاتی با موفقیت لغو علامت شد"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "این چه نوع موردی است؟"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "مشاهده مورد"
   },
-  "newItemHeader": {
-    "message": "$TYPE$ جدید",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "ویرایش $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "مشاهده $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "جدید",
@@ -1395,6 +1542,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": "کلمه عبور پرونده نامعتبر است، لطفاً از کلمه عبوری که هنگام ایجاد پرونده‌ی برون ریزی وارد کردید استفاده کنید."
   },
@@ -1404,6 +1560,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": "شما اجازه مشاهده همه موارد در این مجموعه را ندارید."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "انتخاب ورود دو مرحله‌ای"
   },
-  "recoveryCodeDesc": {
-    "message": "دسترسی به تمامی ارائه‌دهندگان دو مرحله‌ای را از دست داده‌اید؟ از کد بازیابی خود برای غیرفعال‌سازی ارائه‌دهندگان دو مرحله‌ای از حسابتان استفاده کنید."
-  },
   "recoveryCodeTitle": {
     "message": "کد بازیابی"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "زبان مورد استفاده در گاوصندوق وب را تغییر دهید."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "پیش‌فرض"
@@ -4702,6 +4876,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": "سازمان‌های تعلیق شده قابل دسترسی نیستند. لطفاً برای کمک با مالک سازمان خود تماس بگیرید."
   },
@@ -4714,9 +4894,6 @@
   "serviceAccountsCannotCreate": {
     "message": "حساب‌های خدماتی را نمی‌توان در سازمان‌های معلق ایجاد کرد. لطفاً برای کمک با مالک سازمان خود تماس بگیرید."
   },
-  "disabledOrganizationFilterError": {
-    "message": "موارد موجود در سازمان‌های غیرفعال، قابل دسترسی نیستند. برای دریافت کمک با مالک سازمان خود تماس بگیرید."
-  },
   "licenseIsExpired": {
     "message": "مجوز منقضی شده است."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "به دلیل سیاست پرمیوم، برای ذخیره موارد در گاوصندوق شخصی خود محدود شده اید. گزینه مالکیت را به یک سازمان تغییر دهید و مجموعه های موجود را انتخاب کنید."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "حذف ارسال"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO روشن شد"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "رابط کلید فعال شد"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "دسترسی رد شد. شما اجازه مشاهده این صفحه را ندارید."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "خاموش"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "اعضا"
   },
@@ -8287,12 +8508,6 @@
   "groupSlashUser": {
     "message": "گروه/کاربر"
   },
-  "lowKdfIterations": {
-    "message": "تکرار KDF کم"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "تنظیمات رمزگذاری خود را برای رعایت توصیه‌های امنیتی جدید و بهبود حفاظت از حساب به‌روزرسانی کنید."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "ادامه دادن باعث خروج شما از تمام نشست‌های فعال خواهد شد. برای ادامه باید دوباره وارد شوید و در صورت فعال بودن، ورود دو مرحله‌ای را کامل کنید. توصیه می‌کنیم قبل از تغییر تنظیمات رمزنگاری، از گاوصندوق خود خروجی بگیرید تا از دست رفتن داده‌ها جلوگیری شود."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "اختصاص بدهید"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "اختصاص به مجموعه‌ها"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "شناسه دستگاه موجود نیست"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "راهنمای پیاده‌سازی $INTEGRATION$ را اجرا کنید.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "تعداد تکرارهای KDF پایین است. برای افزایش امنیت حساب کاربری خود، تعداد تکرارها را افزایش دهید."
-  },
-  "changeKDFSettings": {
-    "message": "تغییر تنظیمات KDF"
-  },
   "secureYourInfrastructure": {
     "message": "زیرساخت خود را ایمن کنید"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "بیشتر درباره Bitwarden API بیاموزید"
   },
-  "fileSend": {
-    "message": "پرونده ارسال"
-  },
   "fileSends": {
     "message": "پرونده ارسال‌ها"
   },
-  "textSend": {
-    "message": "ارسال متن"
-  },
   "textSends": {
     "message": "ارسال‌های متن"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "تغییر کلمه عبور در معرض خطر"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "حذف گزینه‌ی بازکردن با کد پین"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "سازمان‌های رایگان می‌توانند حداکثر تا ۲ مجموعه داشته باشند. برای اضافه کردن مجموعه‌های بیشتر، به طرح پولی ارتقا دهید."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "واحد کسب و کار"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "افزونه Bitwarden نصب شد!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "افزونه را باز کنید تا وارد شوید و پر کردن خودکار را آغاز کنید."
   },
@@ -11071,6 +11403,12 @@
     "message": "نشانی صورتحساب برای افزودن اعتبار الزامی است.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/fi/messages.json b/apps/web/src/locales/fi/messages.json
index 0b733b8ae8a..54662ea2274 100644
--- a/apps/web/src/locales/fi/messages.json
+++ b/apps/web/src/locales/fi/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Kaikki sovellukset"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden-logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Luo uusi kirjautumiskohde"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Ilmoitetut jäsenet ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "Et ole merkinnyt yhtään sovellusta Kriittiseksi"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Merkitse kriittiset sovellukset"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Merkitse sovellus kriittiseksi"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Riskialttiit jäsenet"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Vaarantuneet jäsenet ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Minkä tyyppinen kohde tämä on?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Näytä kohde"
   },
-  "newItemHeader": {
-    "message": "Uusi $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Muokkaa: $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Näytä $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Uusi",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Valitse todennustapa"
   },
-  "recoveryCodeDesc": {
-    "message": "Etkö voi käyttää kaksivaiheisen kirjautumisen todentajiasi? Poista kaikki tilillesi määritetyt todentajat käytöstä palautuskoodillasi."
-  },
   "recoveryCodeTitle": {
     "message": "Palautuskoodi"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Vaihda verkkoholvissa käytettävä kieli."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Oletus"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Yrityskäytännön johdosta kohteiden tallennus yksityiseen holviin ei ole mahdollista. Muuta omistusasetus organisaatiolle ja valitse käytettävissä olevista kokoelmista."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Poista Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "Kertakirjautuminen poistettiin käytöstä"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector otettiin käyttöön"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Pääsy estetty. Sinulla ei ole oikeutta avata sivua."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Ei käytössä"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Jäsenet"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Määritä"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Määritä kokoelmiin"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Laitteen ID puuttuu"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Alhainen KDF-toistojen määrä. Paranna tilisi suojausta korottamalla määrää."
-  },
-  "changeKDFSettings": {
-    "message": "Muuta KDF-asetuksia"
-  },
   "secureYourInfrastructure": {
     "message": "Suojaa infrastruktuurisi"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Lisätietoja Bitwardenin API:sta"
   },
-  "fileSend": {
-    "message": "Tiedosto-Send"
-  },
   "fileSends": {
     "message": "Tiedosto-Sendit"
   },
-  "textSend": {
-    "message": "Teksti-Send"
-  },
   "textSends": {
     "message": "Teksti-Sendit"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Vaihda vaarantunut salasana"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/fil/messages.json b/apps/web/src/locales/fil/messages.json
index dfceb237057..96c97dcc6d5 100644
--- a/apps/web/src/locales/fil/messages.json
+++ b/apps/web/src/locales/fil/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Ano'ng uri ng item na ito?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Tingnan ang item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Bago",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Nawalan ng access sa lahat ng provider mo ng dalawang-hakbang na pag-log in? Gamitin ang code pang-recover mo para patayin ang lahat ng mga provider ng dalawang-hakbang na pag-log in sa account mo."
-  },
   "recoveryCodeTitle": {
     "message": "Code pang-recover"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Baguhin ang wikang ginagamit ng web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Dahil sa Enterprise Policy, ikaw ay hindi pinapayagan na mag-save ng mga item sa iyong personal vault. Baguhin ang Ownership option sa isang organisasyon at pumili mula sa mga available na collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Alisin ang Ipadala"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "Nakabukas ang SSO"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Pinagana ang Key Connector"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Hindi natanggap ang access. Wala kang pahintulot na tingnan ang pahinang ito."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Mga Miyembro"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/fr/messages.json b/apps/web/src/locales/fr/messages.json
index af8ebd886c3..62fdc6741b2 100644
--- a/apps/web/src/locales/fr/messages.json
+++ b/apps/web/src/locales/fr/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Toutes les applications"
   },
+  "activity": {
+    "message": "Activité"
+  },
   "appLogoLabel": {
     "message": "Logo Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Créer un nouvel élément de connexion"
   },
+  "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 avez évalué et marqué des applications comme critiques, elles s'afficheront ici."
+  },
+  "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$)",
     "placeholders": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ applications critiques",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications à risque",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ mots de passe à risque",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Membres notifiés ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
-    "message": "Vous n'avez marqué aucune application comme Critique"
+  "noCriticalApplicationsTitle": {
+    "message": "Vous n'avez marqué aucune application comme critique"
   },
-  "noCriticalAppsDescription": {
-    "message": "Sélectionnez vos applications les plus critiques pour découvrir les mots de passe à risque et avertissez les utilisateurs de modifier ces mots de passe."
+  "noCriticalApplicationsDescription": {
+    "message": "Sélectionnez vos applications les plus critiques afin de prioriser les actions de sécurité pour vos utilisateurs afin de traiter les mots de passe à risque."
   },
-  "markCriticalApps": {
-    "message": "Marquer les applications critiques"
+  "markCriticalApplications": {
+    "message": "Sélectionner les applications critiques"
   },
   "markAppAsCritical": {
     "message": "Marquer l'application comme critique"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Membres à risque"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Les membres ayant accès aux éléments à risque pour les applications critiques"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ membres à risque",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Membres à risque ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Retirer la cote critique"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Marquage d'application critique retiré avec succès"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Retrait de la marque critique pour l'application réussi"
   },
   "whatTypeOfItem": {
     "message": "Quel type d'élément est-ce ?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Afficher l'élément"
   },
-  "newItemHeader": {
-    "message": "Nouveau $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nouvel Identifiant",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Modifier $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nouvelle Carte de paiement",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Voir $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nouvelle Identité",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nouvelle Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nouvelle clé SSH",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Nouveau Send de texte",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Nouveau Send de fichier",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Modifier l'Identifiant",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Modifier la Carte de paiement",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Modifier l'Identité",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Modifier la Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Modifier la clé SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Modifier le Send de texte",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Modifier le Send de fichier",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Afficher l'Identifiant",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Afficher la Carte de paiement",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Afficher l'Identité",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Afficher la Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Afficher la clé SSH",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nouveau",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Sélectionnez la méthode d'authentification à deux facteurs"
   },
-  "recoveryCodeDesc": {
-    "message": "Vous avez perdu l'accès à tous vos fournisseurs d'authentification à deux facteurs ? Utilisez votre code de récupération pour désactiver tous les fournisseurs d'authentification à deux facteurs de votre compte."
-  },
   "recoveryCodeTitle": {
     "message": "Code de récupération"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Changez la langue utilisée par le coffre web."
   },
-  "enableFavicon": {
-    "message": "Afficher les icônes des sites web"
-  },
-  "faviconDesc": {
-    "message": "Affiche une image reconnaissable à côté de chaque identifiant."
+  "showIconsChangePasswordUrls": {
+    "message": "Affiche les icônes du site web et récupère les URL de changement de mot de passe"
   },
   "default": {
     "message": "Par défaut"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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é."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "En raison d'une politique de sécurité Entreprise, il vous est interdit d'enregistrer des éléments dans votre coffre personnel. Sélectionnez une organisation dans l'option Propriété et choisissez parmi les collections disponibles."
   },
+  "desktopAutotypePolicy": {
+    "message": "Réglage par Défaut de la Saisie Auto pour le Bureau"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Activer la Saisie Auto pour le Bureau par défaut pour les membres. Les membres peuvent désactiver la Saisie Automatique manuellement dans l'application du Bureau.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Supprimer le Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO désactivé"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ doit se connecter avec une Authentification Unique (SSO)",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activé"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Accès Refusé. Vous n'avez pas l'autorisation d'afficher cette page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Désactivée"
   },
+  "connected": {
+    "message": "Connecté"
+  },
   "members": {
     "message": "Membres"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,7 +8611,7 @@
       }
     }
   },
-  "accessedProjectWithId": {
+  "accessedProjectWithIdentifier": {
     "message": "A accédé à un projet avec l'identifiant : $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assigner"
   },
+  "assignTasks": {
+    "message": "Assigner des tâches"
+  },
   "assignToCollections": {
     "message": "Assigner aux collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "L'identification de l'appareil est manquante"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Mettre à jour $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Lancez le guide d'implémentation $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Jeton du porteur"
   },
+  "repositoryNameHint": {
+    "message": "Nom du dépôt à ingérer dans"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "En savoir plus sur l'API de Bitwarden"
   },
-  "fileSend": {
-    "message": "Send d'un fichier"
-  },
   "fileSends": {
     "message": "Déposer des Sends"
   },
-  "textSend": {
-    "message": "Send d'un texte"
-  },
   "textSends": {
     "message": "Texter des Sends"
   },
@@ -10382,7 +10685,7 @@
     "message": "Gestionnaire de Mots de Passe Bitwarden"
   },
   "secretsManagerComplimentaryPasswordManager": {
-    "message": "Votre abonnement complémentairegratuit d'un an au Gestionnaire de Mots de Passe sera mis à niveau au plan sélectionné. Vous ne serez pas chargé avant la fin de votre période gratuite."
+    "message": "Votre abonnement offert gratuit d'un an au Gestionnaire de Mots de Passe sera mis à niveau au plan sélectionné. Vous ne serez pas chargé avant la fin de votre période gratuite."
   },
   "fileSavedToDevice": {
     "message": "Fichier enregistré sur l'appareil. Gérez à partir des téléchargements de votre appareil."
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Changer le mot de passe à risque"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "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": "Site Web manquant"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Supprimer Déverrouiller avec un NIP"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Les organisations gratuites peuvent avoir jusqu'à 2 collections. Passez à une offre payante pour ajouter plus de collections."
   },
+  "searchArchive": {
+    "message": "Rechercher dans l'archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Aucun élément dans l'archive"
+  },
+  "archivedItemsDescription": {
+    "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."
+  },
   "businessUnit": {
     "message": "Unité d'affaires"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "L'extension Bitwarden est installée !"
   },
+  "openTheBitwardenExtension": {
+    "message": "Ouvrir l'extension Bitwarden"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "L'extension Bitwarden est installée! Ouvrez l'extension pour vous connecter et démarrer le remplissage automatique."
+  },
   "openExtensionToAutofill": {
     "message": "Ouvrez l'extension pour vous connecter et démarrer le remplissage automatique."
   },
@@ -11071,6 +11403,12 @@
     "message": "L'adresse de facturation est requise pour ajouter du crédit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "À propos de ce paramètre"
+  },
+  "permitCipherDetailsDescription": {
+    "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."
+  },
   "billingAddress": {
     "message": "Adresse de facturation"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirmez le domaine de Key Connector"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Le paiement avec un compte bancaire est seulement disponible pour les clients aux États-Unis. Vous devrez procéder à la vérification de votre compte bancaire. Nous effectuerons un micro-dépôt dans 2 prochains jours ouvrables. Si vous ne complétez pas la vérification de votre compte bancaire résultera en un paiement manqué et votre abonnement sera suspendu."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Nous avons effectué un micro-dépôt dans votre compte bancaire. Cela peut prendre jusqu'à 2 jours ouvrables. Quand vous verrez le dépôt dans votre compte, vous pourrez faire la vérification de votre compte bancaire. Si vous ne complétez pas la vérification de votre compte bancaire, cela résultera en un paiement manqué et votre abonnement sera suspendu."
+  },
+  "verifyNow": {
+    "message": "Vérifier maintenant."
+  },
+  "additionalStorageGB": {
+    "message": "Stockage additionnel (Go)"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Comptes de machine supplémentaires"
+  },
+  "secretsManagerSeats": {
+    "message": "Places du Secrets Manager"
+  },
+  "additionalStorage": {
+    "message": "Stockage supplémentaire"
+  },
+  "expandPurchaseDetails": {
+    "message": "Développer les détails de l'achat"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Réduire les détails de l'achat"
+  },
+  "familiesMembership": {
+    "message": "Abonnement à Familles"
+  },
+  "planDescPremium": {
+    "message": "Sécurité en ligne complète"
+  },
+  "planDescFamiliesV2": {
+    "message": "Sécurité Premium pour votre famille"
+  },
+  "planDescFreeV2": {
+    "message": "Partager avec $COUNT$ autres utilisateurs",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Fonctionnalités avancées pour toute organisation"
+  },
+  "planNameCustom": {
+    "message": "Forfait personnalisé"
+  },
+  "planDescCustom": {
+    "message": "Bitwarden évolue avec des entreprises de toutes tailles pour sécuriser les mots de passe et les informations sensibles. Si vous faites partie d'une grande entreprise, contactez les ventes pour demander une soumission."
+  },
+  "builtInAuthenticator": {
+    "message": "Authentificateur intégré"
+  },
+  "breachMonitoring": {
+    "message": "Surveillance des fuites"
+  },
+  "andMoreFeatures": {
+    "message": "Et encore plus !"
+  },
+  "secureFileStorage": {
+    "message": "Stockage sécurisé de fichier"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Partage illimité - choisissez qui voit quoi"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Collections familiales illimitées"
+  },
+  "familiesSharedStorage": {
+    "message": "Stockage partagé pour les informations importantes de la famille"
+  },
+  "limitedUsersV2": {
+    "message": "Jusqu'à $COUNT$ membres",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Jusqu'à $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Toujours gratuit"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ projet(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Partage sécurisé d’éléments"
+  },
+  "scimSupport": {
+    "message": "Support SCIM"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ comptes machine",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Politiques de sécurité de l'entreprise"
+  },
+  "selfHostOption": {
+    "message": "Option d'auto-hébergement"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Plan pour familles offert gratuitement pour tous les utilisateurs"
+  },
+  "strengthenCybersecurity": {
+    "message": "Renforcer la cybersécurité"
+  },
+  "boostProductivity": {
+    "message": "Améliore la productivité"
+  },
+  "seamlessIntegration": {
+    "message": "Intégrations transparentes"
   }
 }
-
diff --git a/apps/web/src/locales/gl/messages.json b/apps/web/src/locales/gl/messages.json
index 77f276627a1..c4c35278f4b 100644
--- a/apps/web/src/locales/gl/messages.json
+++ b/apps/web/src/locales/gl/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Que tipo de elemento é este?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Ver elemento"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Novo",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/he/messages.json b/apps/web/src/locales/he/messages.json
index 6734a11cfba..915145eebc5 100644
--- a/apps/web/src/locales/he/messages.json
+++ b/apps/web/src/locales/he/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "כל היישומים"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "הלוגו של Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "צור פריט כניסה חדש"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "חברים שהודיעו להם ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "ככל שמשתמשים שומרים כניסות, יישומים מופיעים כאן, ומוצגות כל הסיסמאות בסיכון. סמן יישומים קריטיים והודע למשתמשים לעדכן סיסמאות."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "לא סימנת אף יישום כקריטי"
   },
-  "noCriticalAppsDescription": {
-    "message": "בחר את היישומים הכי קריטיים שלך כדי לגלות סיסמאות בסיכון, ולהודיע למשתמשים לשנות את הסיסמאות הללו."
+  "noCriticalApplicationsDescription": {
+    "message": "בחר את האפליקציות הקריטיות ביותר שלך כדי לתעדף פעולות אבטחה עבור המשתמשים שלך כדי לטפל בסיסמאות בסיכון."
   },
-  "markCriticalApps": {
-    "message": "סמן יישומים קריטיים"
+  "markCriticalApplications": {
+    "message": "בחר יישומים קריטיים"
   },
   "markAppAsCritical": {
     "message": "סמן יישום כקריטי"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "חברים בסיכון"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "חברים בסיכון ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "בטל סימון כקריטי"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "בוטל סימון יישום קריטי בהצלחה"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "ביטול הסימון של האפליקציה כקריטית בוצע בהצלחה"
   },
   "whatTypeOfItem": {
     "message": "מאיזה סוג פריט זה?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "הצג פריט"
   },
-  "newItemHeader": {
-    "message": "$TYPE$ חדש",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "ערוך $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "הצג $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "חדש",
@@ -1395,6 +1542,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": "סיסמת קובץ שגויה, נא להשתמש בסיסמה שהזנת כשיצרת את קובץ הייצוא."
   },
@@ -1404,6 +1560,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": "אין לך הרשאה להציג את כל הפריטים באוסף זה."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "בחר שיטת כניסה דו־שלבית"
   },
-  "recoveryCodeDesc": {
-    "message": "איבדת גישה לכל ספקי הכניסות הדו־שלביות שלך? השתמש בקוד השחזור שלך כדי לכבות את כל ספקי הכניסות הדו־שלביות מהחשבון שלך."
-  },
   "recoveryCodeTitle": {
     "message": "קוד שחזור"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "שנה את השפה של כספת הרשת."
   },
-  "enableFavicon": {
-    "message": "הצג סמלי אתר אינטרנט"
-  },
-  "faviconDesc": {
-    "message": "הצג תמונה מוכרת ליד כל כניסה."
+  "showIconsChangePasswordUrls": {
+    "message": "הצג סמלי אתרי אינטרנט ואחזר כתובות URL לשינוי סיסמה"
   },
   "default": {
     "message": "ברירת מחדל"
@@ -4702,6 +4876,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": "לא ניתן לגשת אל ארגונים מושעים. נא לפנות לבעל הארגון שלך עבור סיוע."
   },
@@ -4714,9 +4894,6 @@
   "serviceAccountsCannotCreate": {
     "message": "לא ניתן ליצור חשבונות שירות בארגונים מושעים. נא לפנות אל בעל הארגון שלך עבור סיוע."
   },
-  "disabledOrganizationFilterError": {
-    "message": "לא ניתן לגשת לפריטים בארגון מושעה. פנה אל בעל הארגון שלך עבור סיוע."
-  },
   "licenseIsExpired": {
     "message": "תוקף הרשיון הסתיים."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "בשל מדיניות ארגונית, אתה מוגבל מלשמור פריטים לכספת האישית שלך. שנה את אפשרות הבעלות לארגון ובחר מאוספים זמינים."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "הסר סֵנְד"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO כבוי"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector הופעל"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "גישה נדחתה. אין לך הרשאות כדי לצפות בעמוד זה."
   },
@@ -7043,6 +7258,9 @@
   "unknownSecret": {
     "message": "סוד לא ידוע, ייתכן שאתה צריך לבקש הרשאה כדי לגשת אל סוד זה."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "פרויקט לא ידוע, ייתכן שאתה צריך לבקש הרשאה כדי לגשת אל פרויקט זה."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "כבוי"
   },
+  "connected": {
+    "message": "מחובר"
+  },
   "members": {
     "message": "חברים"
   },
@@ -8287,12 +8508,6 @@
   "groupSlashUser": {
     "message": "קבוצה/משתמש"
   },
-  "lowKdfIterations": {
-    "message": "חזרות KDF נמוכות"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "שדרג את הגדרות ההצפנה שלך כדי לעמוד בהמלצות אבטחה חדשות ולשפר את הגנת החשבון."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "המשך התהליך יוציא אותך מכל ההפעלות הפעילות שלך. תידרש להיכנס חזרה כדי להמשיך כניסה דו-שלבית, אם ישנה. אנו ממליצים על ייצוא הכספת שלך לפני שינוי הגדרות ההצפנה שלך כדי למנוע איבוד נתונים."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "ניגש אל פרויקט עם מזהה: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "ערך פרויקט עם מזהה: $PROJECT_ID$",
     "placeholders": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "הקצה"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "הקצה לאוספים"
   },
@@ -9666,6 +9963,12 @@
   "failedToSaveIntegration": {
     "message": "שמירת האינטגרציה נכשלה. נא לנסות שוב מאוחר יותר."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
+  "failedToDeleteIntegration": {
+    "message": "Failed to delete integration. Please try again later."
+  },
   "deviceIdMissing": {
     "message": "מזהה המכשיר חסר"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "עדכן $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "פתח מדריך יישום $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "אסימון נושא"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "אינדקס"
   },
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "חזרות KDF נמוכות. הגדל את מספר החזרות שלך כדי לשפר את האבטחה של חשבונך."
-  },
-  "changeKDFSettings": {
-    "message": "שנה הגדרות KDF"
-  },
   "secureYourInfrastructure": {
     "message": "אבטח את התשתית שלך"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "למד עוד על ה־API של Bitwarden"
   },
-  "fileSend": {
-    "message": "סֵנְד של קובץ"
-  },
   "fileSends": {
     "message": "סֵנְדים של קובץ"
   },
-  "textSend": {
-    "message": "סֵנְד של טקסט"
-  },
   "textSends": {
     "message": "סֵנְדים של טקסט"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "שנה סיסמה בסיכון"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "כניסה זו נמצאת בסיכון וחסר בה אתר אינטרנט. הוסף אתר אינטרנט ושנה את הסיסמה לאבטחה חזקה יותר."
+  },
+  "missingWebsite": {
+    "message": "לא נמצא אתר אינטרנט"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "הסר ביטול נעילה עם PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "לארגונים חינמיים יכולים להיות עד 2 אוספים. שדרג לתוכנית בתשלום כדי להוסיף עוד אוספים."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "יחידת עסקים"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "הרחבת Bitwarden הותקנה!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "פתח את ההרחבה כדי להיכנס ולהתחיל למלא אוטומטית."
   },
@@ -11071,6 +11403,12 @@
     "message": "נדרשת כתובת לחיוב כדי להוסיף אשראי.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "אודות הגדרה זו"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden ישתמש בכתובות URI של כניסות שמורות כדי לזהות באיזה סמל או URL לשינוי סיסמה יש להשתמש על מנת לשפר את החוויה שלך. לא נאסף או נשמר מידע כלשהו כאשר אתה משתמש בשירות זה."
+  },
   "billingAddress": {
     "message": "כתובת לחיוב"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "אשר דומיין של Key Connector"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "תשלום באמצעות חשבון בנק זמין רק ללקוחות בארצות הברית. אתה תידרש לאמת את חשבון הבנק שלך. אנחנו נבצע מיקרו־הפקדה בתוך 1-2 ימי עסקים. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "ביצענו מיקרו־הפקדה לחשבון הבנק שלך. זה עשוי לקחת 1-2 ימי עסקים. כאשר תראה את ההפקדה בחשבונך, תוכל לאמת את חשבון הבנק שלך. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
+  },
+  "verifyNow": {
+    "message": "אמת כעת."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/hi/messages.json b/apps/web/src/locales/hi/messages.json
index 9d8ee630f08..f7d116162ff 100644
--- a/apps/web/src/locales/hi/messages.json
+++ b/apps/web/src/locales/hi/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "यह किस प्रकार का आइटम है?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/hr/messages.json b/apps/web/src/locales/hr/messages.json
index 1b3ca815011..8f49041638a 100644
--- a/apps/web/src/locales/hr/messages.json
+++ b/apps/web/src/locales/hr/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Sve aplikacije"
   },
+  "activity": {
+    "message": "Aktivnost"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Stvori novu stavku prijave"
   },
+  "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, they will display here."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Once you mark applications critical, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "Kritičnih aplikacija: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ aplikacija/e ugroženo",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Obaviješteni članovi ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "Niti jedna aplikacija nije označena kao kritična"
   },
-  "noCriticalAppsDescription": {
-    "message": "Odaberi svoje najkritičnije aplikacije za otkrivanje rizičnih lozinki i obavijesti korisnike da promijene te lozinke."
+  "noCriticalApplicationsDescription": {
+    "message": "Odaberite svoje kritične aplikacije kako bi se odredio prioritet sigurnosnih radnji za tvoje korisnike i riješili problemi s lozinkama koje su u riziku."
   },
-  "markCriticalApps": {
-    "message": "Označi kritične aplikacije"
+  "markCriticalApplications": {
+    "message": "Odaberi kritične aplikacije"
   },
   "markAppAsCritical": {
     "message": "Označi aplikacije kao kritične"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Rizični korisnici"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "Rizičnih članova: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Izloženi članovi ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Odznači kao kritično"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Kritična aplikacija uspješno odznačena"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Aplikacije uspješno odznačene kao kritične"
   },
   "whatTypeOfItem": {
     "message": "Koja je ovo vrsta stavke?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Prikaz stavke"
   },
-  "newItemHeader": {
-    "message": "Novi $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nova prijava",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Uredi $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nova kartica",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Pogledaj $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Novi identitet",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nova bilješka",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Novi SSH ključ",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Novi teksutalni Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Novi datotečni Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Uredi prijavu",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Uredi karticu",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Uredi identitet",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Uređivanje bilješke",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Uredi SSH ključ",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Uredi tekstualni Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Uredi datotečni Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Prikaži prijavu",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Prikaži karticu",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Prikaži identitet",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Prikaži bilješku",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Prikaži SSH ključ",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Novo",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Odaberi način prijave dvostrukom autentifikacijom"
   },
-  "recoveryCodeDesc": {
-    "message": "Izgubljen je pristup uređaju za prijavu dvostrukom autentifikacijom? Koristi svoj kôd za oporavak za onemogućavanje svih pružatelja usluga prijave dvostrukom autentifikacijom na svom računu."
-  },
   "recoveryCodeTitle": {
     "message": "Kôd za oporavak"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Promijeni jezik web trezora."
   },
-  "enableFavicon": {
-    "message": "Prikaži ikone mrežnih mjesta"
-  },
-  "faviconDesc": {
-    "message": "Prikaži prepoznatljivu sliku pored svake prijave."
+  "showIconsChangePasswordUrls": {
+    "message": "Prikaži ikone web mjesta i dohvati URL-ove za promjenu lozinki"
   },
   "default": {
     "message": "Zadano"
@@ -4702,6 +4876,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ć."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Pravila tvrtke onemogućuju spremanje stavki u osobni trezor. Promijeni vlasništvo stavke na tvrtku i odaberi dostupnu Zbirku."
   },
+  "desktopAutotypePolicy": {
+    "message": "Zadana postavka automatskog tipkanja na radnoj površini"
+  },
+  "desktopAutotypePolicyDesc": {
+    "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": {
     "message": "Onemogući Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO onemogućen"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ se mora prijavljivati sa SSO",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Konektor za ključ omogućen"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Pristup odbijen. Nemaš prava vijdeti ovu stranicu."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Isključeno"
   },
+  "connected": {
+    "message": "Spojeno"
+  },
   "members": {
     "message": "Članovi"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,7 +8611,7 @@
       }
     }
   },
-  "accessedProjectWithId": {
+  "accessedProjectWithIdentifier": {
     "message": "Pristupljeno projektu s identifikatorom: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Dodijeli"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Dodijeli zbirkama"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Nedostaje ID uređaja"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Ažuriraj $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Pokreni vodič za implementaciju $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Token nositelja"
   },
+  "repositoryNameHint": {
+    "message": "Naziv repozitorija u koji se unosi"
+  },
   "index": {
     "message": "Indeks"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Saznaj više o Bitwarden API"
   },
-  "fileSend": {
-    "message": "Send datoteke"
-  },
   "fileSends": {
     "message": "Send datoteke"
   },
-  "textSend": {
-    "message": "Send teksta"
-  },
   "textSends": {
     "message": "Send tekstovi"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Promijeni rizičnu lozinku"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Ova prijava je ugrožena i nedostaje joj web-stranica. Dodaj web-stranicu i promijeni lozinku za veću sigurnost."
+  },
+  "missingWebsite": {
+    "message": "Nedostaje web-stranica"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Ukloni otključavanje PIN-om"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Besplatne organizacije mogu imati do 2 zbirke. Nadogradi na plaćeni plan za dodavanje više zbirki."
   },
+  "searchArchive": {
+    "message": "Pretraži arhivu"
+  },
+  "archiveNoun": {
+    "message": "Arhiva",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arhiviraj",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Nema stavki u arhivi"
+  },
+  "archivedItemsDescription": {
+    "message": "Arhivirane stavke biti će prikazane ovdje i biti će izuzete iz rezultata općih pretraga i preporuka auto-ispune."
+  },
   "businessUnit": {
     "message": "Poslovna jedinica"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden proširenje je instalirano!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Otvori Bitwarden proširenje"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "Instalirano je Bitwarden proširenje! Otvori ga za prijavu i početak auto-ispune."
+  },
   "openExtensionToAutofill": {
     "message": "Otvori proširenje i prijavi se za početak korištenja auto-ispune."
   },
@@ -11071,6 +11403,12 @@
     "message": "Za dodavanje kredita potrebna je adresa za naplatu.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "O ovoj postavci"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden će koristiti spremljene URI-je za prijavu kako bi identificirao ikonu ili URL za promjenu lozinke koji treba koristiti za poboljšanje tvojeg iskustva. Nikakvi podaci se ne prikupljaju, niti spremaju kada koristiš ovu uslugu."
+  },
   "billingAddress": {
     "message": "Adresa za naplatu"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Potvrdi domenu kontektora ključa"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Plaćanje putem bankovnog računa dostupno je samo kupcima u SAD-u. Bit će potrebno potvrditi bankovni račun. Izvršit ćemo mikrodepozit u roku od sljedećih 1 - 2 radna dana. Ako ne potvrdiš bankovni račun, to će rezultirati propuštenom uplatom i obustavom tvoje pretplate."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Izvršili smo mikrodepozit na tvoj bankovni račun. To može potrajati 1 - 2 radna dana. Kada vidiš uplatu na svom računu, možeš ga potvrditi. Ako ne potvrdiš svoj bankovni račun, propuštena uplata će biti izvršena, a tvoja pretplata će biti obustavljena."
+  },
+  "verifyNow": {
+    "message": "Potvrdi sada."
+  },
+  "additionalStorageGB": {
+    "message": "Dodati GB pohrane"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Dodatni mašinski računi"
+  },
+  "secretsManagerSeats": {
+    "message": "Secret Manager licence"
+  },
+  "additionalStorage": {
+    "message": "Dodatna pohrana"
+  },
+  "expandPurchaseDetails": {
+    "message": "Proširi detalje kupnje"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Skupi detalje kupnje"
+  },
+  "familiesMembership": {
+    "message": "Obiteljsko članstvo"
+  },
+  "planDescPremium": {
+    "message": "Dovrši online sigurnost"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium sigurnost za tvoju obitelj"
+  },
+  "planDescFreeV2": {
+    "message": "Podijeli s ovoliko korisnika: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Napredne mogućnosti za bilo koju organizaciju"
+  },
+  "planNameCustom": {
+    "message": "Vlastiti plan"
+  },
+  "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."
+  },
+  "builtInAuthenticator": {
+    "message": "Ugrađeni autentifikator"
+  },
+  "breachMonitoring": {
+    "message": "Nadzor proboja"
+  },
+  "andMoreFeatures": {
+    "message": "I više!"
+  },
+  "secureFileStorage": {
+    "message": "Sigurna pohrana datoteka"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Neograničeno dijeljenje - odaberi tko vidi što"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Neograničene obiteljske zbirke"
+  },
+  "familiesSharedStorage": {
+    "message": "Dijeljena pohrana za važbe obiteljske informacije"
+  },
+  "limitedUsersV2": {
+    "message": "Najveći broj članova: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Najveći broj zbirki: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Zauvijek besplatno"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 tajne"
+  },
+  "projectsIncludedV2": {
+    "message": "Broj projekata: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Sigurno dijeljenje stavki"
+  },
+  "scimSupport": {
+    "message": "SCIM podrška"
+  },
+  "includedMachineAccountsV2": {
+    "message": "Mašinskih računa: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Sigurnosne politike tvrtke"
+  },
+  "selfHostOption": {
+    "message": "Mogućnost samostalnog hostinga"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Besplatni obiteljski plan za sve korisnike"
+  },
+  "strengthenCybersecurity": {
+    "message": "Jačanje kibernetičke sigurnosti"
+  },
+  "boostProductivity": {
+    "message": "Povećanje produktivnosti"
+  },
+  "seamlessIntegration": {
+    "message": "Jednostavna integracija"
   }
 }
-
diff --git a/apps/web/src/locales/hu/messages.json b/apps/web/src/locales/hu/messages.json
index 4b654fe7ee8..cfc6e9e0735 100644
--- a/apps/web/src/locales/hu/messages.json
+++ b/apps/web/src/locales/hu/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Összes alkalmazás"
   },
+  "activity": {
+    "message": "Tevékenység"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logó"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Új bejelentkezési elem létrehozása"
   },
+  "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 kritikusnak jelölése után ezek itt jelennek meg."
+  },
+  "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$)",
     "placeholders": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ kritikus alkalmazás",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "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"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Értesített tagok ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
-    "message": "Egyetlen alkalmazás sem lett megjelölve kritikusként."
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Válasszuk ki a legkritikusabb alkalmazásokat a veszélyeztetett jelszavak felfedezéséhez és értesítsük a felhasználókat a jelszavak megváltoztatásáról."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Kritikus alkalmazások megjelölése"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Alkalmazások megjelölése kritikusként"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Veszélyes tagok"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ kockázatos tag",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Veszélyes tagok ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Ktritkus jelölés eltávolítása"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "A ktritkus alkalmazás jelölés eltávolítása sikeres volt."
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Az alkamzás lritikusnak jelölés visszavonása sikeres volt."
   },
   "whatTypeOfItem": {
     "message": "Milyen típusú elem ez?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Elem megtekintése"
   },
-  "newItemHeader": {
-    "message": "Új $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Új bejelentkezés",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ szerkesztése",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Új kártya",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "$ITEMTYPE$ megtekintése",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Új személyazonosság",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Új jegyzet",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Új SSH kulcs",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Új szöveges Send elem",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Új fájl Send elem",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Bejelentkezés szerkesztése",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Kártya szerkesztése",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Személyazonossság szerkesztése",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Jegyzet szerkesztése",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "SSH kulcs szerkesztése",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Send szöveg szerkesztése",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Send fájl szerkesztése",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Bejelentkezés megtekintése",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Kártya megtekintése",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Személyazonosság megtekintése",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Jegyzet megtekintése",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "SSH kulcs megtekintése",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Új",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Kétlépcsős bejelentkezési mód használata"
   },
-  "recoveryCodeDesc": {
-    "message": "Elveszett a hozzáférés az összes kétlépcsős szolgáltatóhoz? A visszaállítókód használatával letilthatók fiókból a kétlépcsős szolgáltatók."
-  },
   "recoveryCodeTitle": {
     "message": "Helyreállító kód"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "A webes széf nyelvének megváltoztatása."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Webhely ikonok megjelenítése és jelszó webcímek módosításának lekérése"
   },
   "default": {
     "message": "Alapértelmezett"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Egy vállalati házirend miatt korlátozásra került az elemek személyes tárolóba történő mentése. Módosítsuk a Tulajdon opciót egy szervezetre és válasszunk az elérhető gyűjtemények közül."
   },
+  "desktopAutotypePolicy": {
+    "message": "Asztali automatikus típus aapértelmezett beállítás"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Az asztali atumatikus típus alapértelmezés szerint bekapcsolásra kerül a tagok számára. A tagok manuálisan kikapcsolhatják az automatikus típus funkciót az Asztal kliensben.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Send letiltása"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "Az SSO bekapcsolásra került."
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ segítségével be kell jelentkezni egyszeri bejelentkezéssel.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Bekapcsolt kulcskapcsoló"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "A hozzáférés megtagadásra került. Nincs jogosultság az oldal megtekintésére."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Ki"
   },
+  "connected": {
+    "message": "Csatlakozva"
+  },
   "members": {
     "message": "Tagok"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,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",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9035,7 +9329,7 @@
     }
   },
   "limitCollectionCreationEnabled": {
-    "message": "Turned on Restrict collection creation setting $ID$.",
+    "message": "A Gyűjtemény létrehozás korlátozás beállítás bekapcsolásra került: $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9044,7 +9338,7 @@
     }
   },
   "limitCollectionCreationDisabled": {
-    "message": "Turned off Restrict collection creation setting $ID$.",
+    "message": "A Gyűjtemény létrehozás korlátozás beállítás kikapcsolásra került: $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9053,7 +9347,7 @@
     }
   },
   "limitCollectionDeletionEnabled": {
-    "message": "Turned on Restrict collection deletion setting $ID$.",
+    "message": "A Gyűjtemény létrehozás törlés beállítás bekapcsolásra került: $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9062,7 +9356,7 @@
     }
   },
   "limitCollectionDeletionDisabled": {
-    "message": "Turned off Restrict collection deletion setting $ID$.",
+    "message": "A Gyűjtemény létrehozás törlés beállítás kikapcsolásra került: $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9071,7 +9365,7 @@
     }
   },
   "limitItemDeletionEnabled": {
-    "message": "Turned on Restrict item deletion setting $ID$.",
+    "message": "Az Elem törlés korlátozás beállítás bekapcsolásra került: $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9080,7 +9374,7 @@
     }
   },
   "limitItemDeletionDisabled": {
-    "message": "Turned off Restrict item deletion setting $ID$.",
+    "message": "Az Elem törlés korlátozás beállítás kikapcsolásra került: $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9089,7 +9383,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsEnabled": {
-    "message": "Turned on Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "A tulajdonosok és adminisztrátorok engedélyezés az összes gyűjtemény és elem kezeléséhez beállítás bekapcsolásra került: $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9098,7 +9392,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsDisabled": {
-    "message": "Turned off Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "A tulajdonosok és adminisztrátorok engedélyezés az összes gyűjtemény és elem kezeléséhez beállítás kikapcsolásra került: $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Hozzárendelés"
   },
+  "assignTasks": {
+    "message": "Feladatok hozzárendelése"
+  },
   "assignToCollections": {
     "message": "Hozzárendelés gyűjteményekhez"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Az eszköz AZ hiányzik."
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "$INTEGRATION$ frissítése",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "$INTEGRATION$ megvalósítási útmutató elindítása.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Tulajdonosi vezérjel"
   },
+  "repositoryNameHint": {
+    "message": "A bevivendő adattár neve"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "További információ a Bitwarden API-járól"
   },
-  "fileSend": {
-    "message": "Fájl típusú Send"
-  },
   "fileSends": {
     "message": "Fájl küldés"
   },
-  "textSend": {
-    "message": "Szöveg típusú Send"
-  },
   "textSends": {
     "message": "Szöveg küldés"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Kockázatos jelszó megváltoztatása"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Ez a bejelentkezés veszélyben van és hiányzik egy webhely. Adjunk hozzá egy webhelyet és módosítsuk a jelszót az erősebb biztonság érdekében."
+  },
+  "missingWebsite": {
+    "message": "Hiányzó webhely"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Feloldás eltávolítása PIN kóddal"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Az ingyenes szervezeteknek legfeljebb 2 gyűjteményük lehet. Térjünk át egy fizetett csomagra további gyűjtemények hozzáadásához."
   },
+  "searchArchive": {
+    "message": "Keresés archívum"
+  },
+  "archiveNoun": {
+    "message": "Archívum",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archívum",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Nincs elem az archívumban."
+  },
+  "archivedItemsDescription": {
+    "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."
+  },
   "businessUnit": {
     "message": "Üzleti egység"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "A Bitwarden bővítmény megnyitása"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "A Bitwarden bővítmény telepítve van! Nyissuk meg a bővítményt a bejelentkezéshez és az automatikus kitöltés megkezdéséhez."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "A jóváírás hozzáadásához szükséges számlázási cím.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "Informció erről a beállításról"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "A Bitwarden mentett bejelentkezési webcímeket használ annak azonosítására, hogy melyik ikont vagy jelszó webcímet kell használni az élmény javítása érdekében. A szolgáltatás használatakor nincs információ gyűjtés vagy mentés."
+  },
   "billingAddress": {
     "message": "Számlázási cím"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "A Key Connector tartomány megerősítése"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "A bankszámlával történő fizetés csak az Egyesült Államokban lévő ügyfelek számára elérhető. Ellenőrizni kell bankszámlát. A következő 1-2 munkanapon belül mikrobetét készül.  A bankszámla ellenőrzéséhez írjuk be a kimutatás leíró kódot ebből a befizetésből a Fizetési adatok oldalon. A bankszámla ellenőrzésének elmulasztása a fizetés elmaradását és az előfizetés felfüggesztését vonja maga után."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "A fejlesztők mikrobetétet utaltak bankszámlánkra (ez 1-2 munkanapot is igénybe vehet). Adjuk meg a befizetés leírásában található, 'SM' kezdetű hatjegyű kódot. Ha elmulasztjuk a bankszámla igazolását, az a fizetés elmaradását és az előfizetés felfüggesztését vonja maga után."
+  },
+  "verifyNow": {
+    "message": "Ellenőrzés most"
+  },
+  "additionalStorageGB": {
+    "message": "Kiegészítő tárhely (GB)"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Kiegészítő gépi fiókok"
+  },
+  "secretsManagerSeats": {
+    "message": "Titkos kód kezelő helyek"
+  },
+  "additionalStorage": {
+    "message": "Kiegészítő tárhely"
+  },
+  "expandPurchaseDetails": {
+    "message": "Vásárlás részletek kinyitása"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Vásárlás részletek összezárása"
+  },
+  "familiesMembership": {
+    "message": "Családi tagság"
+  },
+  "planDescPremium": {
+    "message": "Teljes körű online biztonság"
+  },
+  "planDescFamiliesV2": {
+    "message": "Prémium biztonság a család számára"
+  },
+  "planDescFreeV2": {
+    "message": "Megosztás $COUNT$ másik felhasználóval",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Fejlett képességek bármely szervezet számára"
+  },
+  "planNameCustom": {
+    "message": "Egyedi csomag"
+  },
+  "planDescCustom": {
+    "message": "A Bitwarden bármilyen méretű vállalkozásra kiterjed a jelszavak és érzékeny információk biztonsága érdekében. Ha egy nagyvállalat tagja vagyunk, lépjünk kapcsolatba az értékesítéssel ajánlat kéréshez."
+  },
+  "builtInAuthenticator": {
+    "message": "Beépített hitelesítés"
+  },
+  "breachMonitoring": {
+    "message": "Adatszivárgás figyelés"
+  },
+  "andMoreFeatures": {
+    "message": "És sok más!"
+  },
+  "secureFileStorage": {
+    "message": "Biztonságos fájl tárolás"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Korlátlan megosztás - válasszuk ki, ki mit láthat"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Korlátlan családi gyűjtemény"
+  },
+  "familiesSharedStorage": {
+    "message": "Megosztott tárhely a fontos családi információkhoz"
+  },
+  "limitedUsersV2": {
+    "message": "Legfeljebb $COUNT$ tag részére",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Legfeljebb $COUNT$ gyűjtemény",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Mindig ingyenes"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 titkos kód"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ projekt",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Biztonságos elem megosztás"
+  },
+  "scimSupport": {
+    "message": "SCIM támogatás"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ gépi fiók",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Vállalati biztonsági irányelvek"
+  },
+  "selfHostOption": {
+    "message": "Öntároló opció"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Kiegészítő családi csomag minden felhasználó számára"
+  },
+  "strengthenCybersecurity": {
+    "message": "A kiberbiztonság megerősítése"
+  },
+  "boostProductivity": {
+    "message": "Produktivitás növelése"
+  },
+  "seamlessIntegration": {
+    "message": "Zökkenőmentes integráció"
   }
 }
-
diff --git a/apps/web/src/locales/id/messages.json b/apps/web/src/locales/id/messages.json
index 79fb0753f50..3a628b0889b 100644
--- a/apps/web/src/locales/id/messages.json
+++ b/apps/web/src/locales/id/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Semua aplikasi"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Logo Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Buat entri masuk baru"
   },
+  "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, they will display here."
+  },
+  "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": "Semua aplikasi ($COUNT$)",
     "placeholders": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Anggota yang diberitahukan ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
-    "message": "Anda belum menandai aplikasi apa pun Penting"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Jenis barang apa ini?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Lihat Item"
   },
-  "newItemHeader": {
-    "message": "$TYPE$ baru",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Sunting $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Lihat $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Baru",
@@ -1395,6 +1542,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"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Kata sandi berkas tidak valid, harap menggunakan kata sandi yang anda masukkan saat anda membuat berkas ekspor."
   },
@@ -1404,6 +1560,30 @@
   "noItemsInList": {
     "message": "Tidak ada item yang dapat dicantumkan."
   },
+  "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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Kehilangan akses ke semua penyedia dua faktor Anda? Gunakan kode pemulihan untuk menonaktifkan semua penyedia dua faktor dari akun Anda."
-  },
   "recoveryCodeTitle": {
     "message": "Kode Pemulihan"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Ubah bahasa yang digunakan oleh brankas web."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Bawaan"
@@ -4702,6 +4876,12 @@
   "organizationIsDisabled": {
     "message": "Organisasi dinonaktifkan."
   },
+  "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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "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."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Nonaktifkan Kirim"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO tidak aktif"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Konektor Kunci diaktifkan"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Akses ditolak. Anda tidak mempunyai izin untuk melihat halaman ini."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Anggota"
   },
@@ -8287,12 +8508,6 @@
   "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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/it/messages.json b/apps/web/src/locales/it/messages.json
index c56aba333b2..53eece391a5 100644
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Tutte le applicazioni"
   },
+  "activity": {
+    "message": "Attività"
+  },
   "appLogoLabel": {
     "message": "Logo Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Crea nuovo elemento di login"
   },
+  "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, they will display here."
+  },
+  "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": "Applicazioni critiche ($COUNT$)",
     "placeholders": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Membri notificati ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
-    "message": "Non hai contrassegnato nessuna applicazione come critica"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Seleziona le applicazioni critiche per scoprire le password a rischio e invitare gli utenti a modificarle."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Seleziona le applicazioni critiche"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Contrassegna l'applicazione come critica"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Membri a rischio"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Membri a rischio ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Contrassegna l'elemento come non critico"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Applicazione contrassegnata come non critica"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Che tipo di elemento è questo?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Visualizza elemento"
   },
-  "newItemHeader": {
-    "message": "Nuovo $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nuovo Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Modifica $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nuova Carta",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Visualizza $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nuova Identità",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nuova Nota",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nuova chiave SSH",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Modifica Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Modifica Carta",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Modifica Identità",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nuovo",
@@ -1395,6 +1542,15 @@
   "invalidMasterPassword": {
     "message": "Password principale errata"
   },
+  "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": "Password errata, usa la password che hai inserito alla creazione del file di esportazione."
   },
@@ -1404,6 +1560,30 @@
   "noItemsInList": {
     "message": "Non ci sono elementi da mostrare."
   },
+  "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": "Non hai i permessi necessari per visualizzare tutti gli elementi in questa raccolta."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Scegli il metodo di accesso in due passaggi"
   },
-  "recoveryCodeDesc": {
-    "message": "Hai perso l'accesso a tutti i tuoi metodi di verifica in due passaggi? Usa il tuo codice di recupero per disattivarli tutti dal tuo account."
-  },
   "recoveryCodeTitle": {
     "message": "Codice di recupero"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Cambia la lingua utilizzata dalla cassaforte web."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Predefinito"
@@ -4702,6 +4876,12 @@
   "organizationIsDisabled": {
     "message": "Organizzazione disabilitata"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Non è possibile accedere alle organizzazioni disabilitate. Contatta il proprietario della tua organizzazione per assistenza."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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": "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": "Scollega SSO"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "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"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Rimuovi Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO disattivato"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector attivato"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Accesso negato. Non hai i permessi necessari per visualizzare questa pagina."
   },
@@ -7043,6 +7258,9 @@
   "unknownSecret": {
     "message": "Segreto sconosciuto, potrebbe essere necessario richiedere l'autorizzazione per l'accesso."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Progetto sconosciuto, potrebbe essere necessario richiedere l'autorizzazione per l'accesso."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "No"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Membri"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accesso al progetto con identificatore $PROJECT_ID$ riuscito.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Progetto con identificatore $PROJECT_ID$ modificato",
     "placeholders": {
@@ -8432,6 +8656,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": "Progetto con identificatore $PROJECT_ID$ eliminato",
     "placeholders": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assegna"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assegna alle raccolte"
   },
@@ -9666,6 +9963,12 @@
   "failedToSaveIntegration": {
     "message": "Impossibile salvare l'integrazione. Riprova più tardi."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
+  "failedToDeleteIntegration": {
+    "message": "Failed to delete integration. Please try again later."
+  },
   "deviceIdMissing": {
     "message": "ID dispositivo mancante"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Avvia la guida di $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Token portatore"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Indice"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Info sulle API di Bitwarden"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "Send File"
   },
-  "textSend": {
-    "message": "Testo Send"
-  },
   "textSends": {
     "message": "Send Testo"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "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."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Rimuovi sblocco con PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Le organizzazioni gratuite possono avere fino a 2 raccolte. Aggiorna ad un piano a pagamento per crearne di più."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Estensione di Bitwarden installata!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Apri l'estensione cliccando sul tasto della barra degli strumenti e accedi con i tuoi dati per attivare il riempimento automatico."
   },
@@ -11071,6 +11403,12 @@
     "message": "Indirizzo di fatturazione richiesto per aggiungere credito.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Indirizzo di fatturazione"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/ja/messages.json b/apps/web/src/locales/ja/messages.json
index 796960a79bd..bd8a9465b7b 100644
--- a/apps/web/src/locales/ja/messages.json
+++ b/apps/web/src/locales/ja/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "すべてのアプリ"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "新しいログインアイテムを作成"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "通知済みメンバー ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "ユーザーがログイン情報を保存すると、アプリがここに表示され、リスクの高いパスワードがあれば表示されます。特に重要なアプリはマークして、パスワードを更新するようにユーザーに通知しましょう。"
   },
-  "noCriticalAppsTitle": {
-    "message": "重要なアプリとしてマークしたものがありません"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "特に重要なアプリケーションを選択して、危険なパスワードを発見し、ユーザーにパスワードを変更するよう通知しましょう。"
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "重要なアプリをマークする"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "重要なアプリとしてマーク"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "リスクがあるメンバー"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "危険な状態のメンバー ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "重要なアプリケーションのマークを解除しました"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "このアイテムのタイプは何ですか？"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "アイテムの表示"
   },
-  "newItemHeader": {
-    "message": "$TYPE$ を新規作成",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ を編集",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "$ITEMTYPE$ を表示",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "新規作成",
@@ -1395,6 +1542,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": "無効なファイルパスワードです。エクスポートファイルを作成したときに入力したパスワードを使用してください。"
   },
@@ -1404,6 +1560,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": "このコレクション内のアイテムをすべて表示する権限がありません。"
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "2段階認証の方法を選択"
   },
-  "recoveryCodeDesc": {
-    "message": "すべての2段階認証プロパイダにアクセスできなくなったときは、リカバリーコードを使用するとアカウントの2段階認証を無効化できます。"
-  },
   "recoveryCodeTitle": {
     "message": "リカバリーコード"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "ウェブ保管庫で使用する言語を変更します。"
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "デフォルト"
@@ -4702,6 +4876,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": "一時停止された組織にはアクセスできません。組織の所有者にお問い合わせください。"
   },
@@ -4714,9 +4894,6 @@
   "serviceAccountsCannotCreate": {
     "message": "一時停止中の組織ではサービスアカウントを作成できません。組織の所有者に問い合わせてください。"
   },
-  "disabledOrganizationFilterError": {
-    "message": "無効な組織のアイテムにアクセスすることはできません。組織の所有者に連絡してください。"
-  },
   "licenseIsExpired": {
     "message": "ライセンスの有効期限が切れています。"
   },
@@ -5090,9 +5267,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 のリンクを解除"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "組織のポリシーにより、個人保管庫へのアイテムの保存が制限されています。 「所有権」オプションを組織に変更し、利用可能なコレクションから選択してください。"
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Send を無効化"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSOを無効にしました"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "キーコネクターを有効にしました"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "アクセスが拒否されました。このページを表示する権限がありません。"
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "オフ"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "メンバー"
   },
@@ -8287,12 +8508,6 @@
   "groupSlashUser": {
     "message": "グループ/ユーザー"
   },
-  "lowKdfIterations": {
-    "message": "低 KDF イテレーション"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "新しいセキュリティの推奨事項に対応し、アカウントの保護を向上させるために、暗号化設定を更新してください。"
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "続行すると、すべてのアクティブなセッションからログアウトします。再度ログインし、2段階認証を完了する必要があります。 暗号化設定を変更する前に、保管庫をエクスポートしてデータの損失を防ぐことをおすすめします。"
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "割り当て"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "コレクションに割り当てる"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "KDF 反復回数が少ないです。あなたのアカウントのセキュリティを向上させるために反復回数を増やしてください。"
-  },
-  "changeKDFSettings": {
-    "message": "KDF 設定の変更"
-  },
   "secureYourInfrastructure": {
     "message": "インフラストラクチャの保護"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Bitwarden API の詳細"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "ファイル Send"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "テキスト Send"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "危険なパスワードの変更"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "PINによるロック解除を削除"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "無料版の組織ではコレクションは 2 つまでです。さらにコレクションを追加するには有料プランにアップグレードしてください。"
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/ka/messages.json b/apps/web/src/locales/ka/messages.json
index e14a47d04ac..a57142dc31f 100644
--- a/apps/web/src/locales/ka/messages.json
+++ b/apps/web/src/locales/ka/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Რა სახის საგანია ეს?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "ნახვა საგნის"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "ახალი",
@@ -1395,6 +1542,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": "არასწორი ფაილის პაროლი, გთხოვთ გამოიყენოთ პაროლი რომელიც თქვენ შეიყვანეთ როცა შექმენით ექსპორტ ფაილი."
   },
@@ -1404,6 +1560,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": "თქვენ არ გაქვთ უფლება ნახოთ ყველა საგანი ამ კოლექციაში."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "დაკარგეთ წვდომა ყველა შენს ორსაფეხურიან პროვაიდერებთან? გამოიყენეთ თქვენი აღდგენის კოდი რომ გათიშოთ ყველა ორსაფეხურიანი ავტორიზაციის პროვაიდერები შენი ანგარიშიდან."
-  },
   "recoveryCodeTitle": {
     "message": "აღდგენის კოდი"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/km/messages.json b/apps/web/src/locales/km/messages.json
index 6b81195467a..173520dab61 100644
--- a/apps/web/src/locales/km/messages.json
+++ b/apps/web/src/locales/km/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "What type of item is this?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/kn/messages.json b/apps/web/src/locales/kn/messages.json
index cd9e37bf64b..d625ab92f07 100644
--- a/apps/web/src/locales/kn/messages.json
+++ b/apps/web/src/locales/kn/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "ಇದು ಯಾವ ರೀತಿಯ ಐಟಂ?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "ಐಟಂ ವೀಕ್ಷಿಸಿ"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "ನಿಮ್ಮ ಎಲ್ಲಾ ಎರಡು ಅಂಶ ಪೂರೈಕೆದಾರರಿಗೆ ಪ್ರವೇಶವನ್ನು ಕಳೆದುಕೊಂಡಿದ್ದೀರಾ? ನಿಮ್ಮ ಖಾತೆಯಿಂದ ಎಲ್ಲಾ ಎರಡು ಅಂಶ ಪೂರೈಕೆದಾರರನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ನಿಮ್ಮ ಮರುಪಡೆಯುವಿಕೆ ಕೋಡ್ ಬಳಸಿ."
-  },
   "recoveryCodeTitle": {
     "message": "ಮರುಪಡೆಯುವಿಕೆ ಕೋಡ್"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "ವೆಬ್ ವಾಲ್ಟ್ ಬಳಸುವ ಭಾಷೆಯನ್ನು ಬದಲಾಯಿಸಿ."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "ಡಿಫಾಲ್ಟ್"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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": "ಪರವಾನಗಿ ಅವಧಿ ಮೀರಿದೆ."
   },
@@ -5090,9 +5267,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": "ಎಸ್‌ಎಸ್‌ಒ ಅನ್ಲಿಂಕ್ ಮಾಡಿ"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "ಎಂಟರ್‌ಪ್ರೈಸ್ ನೀತಿಯಿಂದಾಗಿ, ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ವಾಲ್ಟ್‌ಗೆ ವಸ್ತುಗಳನ್ನು ಉಳಿಸುವುದರಿಂದ ನಿಮ್ಮನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ಮಾಲೀಕತ್ವದ ಆಯ್ಕೆಯನ್ನು ಸಂಸ್ಥೆಗೆ ಬದಲಾಯಿಸಿ ಮತ್ತು ಲಭ್ಯವಿರುವ ಸಂಗ್ರಹಗಳಿಂದ ಆರಿಸಿಕೊಳ್ಳಿ."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "ಕಳುಹಿಸುವುದನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/ko/messages.json b/apps/web/src/locales/ko/messages.json
index 7dd6b691751..2ebd08b1733 100644
--- a/apps/web/src/locales/ko/messages.json
+++ b/apps/web/src/locales/ko/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "항목의 유형이 무엇입니까?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "항목 보기"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "새 항목",
@@ -1395,6 +1542,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": "파일 암호가 잘못되었습니다. 내보낸 파일을 생성했을 때 사용한 암호를 입력하세요."
   },
@@ -1404,6 +1560,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": "이 컬렉션의 모든 항목을 볼 권한이 없습니다."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "모든 2단계 인증을 사용할 수 없는 상황인가요? 복구 코드를 사용하여 계정의 모든 2단계 인증을 비활성화할 수 있습니다."
-  },
   "recoveryCodeTitle": {
     "message": "복구 코드"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "웹 보관함에서 사용할 언어를 변경합니다."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "기본값"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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": "라이선스가 만료되었습니다."
   },
@@ -5090,9 +5267,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 연결 해제"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "엔터프라이즈 정책으로 인해 개인 보관함에 항목을 저장할 수 없습니다. 조직에서 소유권 설정을 변경한 다음, 사용 가능한 컬렉션 중에서 선택해주세요."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Send 비활성화"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO 비활성화됨"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "키 커넥터 활성화됨"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "구성원"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/lv/messages.json b/apps/web/src/locales/lv/messages.json
index 7b13ff3507a..28bca33cdd5 100644
--- a/apps/web/src/locales/lv/messages.json
+++ b/apps/web/src/locales/lv/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Visas lietotnes"
   },
+  "activity": {
+    "message": "Darbības"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logotips"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Izveidot jaunu pieteikšanās vienumu"
   },
+  "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, they will display here."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ būtiskas lietotnes",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ lietotnes ir pakļautas riskam",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Apziņotie dalībnieki ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "Neviena lietotne nav atzīmēta kā kritiska"
   },
-  "noCriticalAppsDescription": {
-    "message": "Atlasi kritiskākās lietotnes, la iatklātu riskam pakļautas paroles un apziņotu lietotājus, lai tās nomaina!"
+  "noCriticalApplicationsDescription": {
+    "message": "Atlasi savas visbūtiskākās lietotnes, lai lietotājiem izvirzīdu svarīgas drošības darbības, lai novērstu riskam pakļautas paroles."
   },
-  "markCriticalApps": {
-    "message": "Atzīmēt kritiskās lietotnes"
+  "markCriticalApplications": {
+    "message": "Atlasīt būtiskās lietotnes"
   },
   "markAppAsCritical": {
     "message": "Atzīmēt lietotni kā kritisku"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Riskam pakļautie dalībnieki"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Dalībnieki ar piekluvi riskam pakļautajiem vienumiem būtiskajām lietotnēm"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ dalībnieki ir pakļauti riskam",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Riskam pakļautie dalībnieki ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Noņemt kritiskuma atzīmi"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Kritiskas lietotnes atzīme sekmīgi noņemta"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Lietotnei sekmīgi noņemta būtiskuma atzīme"
   },
   "whatTypeOfItem": {
     "message": "Kāda veida vienums tas ir?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Apskatīt vienumu"
   },
-  "newItemHeader": {
-    "message": "Jauns/a $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Jauns pieteikšanās vienums",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Labot $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Jauna karte",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Apskatīt $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Jauna identitāte",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Jauna piezīme",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Jauna SSH atslēga",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Jauns teksta Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Jauns datnes Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Labot pieteikšanās vienumu",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Labot karti",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Labot identitāti",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Labot piezīmi",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Labot SSH atslēgu",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Labot teksta Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Labot datnes Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Apskatīt pieteikšanās vienumu",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Apskatīt karti",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Skatīt identitāti",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Apskatīt piezīmi",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Apskatīt SSH atslēgu",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Jauns",
@@ -1395,6 +1542,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ī."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Atlasīt divpakāpju pieteikšanās veidu"
   },
-  "recoveryCodeDesc": {
-    "message": "Zaudēta piekļuve visiem divpakāpju pieteikšanās nodrošinātājiem? Jāizmanto atkopes kods, lai izslēgtu visus sava konta divpakāpju pieteikšanās nodrošinātājus."
-  },
   "recoveryCodeTitle": {
     "message": "Atkopes kods"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Nomainīt tīmekļa glabātavā izmantoto valodu."
   },
-  "enableFavicon": {
-    "message": "Rādīt tīmekļvietņu ikonas"
-  },
-  "faviconDesc": {
-    "message": "Attēlot atpazīstamu attēlu pie katra pieteikšanās vienuma."
+  "showIconsChangePasswordUrls": {
+    "message": "Rādīt tīmekļvietņu ikonas un iegūt paroles nomaiņas URL"
   },
   "default": {
     "message": "Noklusējums"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Uzņēmuma nosacījumi liedz saglabāt vienumus privātajā glabātavā. Ir jānorāda piederība apvienībai un jāizvēlas kāds no pieejamajiem krājumiem."
   },
+  "desktopAutotypePolicy": {
+    "message": "Darbvirsmas automātiskās ievades noklusējuma iestatījums"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Pēc noklusējuma IESLĒGT dalībniekiem darbvirsmas automātisko aizpildi. Dalībnieki var pašrocīgi izslēgt automātisko aizpildi darbvirsmas klientā.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Noņemt Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "Atspējota vienotā pieteikšanās"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ jāpiesakās ar vienoto pieteikšanos",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Iespējots Key Connector"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Piekļuve liegta. Nav nepieciešamo atļauju, lai apskatītu šo lapu."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Izslēgts"
   },
+  "connected": {
+    "message": "Savienots"
+  },
   "members": {
     "message": "Dalībnieki"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Piekļuva projektam ar Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Piešķirt"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Piešķirt krājumiem"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Trūkst ierīces Id"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Atjaunināt $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Palaist $INTEGRATION$ ieviešanas norādes.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Uzrādītāja pilnvara"
   },
+  "repositoryNameHint": {
+    "message": "Glabātavas nosaukums, kurā ievietot"
+  },
   "index": {
     "message": "Indekss"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Uzzināt vairāk par Bitwarden API"
   },
-  "fileSend": {
-    "message": "Datņu Send"
-  },
   "fileSends": {
     "message": "Datņu Send"
   },
-  "textSend": {
-    "message": "Teksta Send"
-  },
   "textSends": {
     "message": "Teksta Send"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Mainīt riskam pakļautu paroli"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Šis pieteikšanās vienums ir pakļauts riskam, un tam nav norādīta tīmekļvietne. Lielākai drošībai jāpievieno tīmekļvietne un jānomaina parole."
+  },
+  "missingWebsite": {
+    "message": "Nav norādīta tīmekļvietne"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Noņemt atslēgšanu ar PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Apvienībās, kuras izmanto Bitwarden bez maksas, var būt līdz 2 krājumiem. Jāpāriet uz maksas plānu, lai pievienotu vairāk krājumu."
   },
+  "searchArchive": {
+    "message": "Meklēt arhīvā"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Arhīvā nav vienumu"
+  },
+  "archivedItemsDescription": {
+    "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."
+  },
   "businessUnit": {
     "message": "Uzņēmējdarbības vienība"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden paplašinājums uzstādīts."
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Jāatver paplašinājums, lai pieteiktos un uzsāktu automātisko aizpildi."
   },
@@ -11071,6 +11403,12 @@
     "message": "Norēķinu adrese ir nepieciešama, lai pievienot kredītu.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "Par šo iestatījumu"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden izmantos saglabātos pieteikšanās vienuma URI, lai noteiktu, kuru ikonu vai paroles nomaiņas URL izmantot, lai uzlabotu pieredzi. Šī pakalpojuma izmantošanas laikā nekāda informācija netiek ievākta vai saglabāta."
+  },
   "billingAddress": {
     "message": "Norēķinu adrese"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Apstiprināt Key Connector domēnu"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Apmaksa ar bankas kontu ir pieejama tikai klientiem Savienotajās Valstīs. Būs nepieciešams apliecināt savu bankas kontu. Mēs veiksim sīkiemaksu nākamās darba dienas vai divu laikā. Bankas konta apliecināšanas neveikšana beigsies ar nokavētu maksājumu un apturētu abonementu."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Mēs veicām sīkiemaksu Tavā bankas kontā. Tas var aizņemt 1 līdz 2 darba dienas. Kad redzēsi iemaksu savā kontā, varēsi apliecināt savu bankas kontu. Bankas konta apliecināšans neveikšana beigsies ar nokavētu maksājumu un apturētu abonementu."
+  },
+  "verifyNow": {
+    "message": "Apliecini tagad!"
+  },
+  "additionalStorageGB": {
+    "message": "Papildu krātuve GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Papildu mašīnu konti"
+  },
+  "secretsManagerSeats": {
+    "message": "Noslēpumu pārvaldnieka vietas"
+  },
+  "additionalStorage": {
+    "message": "Papildu krātuve"
+  },
+  "expandPurchaseDetails": {
+    "message": "Izvērst informāciju par pirkumu"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Sakļaut informāciju par pirkumu"
+  },
+  "familiesMembership": {
+    "message": "Dalība ģimeņu plānā"
+  },
+  "planDescPremium": {
+    "message": "Pilnīga drošība tiešsaistē"
+  },
+  "planDescFamiliesV2": {
+    "message": "Augstākā labuma drošība ģimenei"
+  },
+  "planDescFreeV2": {
+    "message": "Kopīgot ar $COUNT$ citiem lietotājiem",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Papildu spējas jebkurai apvienībai"
+  },
+  "planNameCustom": {
+    "message": "Pielāgots plāns"
+  },
+  "planDescCustom": {
+    "message": "Bitwarden piemērojas visu lielumu uzņēmējdarbībai, lai aizsargātu paroles un jūtīgu informāciju. Ja esi daļa no liela uzņēmuma, sazinies ar pārdošanas nodaļu, lai pieprasītu cenu piedāvājumu!"
+  },
+  "builtInAuthenticator": {
+    "message": "Iebūvēts autentificētājs"
+  },
+  "breachMonitoring": {
+    "message": "Noplūžu pārraudzīšana"
+  },
+  "andMoreFeatures": {
+    "message": "Un vēl!"
+  },
+  "secureFileStorage": {
+    "message": "Droša datņu krātuve"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Neierobežota kopīgošana - izvēlies, ko kurš redz"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Neierobežoti ģimeņu krājumi"
+  },
+  "familiesSharedStorage": {
+    "message": "Koplietojama krātuve svarīgai ģimenes informācijai"
+  },
+  "limitedUsersV2": {
+    "message": "Līdz $COUNT$ dalībniekiem",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Līdz $COUNT$ krājumiem",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Vienmēr bez maksas"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 noslēpumi"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ projekts(i)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Droša vienumu kopīgošana"
+  },
+  "scimSupport": {
+    "message": "SCIM atbalsts"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ mašīnu konti",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Uzņēmumu drošības pamatnostādnes"
+  },
+  "selfHostOption": {
+    "message": "Pašmitināšanas iespēja"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Bezmaksas ģimeņu plāns visiem lietotājiem"
+  },
+  "strengthenCybersecurity": {
+    "message": "Stiprini kiberdrošību"
+  },
+  "boostProductivity": {
+    "message": "Uzlabo ražīgumu"
+  },
+  "seamlessIntegration": {
+    "message": "Plūdena iekļaušana"
   }
 }
-
diff --git a/apps/web/src/locales/ml/messages.json b/apps/web/src/locales/ml/messages.json
index 912a9304ed6..cbb5aeecf49 100644
--- a/apps/web/src/locales/ml/messages.json
+++ b/apps/web/src/locales/ml/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "ഇത് ഏതു തരം ഇനം ആണ്?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "ഇനം കാണുക"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "നിങ്ങളുടെ രണ്ട്-ഘടക ദാതാക്കളിലേക്കുള്ള ആക്‌സസ്സ് നഷ്‌ടപ്പെട്ടോ? നിങ്ങളുടെ അക്കൗണ്ടിൽ നിന്ന് രണ്ട്-ഘടക ദാതാക്കളെ പ്രവർത്തനരഹിതമാക്കാൻ നിങ്ങളുടെ റിക്കവറി കോഡ് ഉപയോഗിക്കുക."
-  },
   "recoveryCodeTitle": {
     "message": "റിക്കവറി കോഡ്"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "അപ്ലിക്കേഷൻ ഉപയോഗിക്കുന്ന ഭാഷ മാറ്റുക. പുനരാരംഭിക്കൽ ആവശ്യമാണ്."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "സാധാരണ പോലെ"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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": "ലൈസൻസ് കാലഹരണപ്പെട്ടു."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/mr/messages.json b/apps/web/src/locales/mr/messages.json
index e668a0b27ed..2ea56d367ff 100644
--- a/apps/web/src/locales/mr/messages.json
+++ b/apps/web/src/locales/mr/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "सर्व अ‍ॅप्लिकेशन्स"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "बिटवॉर्डन चिन्ह"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "नवीन लॉगिन आयटम तयार करा"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "अ‍ॅपला गंभीर म्हणून चिन्हांकित करा"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "जोखीम गटातील सदस्य ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "What type of item is this?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/my/messages.json b/apps/web/src/locales/my/messages.json
index 6b81195467a..173520dab61 100644
--- a/apps/web/src/locales/my/messages.json
+++ b/apps/web/src/locales/my/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "What type of item is this?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/nb/messages.json b/apps/web/src/locales/nb/messages.json
index 205aaa63ae0..778d3adf74c 100644
--- a/apps/web/src/locales/nb/messages.json
+++ b/apps/web/src/locales/nb/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Alle programmer"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden-logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Hva slags element er dette?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Vis elementet"
   },
-  "newItemHeader": {
-    "message": "Ny $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Rediger $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Ny",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Velg 2-trinnspåloggingsmetode"
   },
-  "recoveryCodeDesc": {
-    "message": "Har du mistet tilgang til alle dine 2-trinnsleverandører? Bruk din gjenopprettingskode til å fjerne alle 2-trinnsleverandører fra din konto."
-  },
   "recoveryCodeTitle": {
     "message": "Gjenopprettingskode"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Endre språket som brukes av netthvelvet."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Standard"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "På grunn av en virksomhetsregel er du begrenset fra å lagre elementer til ditt personlige hvelv. Endre eierskapet til en organisasjon og velg blant tilgjengelige samlinger."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Deaktiver Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "Skrudde av SSO"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector aktivert"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Ingen tilgang. Du har ikke tillatelse til å se denne siden."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Av"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Medlemmer"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Knytt"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Legg til i samlinger"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Enhets-ID-en mangler"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Fakturaadresse"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/ne/messages.json b/apps/web/src/locales/ne/messages.json
index b60d8451c54..6575f687031 100644
--- a/apps/web/src/locales/ne/messages.json
+++ b/apps/web/src/locales/ne/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "यो कस्तो प्रकारको वस्तु हो?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/nl/messages.json b/apps/web/src/locales/nl/messages.json
index 54d9138fa06..31d648fb94f 100644
--- a/apps/web/src/locales/nl/messages.json
+++ b/apps/web/src/locales/nl/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Alle applicaties"
   },
+  "activity": {
+    "message": "Activiteit"
+  },
   "appLogoLabel": {
     "message": "Bitwarden-logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Nieuw login item aanmaken"
   },
+  "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": "Als je toepassingen als belangrijk markeert, verschijnen ze hier."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ belangrijke applicaties",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applicaties in gevaar",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ wachtwoorden lopen risico",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Geînformeerde leden ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "Je hebt nog geen applicaties als belangrijk aangewezen"
   },
-  "noCriticalAppsDescription": {
-    "message": "Wijs je meest belangrijke applicaties aan om risicovolle wachtwoorden te ontdekken en gebruikers te attenderen deze te wijzigen."
+  "noCriticalApplicationsDescription": {
+    "message": "Selecteer je meest belangrijke applicaties om prioriteit te geven aan beveiligingsacties voor je gebruikers om risico-wachtwoorden aan te pakken."
   },
-  "markCriticalApps": {
-    "message": "Markeer belangrijke apps"
+  "markCriticalApplications": {
+    "message": "Belangrijke applicaties selecteren"
   },
   "markAppAsCritical": {
     "message": "App aanwijzen als belangrijk"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Leden in gevaar"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Leden met toegang tot risico-items voor belangrijke applicaties"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ leden lopen risico",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Leden die risico lopen ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Markeren als belangrijk ongedaan maken"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Markeren als belangrijke app ongedaan gemaakt"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Toepassing niet meer gemarkeerd als belangrijk"
   },
   "whatTypeOfItem": {
     "message": "Van welke categorie is dit item?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Item weergeven"
   },
-  "newItemHeader": {
-    "message": "Nieuwe $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nieuwe login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$ bewerken",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nieuwe kaart",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "$ITEMTYPE$ weergeven",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nieuwe identiteit",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nieuwe notitie",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nieuwe SSH-sleutel",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Nieuwe Send (tekst)",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Nieuwe Send (bestand)",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Login bewerken",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Kaart bewerken",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Identiteit bewerken",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Notitie bewerken",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "SSH-sleutel bewerken",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Send (tekst) bewerken",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Send (bestand) bewerken",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Login bekijken",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Kaart bekijken",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Identiteit bekijken",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Notitie bekijken",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "SSH-sleutel bekijken",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nieuw",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Kies methode voor tweestapsaanmelding"
   },
-  "recoveryCodeDesc": {
-    "message": "Ben je de toegang tot al je tweestapsaanbieders verloren? Gebruik dan je herstelcode om alle tweestapsaanbieders op je account uit te schakelen."
-  },
   "recoveryCodeTitle": {
     "message": "Herstelcode"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "De taal van de webkluis aanpassen."
   },
-  "enableFavicon": {
-    "message": "Websitepictogrammen weergeven"
-  },
-  "faviconDesc": {
-    "message": "Een herkenbare afbeelding naast iedere login weergeven."
+  "showIconsChangePasswordUrls": {
+    "message": "Websitepictogrammen weergeven en URL's voor wachtwoordwijzigingen ophalen"
   },
   "default": {
     "message": "Standaard"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Wegens bedrijfsbeleid mag je geen wachtwoorden opslaan in je persoonlijke kluis. Verander het eigenaarschap naar een organisatie en kies uit een van de beschikbare collecties."
   },
+  "desktopAutotypePolicy": {
+    "message": "Standaardinstelling Desktop Autotype"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Desktop Autotype standaard inschakelen voor leden. Leden kunnen Autotype uitzetten in de Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Send uitschakelen"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO uitgeschakeld"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ moet met Single Sign-on inloggen",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector ingeschakeld"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Toegang geweigerd. Je hebt geen toestemming om deze pagina te bekijken."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Uit"
   },
+  "connected": {
+    "message": "Verbonden"
+  },
   "members": {
     "message": "Leden"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Project gekoppeld met Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Project bekeken met identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Toewijzen"
   },
+  "assignTasks": {
+    "message": "Taken toewijzen"
+  },
   "assignToCollections": {
     "message": "Toewijzen aan collecties"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Apparaat-ID ontbreekt"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "$INTEGRATION$ bijwerken",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "$INTEGRATION$ implementatiehandleiding openen.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer-token"
   },
+  "repositoryNameHint": {
+    "message": "Naam van de repository om in te nemen"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Lees meer over Bitwarden's API"
   },
-  "fileSend": {
-    "message": "Bestand Send"
-  },
   "fileSends": {
     "message": "Bestand-Sends"
   },
-  "textSend": {
-    "message": "Tekst Send"
-  },
   "textSends": {
     "message": "Tekst-Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Risicovol wachtwoord wijzigen"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Deze login is in gevaar en mist een website. Voeg een website toe en verander het wachtwoord voor een sterkere beveiliging."
+  },
+  "missingWebsite": {
+    "message": "Ontbrekende website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Ontgrendelen met PIN verwijderen"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Gratis organisaties kunnen maximaal twee collecties hebben. Upgrade naar een betaald abonnement voor het toevoegen van meer collecties."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archief",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archiveren",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Bedrijfseenheid"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extensie geïnstalleerd!"
   },
+  "openTheBitwardenExtension": {
+    "message": "De Bitwarden-extensie openen"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "De Bitwarden-extensie is geïnstalleerd! Open de extensie om in te loggen en te beginnen met automatisch invullen."
+  },
   "openExtensionToAutofill": {
     "message": "Open de extensie om in te loggen en te beginnen met automatisch invullen."
   },
@@ -11071,6 +11403,12 @@
     "message": "Factuuradres vereist voor het toevoegen van krediet.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "Over deze instelling"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden gebruikt opgeslagen login-URI's om te bepalen welk pictogram of URL voor het wijzigen van het wachtwoord moet worden gebruikt om je ervaring te verbeteren. Er wordt geen informatie verzameld of opgeslagen wanneer je deze service gebruikt."
+  },
   "billingAddress": {
     "message": "Factuuradres"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Key Connector-domein bevestigen"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Betaling met een bankrekening is alleen beschikbaar voor klanten in de Verenigde Staten. Je moet je bankrekening verifiëren. We zullen binnen 1-2 werkdagen een microbetaling uitvoeren. Als de bankrekening niet wordt geverifieerd, wordt er een betaling gemist en wordt je abonnement opgeschort."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "We hebben een microbetaling op je bankrekening gedaan. Dit kan 1-2 werkdagen duren. Als je de betaling op je rekening ziet, kun je je bannkrekening verifiëren. Als de bankrekening niet wordt geverifieerd, wordt er een betaling gemist en wordt je abonnement opgeschort."
+  },
+  "verifyNow": {
+    "message": "Nu verifiëren."
+  },
+  "additionalStorageGB": {
+    "message": "Extra opslagruimte (GB)"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Extra machine-accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager-licenties"
+  },
+  "additionalStorage": {
+    "message": "Extra opslagruimte"
+  },
+  "expandPurchaseDetails": {
+    "message": "Aankoopgegevens uitklappen"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Aankoopgegevens inklappen"
+  },
+  "familiesMembership": {
+    "message": "Lidmaatschap families"
+  },
+  "planDescPremium": {
+    "message": "Online beveiliging voltooien"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium beveiliging voor je familie"
+  },
+  "planDescFreeV2": {
+    "message": "Delen met $COUNT$ andere gebruiker",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Geavanceerde mogelijkheden voor iedere bedrijf"
+  },
+  "planNameCustom": {
+    "message": "Aangepast abonnement"
+  },
+  "planDescCustom": {
+    "message": "Bitwarden schaalt met bedrijven van ieder formaat om wachtwoorden en gevoelige informatie te beveiligen. Als je deel uitmaakt van een grote onderneming, neem dan contact op met verkoop om een offerte aan te vragen."
+  },
+  "builtInAuthenticator": {
+    "message": "Ingebouwde authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Lek-monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "En meer!"
+  },
+  "secureFileStorage": {
+    "message": "Beveiligde bestandsopslag"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Onbeperkt delen - kies wie wat ziet"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Onbeperkte familiecollecties"
+  },
+  "familiesSharedStorage": {
+    "message": "Gedeelde opslag voor belangrijke familie-informatie"
+  },
+  "limitedUsersV2": {
+    "message": "Tot $COUNT$ leden",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Tot $COUNT$ collectie(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Altijd gratis"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 geheimen"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(en)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Beveiligd delen van items"
+  },
+  "scimSupport": {
+    "message": "SCIM ondersteuning"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine-account(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise-beveiligingsbeleid"
+  },
+  "selfHostOption": {
+    "message": "Optie tot zelf-hosten"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Gratis familie-abonnement voor alle gebruikers"
+  },
+  "strengthenCybersecurity": {
+    "message": "Cyberbeveiliging versterken"
+  },
+  "boostProductivity": {
+    "message": "Productiviteit verhogen"
+  },
+  "seamlessIntegration": {
+    "message": "Naadloze integratie"
   }
 }
-
diff --git a/apps/web/src/locales/nn/messages.json b/apps/web/src/locales/nn/messages.json
index 932144903a1..92bfe3c925c 100644
--- a/apps/web/src/locales/nn/messages.json
+++ b/apps/web/src/locales/nn/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Kva type oppføring er dette?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Sjå oppføring"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/or/messages.json b/apps/web/src/locales/or/messages.json
index 6b81195467a..173520dab61 100644
--- a/apps/web/src/locales/or/messages.json
+++ b/apps/web/src/locales/or/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "What type of item is this?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/pl/messages.json b/apps/web/src/locales/pl/messages.json
index d0ea7376483..808981f5fb0 100644
--- a/apps/web/src/locales/pl/messages.json
+++ b/apps/web/src/locales/pl/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Wszystkie aplikacje"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Utwórz nowy element logowania"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Powiadomieni członkowie ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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ł."
   },
-  "noCriticalAppsTitle": {
-    "message": "Nie oznaczyłeś żadnych aplikacji jako krytycznych"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Wybierz najbardziej krytyczne aplikacje, aby odkryć hasła zagrożone i poinformuj użytkowników, by zmienili te hasła."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Oznacz krytyczne aplikacje"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Oznacz aplikację jako krytyczną"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Zagrożeni użytkownicy"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Zagrożeni członkowie ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Krytyczna aplikacja została pomyślnie odznaczona"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Jakiego rodzaju jest to element?"
@@ -732,34 +830,83 @@
     "message": "Edytuj element"
   },
   "viewItem": {
-    "message": "Zobacz element"
+    "message": "Pokaż element"
   },
-  "newItemHeader": {
-    "message": "Nowy $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nowe dane logowania",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edytuj $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nowa karta",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Zobacz $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nowa tożsamość",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nowa notatka",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nowy klucz SSH",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Nowa wysyłka tekstu",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Nowa wysyłka pliku",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edytuj dane logowania",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edytuj kartę",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edytuj tożsamość",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edytuj notatkę",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edytuj klucz SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edytuj tekst wysyłki",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edytuj plik wysyłki",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Pokaż dane logowania",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Pokaż kartę",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Pokaż tożsamość",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Pokaż notatkę",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Pokaż klucz SSH",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nowy",
@@ -868,13 +1015,13 @@
     "message": "Skopiuj numer licencji"
   },
   "copyPrivateKey": {
-    "message": "Copy private key"
+    "message": "Kopiuj klucz prywatny"
   },
   "copyPublicKey": {
-    "message": "Copy public key"
+    "message": "Kopiuj klucz publiczny"
   },
   "copyFingerprint": {
-    "message": "Copy fingerprint"
+    "message": "Kopiuj odcisk klucza"
   },
   "copyName": {
     "message": "Skopiuj nazwę"
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Wybierz metodę logowania dwustopniowego"
   },
-  "recoveryCodeDesc": {
-    "message": "Utraciłeś dostęp do wszystkich swoich mechanizmów dwustopniowego logowania? Użyj kodów odzyskiwania, aby wyłączyć dwustopniowe logowanie na Twoim koncie."
-  },
   "recoveryCodeTitle": {
     "message": "Kod odzyskiwania"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Zmień język używany przez sejf."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Domyślny"
@@ -3611,7 +3785,7 @@
     "message": "Zobacz wszystkie sposoby logowania"
   },
   "viewAllLoginOptions": {
-    "message": "Zobacz wszystkie sposoby logowania"
+    "message": "Pokaż wszystkie metody logowania"
   },
   "viewedItemId": {
     "message": "Wyświetlono element $ID$.",
@@ -4702,6 +4876,12 @@
   "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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Ze względu na zasadę przedsiębiorstwa, nie możesz zapisywać elementów w osobistym sejfie. Zmień właściciela elementu na organizację i wybierz jedną z dostępnych kolekcji."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Usuń wysyłkę"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "Logowanie jednokrotne SSO zostało wyłączone"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Serwer Key Connector został włączony"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Odmowa dostępu. Nie masz uprawnień do przeglądania tej strony."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Wyłączone"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Użytkownicy"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Przypisz"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Przypisz do kolekcji"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Brakuje identyfikatora urządzenia"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Uruchom przewodnik implementacyjny $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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ę"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Dowiedz się więcej o API Bitwarden"
   },
-  "fileSend": {
-    "message": "Wysyłka pliku"
-  },
   "fileSends": {
     "message": "Wysyłki plików"
   },
-  "textSend": {
-    "message": "Wysyłka tekstu"
-  },
   "textSends": {
     "message": "Wysyłki tekstów"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Zmień hasło zagrożone"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Usuń odblokowanie kodem PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Darmowe organizacje mogą posiadać maksymalnie 2 kolekcje. Aby dodać więcej kolekcji, przejdź na plan płatny."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Jednostka Biznesowa"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Rozszerzenie Bitwarden zainstalowane!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Otwórz rozszerzenie, aby zalogować się i rozpocząć autouzupełnianie."
   },
@@ -11071,6 +11403,12 @@
     "message": "Aby dodać środki, wymagany jest adres rozliczeniowy.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Adres rozliczeniowy"
   },
@@ -11189,7 +11527,7 @@
     "message": "Action required: You're missing a Tax ID number in payment details. If a Tax ID is not added, your invoices may include additional tax."
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "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."
   },
   "addTaxId": {
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/pt_BR/messages.json b/apps/web/src/locales/pt_BR/messages.json
index bd8fefc7302..5df0689d9de 100644
--- a/apps/web/src/locales/pt_BR/messages.json
+++ b/apps/web/src/locales/pt_BR/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Todas as aplicações"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Criar item de \"login\""
   },
+  "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, they will display here."
+  },
+  "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": "Aplicativos críticos ($COUNT$)",
     "placeholders": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Membros notificados ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
-    "message": "Você não marcou nenhum aplicativo como Crítico"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Selecione suas aplicações mais críticas para descobrir senhas de risco e notifique os usuários a alterar essas senhas."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Marcar aplicativos críticos"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Marcar aplicativo como crítico"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Membros de risco"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Membros em risco ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Desmarcar como crítico"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Aplicação crítica desmarcada com sucesso"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Que tipo de item é este?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Visualizar Item"
   },
-  "newItemHeader": {
-    "message": "Nova $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Editar $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Visualizar $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Novo",
@@ -1395,6 +1542,15 @@
   "invalidMasterPassword": {
     "message": "Senha mestra invá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": "Senha do arquivo inválida, por favor informe a senha utilizada quando criou o arquivo de exportação."
   },
@@ -1404,6 +1560,30 @@
   "noItemsInList": {
     "message": "Não há itens para 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": "Você não tem permissão para visualizar todos os itens desta coleção."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Selecionar método de login em duas etapas"
   },
-  "recoveryCodeDesc": {
-    "message": "Perdeu o acesso a todos os seus provedores de duas etapas? Utilize o seu código de recuperação para desativar todos os provedores de duas etapas da sua conta."
-  },
   "recoveryCodeTitle": {
     "message": "Código de recuperação"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Altere o idioma usado pelo cofre web."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Padrão"
@@ -4702,6 +4876,12 @@
   "organizationIsDisabled": {
     "message": "Organização está desabilitada."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "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."
   },
@@ -4714,9 +4894,6 @@
   "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."
   },
@@ -5090,9 +5267,13 @@
   "ssoIdentifier": {
     "message": "Identificador 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": "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": "Desvincular SSO"
@@ -5487,6 +5668,13 @@
   "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."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Desabilitar Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "Desativado o SSO"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Ativado o Conector de Chave"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Acesso negado. Você não tem permissão para ver esta página."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Desligado"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Membros"
   },
@@ -8287,12 +8508,6 @@
   "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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Atribuir"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Atribuir à coleções"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "ID do dispositivo está faltando"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Inicie o guia de implementação $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Saiba mais sobre a API do Bitwarden"
   },
-  "fileSend": {
-    "message": "Arquivo enviado"
-  },
   "fileSends": {
     "message": "Arquivos enviados"
   },
-  "textSend": {
-    "message": "Enviar texto"
-  },
   "textSends": {
     "message": "Texto enviado"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Alterar senhas vulneráveis"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remover desbloqueio com o PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Organizações gratuitas podem ter até duas coleções. Faça o upgrade para um plano pago para adicionar mais coleções."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Unidades de Negócio"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/pt_PT/messages.json b/apps/web/src/locales/pt_PT/messages.json
index 78f8183abe0..a7be84317e3 100644
--- a/apps/web/src/locales/pt_PT/messages.json
+++ b/apps/web/src/locales/pt_PT/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Todas as aplicações"
   },
+  "activity": {
+    "message": "Atividade"
+  },
   "appLogoLabel": {
     "message": "Logótipo do Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Criar nova credencial"
   },
+  "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, they will display here."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Once you mark applications critical, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ aplicações críticas",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ aplicações em risco",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Membros notificados ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "Não marcou nenhuma aplicação como crítica"
   },
-  "noCriticalAppsDescription": {
-    "message": "Selecione as suas aplicações mais críticas para descobrir palavras-passe em risco e notifique os utilizadores para alterarem essas palavras-passe."
+  "noCriticalApplicationsDescription": {
+    "message": "Selecione as suas aplicações mais críticas para dar prioridade a ações de segurança para os seus utilizadores, de modo a resolver as palavras-passe em risco."
   },
-  "markCriticalApps": {
-    "message": "Marcar apps críticas"
+  "markCriticalApplications": {
+    "message": "Selecionar aplicações críticas"
   },
   "markAppAsCritical": {
     "message": "Marcar a app como crítica"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Membros em risco"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ membros em risco",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Membros em risco ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Desmarcar como crítica"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Aplicação crítica desmarcada com sucesso"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Aplicação desmarcada como crítica com sucesso"
   },
   "whatTypeOfItem": {
     "message": "Que tipo de item é este?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Ver item"
   },
-  "newItemHeader": {
-    "message": "Novo(a) $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nova credencial",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Editar $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Novo cartão",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Ver $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nova identidade",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nova nota",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nova chave SSH",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Novo Send de texto",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Novo Send de ficheiro",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Editar credencial",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Editar cartão",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Editar identidade",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Editar nota",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Editar chave SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Editar Send de texto",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Editar Send de ficheiro",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Ver credencial",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Ver cartão",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Ver identidade",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Ver nota",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Ver chave SSH",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Novo",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Selecionar método de verificação de dois passos"
   },
-  "recoveryCodeDesc": {
-    "message": "Perdeu o acesso a todos os seus fornecedores de verificação de dois passos? Utilize o seu código de recuperação para desativar todos os fornecedores de verificação de dois passos da sua conta."
-  },
   "recoveryCodeTitle": {
     "message": "Código de recuperação"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Alterar o idioma utilizado pelo cofre web."
   },
-  "enableFavicon": {
-    "message": "Mostrar ícones do site"
-  },
-  "faviconDesc": {
-    "message": "Mostrar uma imagem reconhecível junto a cada credencial."
+  "showIconsChangePasswordUrls": {
+    "message": "Mostrar ícones de sites e recuperar URLs de alteração de palavra-passe"
   },
   "default": {
     "message": "Predefinido"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Devido a uma política empresarial, está impedido de guardar itens no seu cofre pessoal. Altere a opção Propriedade para uma organização e escolha entre as coleções disponíveis."
   },
+  "desktopAutotypePolicy": {
+    "message": "Definição predefinida da digitação automática no computador"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Ativar a digitação automática no computador por defeito para os membros. Os membros podem desativar manualmente a escrita automática no cliente Desktop.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remover Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO desativado"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ deve iniciar sessão com o início de sessão único",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector ativado"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Acesso negado. Não tem permissão para ver esta página."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Desativado"
   },
+  "connected": {
+    "message": "Ligado"
+  },
   "members": {
     "message": "Membros"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,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",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Atribuir"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Atribuir às coleções"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "ID do dispositivo em falta"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Atualizar $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Lançar o guia de implementação da $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Token de portador"
   },
+  "repositoryNameHint": {
+    "message": "Nome do repositório para ingestão"
+  },
   "index": {
     "message": "Índice"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Saiba mais sobre a API do Bitwarden"
   },
-  "fileSend": {
-    "message": "Send de ficheiro"
-  },
   "fileSends": {
     "message": "Sends de ficheiros"
   },
-  "textSend": {
-    "message": "Send de texto"
-  },
   "textSends": {
     "message": "Sends de texto"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Alterar palavra-passe em risco"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Esta credencial está em risco e não tem um site. Adicione um site e altere a palavra-passe para uma segurança mais forte."
+  },
+  "missingWebsite": {
+    "message": "Site em falta"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remover o desbloqueio com PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "As organizações gratuitas podem ter até 2 coleções. Atualize para um plano pago para adicionar mais coleções."
   },
+  "searchArchive": {
+    "message": "Procurar no arquivo"
+  },
+  "archiveNoun": {
+    "message": "Arquivo",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arquivar",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Nenhum item no arquivo"
+  },
+  "archivedItemsDescription": {
+    "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."
+  },
   "businessUnit": {
     "message": "Unidade de negócio"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Extensão Bitwarden instalada!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Abrir a extensão Bitwarden"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "A extensão Bitwarden está instalada! Abra a extensão para iniciar sessão e começar o preenchimento automático."
+  },
   "openExtensionToAutofill": {
     "message": "Abra a extensão para iniciar sessão e começar o preenchimento automático."
   },
@@ -11071,6 +11403,12 @@
     "message": "Endereço de faturação necessário para adicionar crédito.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "Acerca desta definição"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "O Bitwarden utilizará os URIs de credenciais guardadas para identificar qual o ícone ou URL de alteração de palavra-passe que deve ser utilizado para melhorar a sua experiência. Nenhuma informação é recolhida ou guardada quando utiliza este serviço."
+  },
   "billingAddress": {
     "message": "Endereço de faturação"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirmar o domínio do Key Connector"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "O pagamento com uma conta bancária só está disponível para clientes nos Estados Unidos. Ser-lhe-á pedido que verifique a sua conta bancária. Efetuaremos um micro-depósito nos próximos 1-2 dias úteis. A não verificação da conta bancária resultará na perda de um pagamento e na suspensão da subscrição."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Efetuámos um micro-depósito na sua conta bancária. Isto pode demorar 1-2 dias úteis. Quando vir o depósito na sua conta, pode verificar a sua conta bancária. A não verificação da sua conta bancária resultará na falta de pagamento e a sua subscrição será suspensa."
+  },
+  "verifyNow": {
+    "message": "Verificar agora."
+  },
+  "additionalStorageGB": {
+    "message": "Armazenamento adicional (GB)"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Contas automáticas adicionais"
+  },
+  "secretsManagerSeats": {
+    "message": "Lugares do Gestor de Segredos"
+  },
+  "additionalStorage": {
+    "message": "Armazenamento adicional"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expandir os detalhes da compra"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Recolher os detalhes da compra"
+  },
+  "familiesMembership": {
+    "message": "Adesão familiar"
+  },
+  "planDescPremium": {
+    "message": "Segurança total online"
+  },
+  "planDescFamiliesV2": {
+    "message": "Segurança de topo para a sua família"
+  },
+  "planDescFreeV2": {
+    "message": "Partilhar com $COUNT$ outro utilizador",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Capacidades avançadas para qualquer organização"
+  },
+  "planNameCustom": {
+    "message": "Plano personalizado"
+  },
+  "planDescCustom": {
+    "message": "O Bitwarden é dimensionado para empresas de todos os tamanhos para proteger palavras-passe e informações confidenciais. Se faz parte de uma grande empresa, contacte o departamento de vendas para solicitar um orçamento."
+  },
+  "builtInAuthenticator": {
+    "message": "Autenticador incorporado"
+  },
+  "breachMonitoring": {
+    "message": "Monitorização de violações"
+  },
+  "andMoreFeatures": {
+    "message": "E muito mais!"
+  },
+  "secureFileStorage": {
+    "message": "Armazenamento seguro de ficheiros"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Partilha ilimitada - escolha quem vê o quê"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Coleções familiares ilimitadas"
+  },
+  "familiesSharedStorage": {
+    "message": "Armazenamento partilhado para informações importantes da família"
+  },
+  "limitedUsersV2": {
+    "message": "Até $COUNT$ membros",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Até $COUNT$ coleções",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Sempre gratuito"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 segredos"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ projeto(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Partilha segura de itens"
+  },
+  "scimSupport": {
+    "message": "Suporte SCIM"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ contas automáticas",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Políticas de segurança da empresa"
+  },
+  "selfHostOption": {
+    "message": "Opção de auto-hospedagem"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Plano familiar gratuito para todos os utilizadores"
+  },
+  "strengthenCybersecurity": {
+    "message": "Cibersegurança reforçada"
+  },
+  "boostProductivity": {
+    "message": "Produtividade aumentada"
+  },
+  "seamlessIntegration": {
+    "message": "Integração perfeita"
   }
 }
-
diff --git a/apps/web/src/locales/ro/messages.json b/apps/web/src/locales/ro/messages.json
index 6c3532f1d9c..3296b1a3a0a 100644
--- a/apps/web/src/locales/ro/messages.json
+++ b/apps/web/src/locales/ro/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Toate aplicațiile"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "Nu ai marcat nicio aplicație drept critică"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Marchează aplicațiile critice"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Marchează aplicația drept critică"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Ce fel de articol este acesta?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Afișare articol"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nou",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Ați pierdut accesul la toți furnizorii de autentificare în două etape? Folosiți codul de recuperare pentru a dezactiva toți acești furnizori din contul dvs."
-  },
   "recoveryCodeTitle": {
     "message": "Cod de recuperare"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Alegeți limba în care folosiți seiful web."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Implicit"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Din cauza unei politici de Întreprindere, nu puteți salva articole în seiful dvs. individual. Schimbați opțiunea de proprietate la o organizație și alegeți din colecțiile disponibile."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Înlăturare Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO a fost activat"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Conector cheie activat"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Acces refuzat. Nu aveți permisiunea de a vizualiza această pagină."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/ru/messages.json b/apps/web/src/locales/ru/messages.json
index c34e78b45a8..8db4da0c6ca 100644
--- a/apps/web/src/locales/ru/messages.json
+++ b/apps/web/src/locales/ru/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Все приложения"
   },
+  "activity": {
+    "message": "Активность"
+  },
   "appLogoLabel": {
     "message": "Логотип Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Создать новый логин"
   },
+  "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": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Уведомленные участники ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "По мере сохранения пользователями логинов, здесь отображаются приложения, с подверженными риску паролями. Отметьте критичные приложения и уведомите пользователей об необходимости обновления пароля."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "Вы не отметили ни одного приложения в качестве критичного"
   },
-  "noCriticalAppsDescription": {
-    "message": "Выберите наиболее важные приложения, чтобы обнаружить пароли, подверженные риску, и уведомить пользователей о необходимости сменить эти пароли."
+  "noCriticalApplicationsDescription": {
+    "message": "Выберите наиболее критичные приложения, чтобы определить приоритетность действий по обеспечению безопасности для ваших пользователей при обработке паролей, подверженных риску."
   },
-  "markCriticalApps": {
-    "message": "Отметить критичные приложения"
+  "markCriticalApplications": {
+    "message": "Выбрать критичные приложения"
   },
   "markAppAsCritical": {
     "message": "Пометить приложение как критическое"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Участники группы риска"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Пользователи повышенного риска ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Снять отметку критического"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Отметка критического приложения успешно снята"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Приложение больше не является критичным"
   },
   "whatTypeOfItem": {
     "message": "Выберите тип элемента"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Просмотр элемента"
   },
-  "newItemHeader": {
-    "message": "Новый $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Новый логин",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Изменить $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Новая карта",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Просмотр $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Новая личная информация",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Новая заметка",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Новый ключ SSH",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Новая текстовая Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Новая файловая Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Изменить логин",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Редактировать карту",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Редактировать личную информацию",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Редактировать заметку",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Редактировать ключ SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Изменить тестовую Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Изменить файловую Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Просмотр логина",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Просмотр карты",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Просмотр личной информации",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Просмотр заметки",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Просмотр ключа SSH",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Новый",
@@ -1395,6 +1542,15 @@
   "invalidMasterPassword": {
     "message": "Неверный мастер-пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неверный мастер-пароль. Подтвердите, что ваш адрес email указан верно и ваш аккаунт был создан на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Неверный пароль к файлу. Используйте пароль, введенный при создании файла экспорта."
   },
@@ -1404,6 +1560,30 @@
   "noItemsInList": {
     "message": "Нет элементов для отображения."
   },
+  "noItemsInTrash": {
+    "message": "Нет элементов в корзине"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Элементы, которые вы удаляете, появятся здесь и будут удалены навсегда через 30 дней"
+  },
+  "noItemsInVault": {
+    "message": "В хранилище нет элементов"
+  },
+  "emptyVaultDescription": {
+    "message": "Хранилище защищает не только ваши пароли. Логины, идентификаторы, карты и заметки в нем надежно защищены."
+  },
+  "emptyFavorites": {
+    "message": "В избранном нет элементов"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Добавляйте часто используемые элементы в избранное для быстрого доступа."
+  },
+  "noSearchResults": {
+    "message": "Поиск не дал результатов"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Очистите фильтры или попробуйте другой поисковый запрос"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "У вас нет разрешения на просмотр всех элементов этой коллекции."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Выбрать другой метод двухэтапной аутентификации"
   },
-  "recoveryCodeDesc": {
-    "message": "Потеряли доступ ко всем вариантам двухэтапной аутентификации? Используйте код восстановления, чтобы отключить ее для вашего аккаунта."
-  },
   "recoveryCodeTitle": {
     "message": "Код восстановления"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Изменение языка, используемого веб-хранилищем."
   },
-  "enableFavicon": {
-    "message": "Показать значки сайтов"
-  },
-  "faviconDesc": {
-    "message": "Отображать узнаваемое изображение рядом с каждым логином."
+  "showIconsChangePasswordUrls": {
+    "message": "Показывать значки сайтов и извлекать URL изменения пароля"
   },
   "default": {
     "message": "По умолчанию"
@@ -4702,6 +4876,12 @@
   "organizationIsDisabled": {
     "message": "Организация приостановлена"
   },
+  "organizationIsSuspended": {
+    "message": "Организация приостановлена"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Доступ к элементам в отключенных организациях невозможен. Обратитесь за помощью к владельцу организации."
+  },
   "secretsAccessSuspended": {
     "message": "Доступ к отключенным организациям невозможен. Обратитесь за помощью к владельцу организации."
   },
@@ -4714,9 +4894,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Сервисные аккаунты не могут быть созданы в отключенных организациях. Обратитесь за помощью к владельцу организации."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Доступ к элементам в отключенных организациях невозможен. Обратитесь за помощью к владельцу организации."
-  },
   "licenseIsExpired": {
     "message": "Срок действия лицензии истек."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "В соответствии с корпоративной политикой вам запрещено сохранять элементы в личном хранилище. Измените владельца на организацию и выберите из доступных Коллекций."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Отключить Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO отключен"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ должен авторизоваться с использованием SSO",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Соединитель ключей активирован"
   },
@@ -6889,6 +7086,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Будет экспортировано только хранилище организации, связанное с $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Будет экспортировано только хранилище организации, связанное с $ORGANIZATION$. Коллекции Мои элементы включены не будут.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Доступ запрещен. У вас нет разрешения на просмотр этой страницы."
   },
@@ -7043,6 +7258,9 @@
   "unknownSecret": {
     "message": "Неизвестный секрет. Вам может потребоваться запросить разрешение на доступ к этому секрету."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Неизвестный проект. Вам может потребоваться запросить разрешение на доступ к этому проекту."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Выкл"
   },
+  "connected": {
+    "message": "Подключено"
+  },
   "members": {
     "message": "Участники"
   },
@@ -8287,12 +8508,6 @@
   "groupSlashUser": {
     "message": "Группа/Пользователь"
   },
-  "lowKdfIterations": {
-    "message": "Низкие итерации KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Обновите настройки шифрования в соответствии с новыми рекомендациями по безопасности и улучшите защиту аккаунта."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "При продолжении все активные сессии будут завершены. Вам потребуется авторизоваться повторно и выполнить двухэтапную аутентификацию, если она включена. Мы рекомендуем экспортировать хранилище перед изменением настроек шифрования, чтобы предотвратить потерю данных."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Получен доступ к проекту с ID: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Изменен проект с идентификатором: $PROJECT_ID$",
     "placeholders": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Назначить"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Назначить коллекциям"
   },
@@ -9666,6 +9963,12 @@
   "failedToSaveIntegration": {
     "message": "Не удалось сохранить интеграцию. Пожалуйста, повторите попытку позже."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Для выполнения этого действия вы должны быть владельцем организации."
+  },
+  "failedToDeleteIntegration": {
+    "message": "Не удалось удалить интеграцию. Пожалуйста, повторите попытку позже."
+  },
   "deviceIdMissing": {
     "message": "ID устройства отсутствует"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Обновить $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Запустить руководство по внедрению $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Токен на предъявителя"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Индекс"
   },
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Низкое количество итераций KDF. Увеличьте количество итераций, чтобы повысить защищенность вашего аккаунта."
-  },
-  "changeKDFSettings": {
-    "message": "Изменить параметры KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Защитите вашу инфраструктуру"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Узнайте больше об API Bitwarden"
   },
-  "fileSend": {
-    "message": "Файловая Send"
-  },
   "fileSends": {
     "message": "Файловая Send"
   },
-  "textSend": {
-    "message": "Текстовая Send"
-  },
   "textSends": {
     "message": "Текстовая Send"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Изменить пароль, подверженный риску"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Отключить разблокировку PIN-кодом"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "В бесплатных организациях может быть до 2 коллекций. Перейдите на платный план, чтобы добавить больше коллекций."
   },
+  "searchArchive": {
+    "message": "Поиск в архиве"
+  },
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архивировать",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "В архиве нет элементов"
+  },
+  "archivedItemsDescription": {
+    "message": "Архивированные элементы появятся здесь и будут исключены из общих результатов поиска и предложений автозаполнения."
+  },
   "businessUnit": {
     "message": "Бизнес-единица"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Расширение Bitwarden установлено!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Открыть расширение Bitwarden"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "Расширение Bitwarden установлено! Откройте расширение, чтобы авторизоваться и начать автозаполнение."
+  },
   "openExtensionToAutofill": {
     "message": "Откройте расширение, чтобы авторизоваться и начать использовать автозаполнение."
   },
@@ -11071,6 +11403,12 @@
     "message": "Для пополнения счета необходим платежный адрес.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "Об этой настройке"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden будет использовать сохраненные URI логинов, чтобы определить, какой значок или URL для смены пароля следует использовать для улучшения вашего взаимодействия. При использовании этого сервиса никакая информация не собирается и не сохраняется."
+  },
   "billingAddress": {
     "message": "Платежный адрес"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Подтвердите домен соединителя ключей"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Оплата с помощью банковского счета доступна только для клиентов в США. Вам потребуется подтвердить свой банковский счет. Мы сделаем микродепозит в течение следующих 1-2 рабочих дней. Неподтверждение банковского счета приведет к пропуску платежа и приостановке подписки."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Мы перевели микродепозит на ваш банковский счет. Это может занять 1-2 рабочих дня. Когда увидите пополнение вашего счета, вы сможете подтвердить его. Если вы не подтвердите банковский счет, это приведет к пропуску платежа и приостановке подписки."
+  },
+  "verifyNow": {
+    "message": "Подтвердить сейчас."
+  },
+  "additionalStorageGB": {
+    "message": "Дополнительные ГБ хранилища"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Дополнительные аккаунты компьютеров"
+  },
+  "secretsManagerSeats": {
+    "message": "Места менеджера секретов"
+  },
+  "additionalStorage": {
+    "message": "Дополнительное хранилище"
+  },
+  "expandPurchaseDetails": {
+    "message": "Отобразить информацию о покупке"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Скрыть информацию о покупке"
+  },
+  "familiesMembership": {
+    "message": "Членство Families"
+  },
+  "planDescPremium": {
+    "message": "Полная онлайн-защищенность"
+  },
+  "planDescFamiliesV2": {
+    "message": "Премиальная защищенность \n для вашей семьи"
+  },
+  "planDescFreeV2": {
+    "message": "Поделиться с другими пользователями: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Расширенные возможности для любой организации"
+  },
+  "planNameCustom": {
+    "message": "Индивидуальный план"
+  },
+  "planDescCustom": {
+    "message": "Bitwarden сотрудничает с компаниями любого размера, чтобы обеспечить защищенность паролей и конфиденциальной информации. Если вы являетесь частью крупного предприятия, обратитесь в отдел продаж, чтобы запросить ценовое предложение."
+  },
+  "builtInAuthenticator": {
+    "message": "Встроенный аутентификатор"
+  },
+  "breachMonitoring": {
+    "message": "Мониторинг нарушений"
+  },
+  "andMoreFeatures": {
+    "message": "И многое другое!"
+  },
+  "secureFileStorage": {
+    "message": "Защищенное хранилище файлов"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Неограниченный доступ - выбирайте, кто и что видит"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Неограниченные семейные коллекции"
+  },
+  "familiesSharedStorage": {
+    "message": "Общее хранилище для важной семейной информации"
+  },
+  "limitedUsersV2": {
+    "message": "До $COUNT$ участников",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "До $COUNT$ коллекций",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Всегда бесплатно"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 секрета"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ проектов",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Защищенный обмен элементами"
+  },
+  "scimSupport": {
+    "message": "Поддержка SCIM"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ аккаунтов компьютеров",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Политики безопасности предприятия"
+  },
+  "selfHostOption": {
+    "message": "Собственный хостинг"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Бесплатный семейный тариф для всех пользователей"
+  },
+  "strengthenCybersecurity": {
+    "message": "Повышение кибербезопасности"
+  },
+  "boostProductivity": {
+    "message": "Повышение производительности"
+  },
+  "seamlessIntegration": {
+    "message": "Простая интеграция"
   }
 }
-
diff --git a/apps/web/src/locales/si/messages.json b/apps/web/src/locales/si/messages.json
index 15ee1dbcc77..8db4f703b7e 100644
--- a/apps/web/src/locales/si/messages.json
+++ b/apps/web/src/locales/si/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "What type of item is this?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "ප්‍රතිසාධන කේතය"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/sk/messages.json b/apps/web/src/locales/sk/messages.json
index 06647fccb9c..5bea697ab57 100644
--- a/apps/web/src/locales/sk/messages.json
+++ b/apps/web/src/locales/sk/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Všetky aplikácie"
   },
+  "activity": {
+    "message": "Aktivita"
+  },
   "appLogoLabel": {
     "message": "Logo Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Pridať novu položku s prihlásením"
   },
+  "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, they will display here."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Once you mark applications critical, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ kritických aplikácií",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ aplikácií ohrozených",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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á."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "Neoznačili ste žiadne aplikácie ako kritické"
   },
-  "noCriticalAppsDescription": {
-    "message": "Pre odhalenie ohrozených hesiel a upozornenie používateľov aby si ich zmenili vyberte vaše najkritickejšie aplikácie."
+  "noCriticalApplicationsDescription": {
+    "message": "Vyberte najviac kritické aplikácie aby ste uprednostnili bezpečnostné aktivity vašich používateľov pri riešení ohrozených hesiel."
   },
-  "markCriticalApps": {
-    "message": "Označiť kritické aplikácie"
+  "markCriticalApplications": {
+    "message": "Vybrať kritické aplikácie"
   },
   "markAppAsCritical": {
     "message": "Označiť aplikáciu ako kritickú"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Ohrozených členov"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ ohrozených členov",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Ohrození členovia ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Zrušiť označenie za kritické"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Označenie aplikácie za kritickú úspešne zrušené"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Úspešne zrušené onačenie aplikácie za kritickú"
   },
   "whatTypeOfItem": {
     "message": "Aký typ položky to je?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Zobraziť položku"
   },
-  "newItemHeader": {
-    "message": "Nové $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Nové prihlásenie",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Upraviť $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nová karta",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Zobraziť $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Nová identita",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Nová poznámka",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Nový kľúč SSH",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Nový textový Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Nový súborový Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Upraviť prihlásenie",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Upraviť kartu",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Upraviť identitu",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Upraviť poznámku",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Upraviť kľúč SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Upraviť textový Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Upraviť súborový Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Zobraziť prihlásenie",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Zobraziť kartu",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Zobraziť identitu",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Zobraziť poznámku",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Zobraziť kľúč SSH",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nový",
@@ -1395,6 +1542,15 @@
   "invalidMasterPassword": {
     "message": "Neplatné hlavné heslo"
   },
+  "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": "Neplatné heslo súboru, použite heslo, ktoré ste zadali pri vytváraní exportného súboru."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Vyberte metódu dvojstupňového prihlásenia"
   },
-  "recoveryCodeDesc": {
-    "message": "Stratili ste prístup ku všetkým vašim dvojstupňovým poskytovateľom? Použite váš záchranný kód pre vypnutie všetkých poskytovateľov vo vašom účte."
-  },
   "recoveryCodeTitle": {
     "message": "Záchranný kód"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Zmeňte východzí jazyk pre webový trezor."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Zobraziť ikony webových stránok a načítať adresy URL na zmenu hesla"
   },
   "default": {
     "message": "Predvolené"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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": "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": "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"
@@ -5487,6 +5668,13 @@
   "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."
   },
+  "desktopAutotypePolicy": {
+    "message": "Východzie nastavenie automatického vpisovania pre desktop"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Vo východzom nastavení desktopu zapnúť členom automatické vpisovanie. Členovia si môžu automatické vpisovanie vypnúť v nastaveniach desktop klienta.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Zakázať Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO zakázané"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ sa musí prihlásiť cez prihlasovací formulár spoločnosti ",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Prístup zamietnutý. Nemáte oprávnenie na zobrazenie tejto stránky."
   },
@@ -7043,6 +7258,9 @@
   "unknownSecret": {
     "message": "Neznáma položka možno potrebujete požiadať o prístup k tejto položke."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Neznámy projekt, možno potrebujete požiadať o prístup k tomuto projektu."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Vypnuté"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Členovia"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Pristúp k projektu s identifikátorom: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Upravený projekt s identifikátorom: $PROJECT_ID$",
     "placeholders": {
@@ -8432,6 +8656,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": "Odstránený projekt s identifikátorom: $PROJECT_ID$",
     "placeholders": {
@@ -9035,7 +9329,7 @@
     }
   },
   "limitCollectionCreationEnabled": {
-    "message": "Turned on Restrict collection creation setting $ID$.",
+    "message": "Zapnuté nastavenie obmedzenia vytvárania zbierky $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9044,7 +9338,7 @@
     }
   },
   "limitCollectionCreationDisabled": {
-    "message": "Turned off Restrict collection creation setting $ID$.",
+    "message": "Vypnuté nastavenie obmedzenia vytvárania zbierky $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9053,7 +9347,7 @@
     }
   },
   "limitCollectionDeletionEnabled": {
-    "message": "Turned on Restrict collection deletion setting $ID$.",
+    "message": "Zapnuté nastavenie obmedzenia vymazávania zbierky $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9062,7 +9356,7 @@
     }
   },
   "limitCollectionDeletionDisabled": {
-    "message": "Turned off Restrict collection deletion setting $ID$.",
+    "message": "Vypnuté nastavenie obmedzenia vymazávania zbierky $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9071,7 +9365,7 @@
     }
   },
   "limitItemDeletionEnabled": {
-    "message": "Turned on Restrict item deletion setting $ID$.",
+    "message": "Zapnuté nastavenie obmedzenia vymazávania položky $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9080,7 +9374,7 @@
     }
   },
   "limitItemDeletionDisabled": {
-    "message": "Turned off Restrict item deletion setting $ID$.",
+    "message": "Vypnuté nastavenie obmedzenia vymazávania položky $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9089,7 +9383,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsEnabled": {
-    "message": "Turned on Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Zapnuté povolenie vlastníkov a správcov spravovať všetky položky a zbierky $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9098,7 +9392,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsDisabled": {
-    "message": "Turned off Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Vypnuté povolenie vlastníkov a správcov spravovať všetky položky a zbierky $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Prideliť"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Prideliť k zbierkam"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Chýba ID zariadenia"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Token nositeľa"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Dozvedieť sa viac o Bitwarden API"
   },
-  "fileSend": {
-    "message": "Send so súborom"
-  },
   "fileSends": {
     "message": "Sendy so súborom"
   },
-  "textSend": {
-    "message": "Textový Send"
-  },
   "textSends": {
     "message": "Textové Sendy"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Zmeniť ohrozené heslo"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Toto prihlásenie je v ohrození a chýba mu webová stránka. Pridajte webovú stránku a zmeňte heslo na silnejšie zabezpečenie."
+  },
+  "missingWebsite": {
+    "message": "Chýbajúca webová stránka"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Odstrániť odomknutie PIN kódom"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Bezplatné organizácie môžu mat maximálne dve zbierky. Ak chcete pridať viac zbierok povýšte na platené predplatné."
   },
+  "searchArchive": {
+    "message": "Prehľadať archív"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Žiadne položky v archíve"
+  },
+  "archivedItemsDescription": {
+    "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."
+  },
   "businessUnit": {
     "message": "Organizačná jednotka"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Rozšírenie Bitwarden nainštalované!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Otvorte rozšírenie, prihláste sa a začnite automatické vypĺňanie."
   },
@@ -11071,6 +11403,12 @@
     "message": "Na pridanie kreditu je potrebná fakturačná adresa.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "O tomto nastavení"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden použije uložené prihlasovacie URI na určenie ikony alebo adresy URL na zmenu hesla, ktoré by sa mali použiť na zlepšenie vášho zážitku. Pri používaní tejto služby sa nezbierajú ani neukladajú žiadne informácie."
+  },
   "billingAddress": {
     "message": "Fakturačná adresa"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Potvrdiť doménu Key Connectora"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Platba prostredníctvom bankového účtu je dostupná len pre zákazníkov v Spojených Štátoch. Budete musieť overiť svoj bankový účet. V priebehu nasledujúcich 1-2 pracovných dní vykonáme mikro vklad. Neoverenie bankového účtu bude mať za následok neuskutočnenie platby a pozastavenie vášho predplatného."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Na váš bankový účet sme vykonali mikro vklad. Môže to trvať 1-2 pracovné dni. Keď uvidíte vklad na vašom účte, môžete váš účet overiť. Neoverenie bankového účtu bude mať za následok neuskutočnenie platby a pozastavenie vášho predplatného."
+  },
+  "verifyNow": {
+    "message": "Overiť teraz."
+  },
+  "additionalStorageGB": {
+    "message": "Dodatočné úložisko GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Dodatočné strojové účty"
+  },
+  "secretsManagerSeats": {
+    "message": "Sedenia pre Secrets Manager"
+  },
+  "additionalStorage": {
+    "message": "Dodatočné úložisko"
+  },
+  "expandPurchaseDetails": {
+    "message": "Rozbaliť detaily nákupu"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Zložiť detaily nákupu"
+  },
+  "familiesMembership": {
+    "message": "Členstvo pre rodiny"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/sl/messages.json b/apps/web/src/locales/sl/messages.json
index 3cccdaa5261..f0acd2ca34b 100644
--- a/apps/web/src/locales/sl/messages.json
+++ b/apps/web/src/locales/sl/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Vse aplikacije"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Katere vrste element je to?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Ogled elementa"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nov",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Ste izgubili dostop do vseh vaših ponudnikov dvostopenjse prijave? Uporabite svoje kode za obnovitev in tako onemogočite dvostopenjsko prijavo v svoj račun."
-  },
   "recoveryCodeTitle": {
     "message": "Koda za obnovitev"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Nastavite, v katerem jeziku uporabljate spletni trezor."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Privzeto"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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"
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/sr_CS/messages.json b/apps/web/src/locales/sr_CS/messages.json
index 3e25e856eff..1eaf8f25274 100644
--- a/apps/web/src/locales/sr_CS/messages.json
+++ b/apps/web/src/locales/sr_CS/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Sve aplikacije"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Kreirajte novu stavku za prijavu"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Obavešteni članovi ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Kog je tipa ovaj unos?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Promenite jezik veb trezora."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Podrazumevano"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/sr_CY/messages.json b/apps/web/src/locales/sr_CY/messages.json
index 50173a81d4b..e31c138121f 100644
--- a/apps/web/src/locales/sr_CY/messages.json
+++ b/apps/web/src/locales/sr_CY/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Све апликације"
   },
+  "activity": {
+    "message": "Активност"
+  },
   "appLogoLabel": {
     "message": "Bitwarden лого"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Креирајте нову ставку за пријаву"
   },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "Критичне апликације: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "Апликације у ризику: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "Лозинке у ризику: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Обавештени чланови ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "Док корисници чувају пријаве, апликације се појављују овде, приказујући све ризичне лозинке. Означите критичне апликације и обавестите кориснике да ажурирају лозинке."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "Нисте означили ниједну апликацију као критичну"
   },
-  "noCriticalAppsDescription": {
-    "message": "Изаберите своје најкритичније апликације да бисте открили ризичне лозинке и обавестите кориснике да промене те лозинке."
+  "noCriticalApplicationsDescription": {
+    "message": "Изаберите своје најкритичније апликације да бисте приоритизовали безбедносне акције за своје кориснике и решили проблеме са угроженим лозинкама."
   },
-  "markCriticalApps": {
-    "message": "Означите критичне апликације"
+  "markCriticalApplications": {
+    "message": "Изаберите критичне апликације"
   },
   "markAppAsCritical": {
     "message": "Означите апликацију као критичну"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Чланови под ризиком"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Чланови са приступом за угрожене ставке критичних апликација"
+  },
+  "membersAtRiskCount": {
+    "message": "Угрожени чланови: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Ризични чланови ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Уклони као критично"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Успешно уклоњена ознака са критичне апликације"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Успешно неозначена апликација као критична"
   },
   "whatTypeOfItem": {
     "message": "Који је ово тип елемента?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Види ставку"
   },
-  "newItemHeader": {
-    "message": "Нови $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Ново пријављивање",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Уреди $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Нова картица",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Видети $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Нови идентитет",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Нова белешка",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Нов SSH кљич",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Нови текст Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Нова датотека Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Уреди пријаву",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Уреди картицу",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Уреди идентитет",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Уреди белешку",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Уреди SSH кључ",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Уреди текст Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Уреди датотеку Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Преглед пријаве",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Преглед картице",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Преглед идентитета",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Преглед белешке",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Преглед SSH кључа",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Ново/а",
@@ -1395,6 +1542,15 @@
   "invalidMasterPassword": {
     "message": "Погрешна главна лозинка"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неважећа главна лозинка. Потврдите да је ваш имејл тачан и ваш рачун је креиран на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Неважећа лозинка за датотеку, користите лозинку коју сте унели када сте креирали датотеку за извоз."
   },
@@ -1404,6 +1560,30 @@
   "noItemsInList": {
     "message": "Нама ставке у листи."
   },
+  "noItemsInTrash": {
+    "message": "Нема ставки у смећу"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Ставке које избришете ће се појавити овде и биће трајно избрисане након 30 дана"
+  },
+  "noItemsInVault": {
+    "message": "Сеф је празан"
+  },
+  "emptyVaultDescription": {
+    "message": "Сеф штити више од само ваших лозинки. Овде безбедно чувајте безбедне пријаве, личне карте, картице и белешке."
+  },
+  "emptyFavorites": {
+    "message": "Нисте фаворизовали никакве ставке"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Додајте често кориштене ставке у фаворите за брз приступ."
+  },
+  "noSearchResults": {
+    "message": "Нема резултата претраге"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Обришите филтере или покушајте са другим термином"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Немате дозволу да видите све ставке у овој колекцији."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Одабрати методу пријављивања у два корака"
   },
-  "recoveryCodeDesc": {
-    "message": "Изгубили сте приступ свим својим двофакторским добављачима? Употребите код за опоравак да онемогућите све двофакторске добављаче из налога."
-  },
   "recoveryCodeTitle": {
     "message": "Шифра за опоравак"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Променити језик за Сеф."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Прикажи иконе веб локација и преузмите линкове промене лозинке"
   },
   "default": {
     "message": "Подразумевано"
@@ -4702,6 +4876,12 @@
   "organizationIsDisabled": {
     "message": "Организација је онемогућена."
   },
+  "organizationIsSuspended": {
+    "message": "Организација је онемогућена"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Суспендованим организацијама се не може приступити. За помоћ контактирајте власника своје организације."
   },
@@ -4714,9 +4894,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Сервисни налози се не могу креирати у суспендованим организацијама. За помоћ контактирајте власника своје организације."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Није могуће приступити ставкама у онемогућене организације. Обратите се власнику организације за помоћ."
-  },
   "licenseIsExpired": {
     "message": "Лиценца је истекла."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Због смерница за предузећа, ограничено вам је чување предмета у вашем личном трезору. Промените опцију власништва у организацију и изаберите из доступних колекција."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Онемогући слање"
   },
@@ -6451,7 +6639,7 @@
     "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."
@@ -6493,7 +6681,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$",
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO онемогућен"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Омогућити Key Connector"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Одбијен приступ. Немате дозволу да видите ову страницу."
   },
@@ -7043,6 +7258,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."
   },
@@ -7303,7 +7521,7 @@
     "message": "Променити кључ"
   },
   "scimApiKey": {
-    "message": "SCIM API key",
+    "message": "SCIM API кључ",
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "copyScimUrl": {
@@ -7347,7 +7565,7 @@
     }
   },
   "inputForbiddenCharacters": {
-    "message": "The following characters are not allowed: $CHARACTERS$",
+    "message": "Следећи знакови нису дозвољени: $CHARACTERS$",
     "placeholders": {
       "characters": {
         "content": "$1",
@@ -7413,10 +7631,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": "Следите наведене кораке да бисте завршили пријаву са својим безбедносним кључем."
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Искључено"
   },
+  "connected": {
+    "message": "Повезано"
+  },
   "members": {
     "message": "Чланови"
   },
@@ -8287,12 +8508,6 @@
   "groupSlashUser": {
     "message": "Група/Корисник"
   },
-  "lowKdfIterations": {
-    "message": "Ниска KDF понављања"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Ажурирајте подешавања шифровања да бисте испунили нове безбедносне препоруке и побољшали заштиту налога."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Ако наставите, одјавићете се са свих активних сесија. Мораћете поново да се пријавите и завршитепријаве у два корака, ако имате. Препоручујемо да извезете трезор пре него што промените подешавања шифровања да бисте спречили губитак података."
   },
@@ -8300,7 +8515,7 @@
     "message": "Менаџер тајни"
   },
   "secretsManagerAccessDescription": {
-    "message": "Activate user access to Secrets Manager."
+    "message": "Активирај приступ кориснику Secrets Manager-у."
   },
   "userAccessSecretsManagerGA": {
     "message": "Овај корисник може приступити Менаџеру Тајни"
@@ -8370,7 +8585,7 @@
     }
   },
   "permanentlyDeletedSecretWithId": {
-    "message": "Permanently deleted a secret with identifier: $SECRET_ID$",
+    "message": "Тајна трајно избрисана са идентификатором: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8379,7 +8594,7 @@
     }
   },
   "restoredSecretWithId": {
-    "message": "Restored a secret with identifier: $SECRET_ID$",
+    "message": "Тајна враћена са идентификатором: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Приступљен пројекат са ИД: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8406,7 +8621,7 @@
     }
   },
   "nameUnavailableProjectDeleted": {
-    "message": "Deleted project Id: $PROJECT_ID$",
+    "message": "Избрисан ИД пројекта: $PROJECT_ID$",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8415,7 +8630,7 @@
     }
   },
   "nameUnavailableSecretDeleted": {
-    "message": "Deleted secret Id: $SECRET_ID$",
+    "message": "Избрисан ИД тајне: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8423,8 +8638,17 @@
       }
     }
   },
+  "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$",
+    "message": "Уређен пројекат са ИД: $PROJECT_ID$",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8432,8 +8656,78 @@
       }
     }
   },
+  "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$",
+    "message": "Избрисан пројекат са ИД: $PROJECT_ID$",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8442,7 +8736,7 @@
     }
   },
   "createdProjectWithId": {
-    "message": "Created a new project with identifier: $PROJECT_ID$",
+    "message": "Креирај нови пројекат са ИД: $PROJECT_ID$",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8599,7 +8893,7 @@
     "message": "Пријава је покренута"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Remember this device to make future logins seamless"
+    "message": "Запамтити овај уређај да би будуће пријаве биле беспрекорне"
   },
   "deviceApprovalRequired": {
     "message": "Потребно је одобрење уређаја. Изаберите опцију одобрења испод:"
@@ -8852,7 +9146,7 @@
     "message": "Недостаје имејл корисника"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "Имејл активног корисника није пронађен. Одјављивање."
   },
   "deviceTrusted": {
     "message": "Уређај поуздан"
@@ -8861,7 +9155,7 @@
     "message": "Позови кориснике"
   },
   "secretsManagerForPlan": {
-    "message": "Secrets Manager for $PLAN$",
+    "message": "Secrets Manager за $PLAN$",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Додели"
   },
+  "assignTasks": {
+    "message": "Додели задатке"
+  },
   "assignToCollections": {
     "message": "Додели колекцијама"
   },
@@ -9275,10 +9572,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": "Изаберите колекције за доделу"
@@ -9666,6 +9963,12 @@
   "failedToSaveIntegration": {
     "message": "Није успело сачувавање интеграције. Покушајте поново касније."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
+  "failedToDeleteIntegration": {
+    "message": "Failed to delete integration. Please try again later."
+  },
   "deviceIdMissing": {
     "message": "Недостаје ИД уређаја"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Ажурирај $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Покренути $INTEGRATION$ водич за имплементацију.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Токен носиоца"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Индекс"
   },
@@ -9875,7 +10190,7 @@
     "message": "Управљени провајдери сервиса"
   },
   "managedServiceProvider": {
-    "message": "Managed service provider"
+    "message": "Управљачки провајдер сервиса"
   },
   "multiOrganizationEnterprise": {
     "message": "Multi-organization enterprise"
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Ниске KDF итерације. Повећајте број понављања да бисте побољшали безбедност свог налога."
-  },
-  "changeKDFSettings": {
-    "message": "Променити KDF подешавања"
-  },
   "secureYourInfrastructure": {
     "message": "Обезбедите своју инфраструктуру"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Сазнајте више о API Bitwarden-а"
   },
-  "fileSend": {
-    "message": "Датотека „Send“"
-  },
   "fileSends": {
     "message": "Датотека „Send“"
   },
-  "textSend": {
-    "message": "Текст „Send“"
-  },
   "textSends": {
     "message": "Текст „Send“"
   },
@@ -10583,16 +10886,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"
@@ -10610,7 +10913,7 @@
     }
   },
   "domainStatusClaimed": {
-    "message": "Claimed"
+    "message": "Захтевано"
   },
   "domainStatusUnderVerification": {
     "message": "Под провером"
@@ -10662,43 +10965,43 @@
     }
   },
   "domainClaimed": {
-    "message": "Domain claimed"
+    "message": "Домен захтеван"
   },
   "organizationNameMaxLength": {
     "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": "Организација није поверљива"
   },
   "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": "Лозинка коју сте унели није тачна."
@@ -10763,7 +11066,7 @@
     "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$.",
+    "message": "Ваша претплата ће ускоро бити обновљена. Да бисте обезбедили непрекинуто пружање услуге, контактирајте $RESELLER$ ради потврде обновљења пре $RENEWAL_DATE$.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10806,7 +11109,7 @@
     }
   },
   "restartOrganizationSubscription": {
-    "message": "Organization subscription restarted"
+    "message": "Претплата организације је поново покренута"
   },
   "restartSubscription": {
     "message": "Поново покрените претплату"
@@ -10821,16 +11124,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": "Избриши је нова акција!"
   },
   "seatsRemaining": {
-    "message": "You have $REMAINING$ seats remaining out of $TOTAL$ seats assigned to this organization. Contact your provider to manage your subscription.",
+    "message": "Преостало вам је $REMAINING$ места од укупно $TOTAL$ додељених овој организацији. Контактирајте свог добављача да бисте управљали претплатом.",
     "placeholders": {
       "remaining": {
         "content": "$1",
@@ -10849,13 +11152,13 @@
     "message": "Select an organization to add to your Provider Portal."
   },
   "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",
@@ -10864,13 +11167,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",
@@ -10879,7 +11182,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",
@@ -10888,19 +11191,25 @@
     }
   },
   "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": "Променити ризичну лозинку"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Ова пријава је ризична и недостаје веб локација. Додајте веб страницу и промените лозинку за јачу сигурност."
+  },
+  "missingWebsite": {
+    "message": "Недостаје веб страница"
+  },
   "removeUnlockWithPinPolicyTitle": {
-    "message": "Remove Unlock with PIN"
+    "message": "Уклони деблокирање ПИН-кодом"
   },
   "removeUnlockWithPinPolicyDesc": {
-    "message": "Do not allow members to unlock their account with a PIN."
+    "message": "Не дозволи члановима да деблокирају свој налог помоћу ПИН-кода."
   },
   "upgradeForFullEventsMessage": {
     "message": "Извештаји догађаја се не чувају за вашу организацију. Надоградите се у плану Teams или Enterprise да бисте добили потпуни приступ извештајима догађаја организације."
@@ -10912,19 +11221,36 @@
     "message": "Ови догађаји су само примери и не одражавају стварне догађаје у вашем Bitwarden отганизацији."
   },
   "viewEvents": {
-    "message": "View Events"
+    "message": "Погледај Догађаје"
   },
   "cannotCreateCollection": {
     "message": "Бесплатне организације могу имати до 2 колекције. Надоградите на плаћени план за додавање више колекција."
   },
+  "searchArchive": {
+    "message": "Претражи архиву"
+  },
+  "archiveNoun": {
+    "message": "Архива",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архива",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Нема ставка у архиви"
+  },
+  "archivedItemsDescription": {
+    "message": "Архивиране ставке ће се овде појавити и бити искључени из општих резултата претраге и сугестија о ауто-пуњењу."
+  },
   "businessUnit": {
-    "message": "Business Unit"
+    "message": "Пословна јединица"
   },
   "businessUnits": {
-    "message": "Business Units"
+    "message": "Пословне јединице"
   },
   "newBusinessUnit": {
-    "message": "New business unit"
+    "message": "Нова пословна јединица"
   },
   "sendsTitleNoItems": {
     "message": "Шаљите бзбедно осетљиве информације",
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden екстензија инсталираана!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Отворити Bitwarden екстензију"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Отворите екстензију да бисте се пријавили и започели ауто-попуњавање."
   },
@@ -11071,6 +11403,12 @@
     "message": "Адреса за наплату је потребна за додавање кредита.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "О овом подешавању"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden ће користити сачуване URI-јеве за пријаву да би одредио коју икону или URL за промену лозинке треба користити како би побољшао ваше искуство. Никакви подаци нису сакупљени нити сачувани приликом коришћења ове услуге."
+  },
   "billingAddress": {
     "message": "Адреса рачуна"
   },
@@ -11171,7 +11509,7 @@
     "message": "Неограничене тајне и пројекте"
   },
   "providersubscriptionCanceled": {
-    "message": "Subscription canceled"
+    "message": "Претплата је отказана"
   },
   "providersubCanceledmessage": {
     "message": "To resubscribe, contact Bitwarden Customer Support."
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "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": "Уграђени аутентификатор"
+  },
+  "breachMonitoring": {
+    "message": "Праћење повreda безбедности"
+  },
+  "andMoreFeatures": {
+    "message": "И још више!"
+  },
+  "secureFileStorage": {
+    "message": "Сигурно складиштење датотека"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Неограничено дељење – изаберите ко шта може да види"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Неограничене фамилија колекције"
+  },
+  "familiesSharedStorage": {
+    "message": "Заједничко складиштење важних породичних информација"
+  },
+  "limitedUsersV2": {
+    "message": "До $COUNT$ члана/ова",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "До $COUNT$ колекција",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Увек бесплатно"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 тајне"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ пројекта",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Сигурносно дељење ставка"
+  },
+  "scimSupport": {
+    "message": "SCIM подршка"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Могућност самосталног смештаја"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Ојачајте кибербезбедност"
+  },
+  "boostProductivity": {
+    "message": "Повећајте продуктивност"
+  },
+  "seamlessIntegration": {
+    "message": "Бешавна интеграција"
   }
 }
-
diff --git a/apps/web/src/locales/sv/messages.json b/apps/web/src/locales/sv/messages.json
index 09fbafad29f..9523343079c 100644
--- a/apps/web/src/locales/sv/messages.json
+++ b/apps/web/src/locales/sv/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Alla applikationer"
   },
+  "activity": {
+    "message": "Aktivitet"
+  },
   "appLogoLabel": {
     "message": "Bitwardens logotyp"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Skapa nytt inloggningsobjekt"
   },
+  "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": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, they will display here."
+  },
+  "sendReminders": {
+    "message": "Skicka påminnelser"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Once you mark applications critical, they will display here."
+  },
+  "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$)",
     "placeholders": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ kritiska applikationer",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applikationer i riskzonen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Meddelade medlemmar ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "Du har inte markerat några applikationer som kritiska"
   },
-  "noCriticalAppsDescription": {
-    "message": "Välj ut dina mest kritiska applikationer för att upptäcka riskfyllda lösenord och meddela användarna att de ska byta lösenord."
+  "noCriticalApplicationsDescription": {
+    "message": "Välj dina mest kritiska program för att prioritera säkerhetsåtgärder för dina användare att adressera lösenord i riskzonen."
   },
-  "markCriticalApps": {
-    "message": "Markera kritiska applikationer"
+  "markCriticalApplications": {
+    "message": "Välj kritiska applikationer"
   },
   "markAppAsCritical": {
     "message": "Markera app som kritisk"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Riskutsatta medlemmar"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ medlemmar i riskzonen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Medlemmar i riskzonen ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Avmarkera som kritisk"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Kritisk applikation avmarkerades"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Avmarkerade applikation som kritisk"
   },
   "whatTypeOfItem": {
     "message": "Vilken typ av objekt är detta?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Visa objekt"
   },
-  "newItemHeader": {
-    "message": "Ny $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Ny inloggning",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Redigera $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Nytt kort",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Visa $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Ny identitet",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Ny anteckning",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Ny SSH-nyckel",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Ny textsändning",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Ny filsändning",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Redigera inloggning",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Redigera kort",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Redigera identitet",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Redigera anteckning",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Redigera SSH-nyckel",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Redigera textsändning",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Redigera filsändning",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Visa inloggning",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Visa kort",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Visa identitet",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Visa anteckning",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Visa SSH-nyckel",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Nytt",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,30 @@
   "noItemsInList": {
     "message": "Det finns inga objekt att visa."
   },
+  "noItemsInTrash": {
+    "message": "Inga objekt i papperskorgen"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Välj metod för tvåstegsinloggning"
   },
-  "recoveryCodeDesc": {
-    "message": "Förlorat åtkomst till alla dina metoder för tvåstegsverifiering? Använd din återställningskod för att inaktivera tvåstegsverifiering på ditt konto."
-  },
   "recoveryCodeTitle": {
     "message": "Återställningskod"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Ändra språket som används i webbvalvet."
   },
-  "enableFavicon": {
-    "message": "Visa webbplatsikoner"
-  },
-  "faviconDesc": {
-    "message": "Visa en igenkännbar bild bredvid varje inloggning."
+  "showIconsChangePasswordUrls": {
+    "message": "Visa webbplatsikoner och URLer för lösenordsändringar"
   },
   "default": {
     "message": "Standard"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "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"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Radera Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO inaktiverad"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ måste logga in med Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Nyckelkontakt aktiverad"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Åtkomst nekad. Du har inte behörighet att visa den här sidan."
   },
@@ -7043,6 +7258,9 @@
   "unknownSecret": {
     "message": "Okänd hemlighet, du kan behöver begära behörighet för att komma åt denna hemlighet."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Okänt projekt, du kan behöver begära behörighet för att komma åt detta projekt."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Av"
   },
+  "connected": {
+    "message": "Ansluten"
+  },
   "members": {
     "message": "Medlemmar"
   },
@@ -7582,11 +7803,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": {
@@ -7610,7 +7831,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": {
@@ -7625,7 +7846,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": {
@@ -7637,19 +7858,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",
@@ -7658,7 +7879,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",
@@ -7673,14 +7894,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": {
@@ -7733,15 +7954,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": {
@@ -8270,13 +8491,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"
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,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",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": "Tog bort ett projekt med identifieraren: $PROJECT_ID$",
     "placeholders": {
@@ -8464,7 +8758,7 @@
     "message": "Skapa ett projekt"
   },
   "createServiceAccount": {
-    "message": "Skapa ett tjänstkonto"
+    "message": "Skapa ett tjänstekonto"
   },
   "downloadThe": {
     "message": "Ladda ner",
@@ -9035,7 +9329,7 @@
     }
   },
   "limitCollectionCreationEnabled": {
-    "message": "Turned on Restrict collection creation setting $ID$.",
+    "message": "Aktiverade inställningen Begränsa skapande av samlingar för $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9044,7 +9338,7 @@
     }
   },
   "limitCollectionCreationDisabled": {
-    "message": "Turned off Restrict collection creation setting $ID$.",
+    "message": "Inaktiverade inställningen Begränsa skapande av samlingar för $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9053,7 +9347,7 @@
     }
   },
   "limitCollectionDeletionEnabled": {
-    "message": "Turned on Restrict collection deletion setting $ID$.",
+    "message": "Aktiverade inställningen Begränsa borttagning av samlingar för $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9062,7 +9356,7 @@
     }
   },
   "limitCollectionDeletionDisabled": {
-    "message": "Turned off Restrict collection deletion setting $ID$.",
+    "message": "Inaktiverade inställningen Begränsa borttagning av samlingar för $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9071,7 +9365,7 @@
     }
   },
   "limitItemDeletionEnabled": {
-    "message": "Turned on Restrict item deletion setting $ID$.",
+    "message": "Aktiverade inställningen Begränsa borttagning av objekt för $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9080,7 +9374,7 @@
     }
   },
   "limitItemDeletionDisabled": {
-    "message": "Turned off Restrict item deletion setting $ID$.",
+    "message": "Inaktiverade inställningen Begränsa borttagning av objekt för $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9089,7 +9383,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsEnabled": {
-    "message": "Turned on Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Aktiverade inställningen Tillåt ägare och administratörer att hantera alla samlingar och objekt $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9098,7 +9392,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsDisabled": {
-    "message": "Turned off Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Inaktiverade inställningen Tillåt ägare och administratörer att hantera alla samlingar och objekt $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Tilldela"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Tilldela till samlingar"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Enhetens ID saknas"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Uppdatera $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Starta implementeringsguiden för $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bärartoken"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Läs mer om Bitwardens API"
   },
-  "fileSend": {
-    "message": "Skicka fil"
-  },
   "fileSends": {
     "message": "Skicka filer"
   },
-  "textSend": {
-    "message": "Skicka text"
-  },
   "textSends": {
     "message": "Text skickas"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Ändra lösenord för riskgrupper"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Denna inloggning är i riskzonen och saknar en webbplats. Lägg till en webbplats och ändra lösenordet för starkare säkerhet."
+  },
+  "missingWebsite": {
+    "message": "Saknar webbplats"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Ta bort upplåsning med PIN-kod"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Gratisorganisationer kan ha upp till 2 samlingar. Uppgradera till en betald plan för att lägga till fler samlingar."
   },
+  "searchArchive": {
+    "message": "Sök i arkiv"
+  },
+  "archiveNoun": {
+    "message": "Arkiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arkivera",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Inga objekt i arkivet"
+  },
+  "archivedItemsDescription": {
+    "message": "Arkiverade objekt kommer att visas här och kommer att uteslutas från allmänna sökresultat och förslag för autofyll."
+  },
   "businessUnit": {
     "message": "Affärsenhet"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitvärdesförlängningen installerad!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Öppna Bitwarden-tillägget"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Öppna tillägget för att logga in och starta autofyllning."
   },
@@ -11071,6 +11403,12 @@
     "message": "Faktureringsadress krävs för att lägga till kredit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "Om denna inställning"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden använder sparade inloggnings-URI: er för att identifiera vilken ikon eller URL för lösenordsändring som ska användas för att förbättra din upplevelse. Ingen information samlas in eller sparas när du använder denna tjänst."
+  },
   "billingAddress": {
     "message": "Faktureringsadress"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Bekräfta Key Connector-domän"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Betalning med ett bankkonto är endast tillgänglig för kunder i USA. Du kommer att behöva verifiera ditt bankkonto. Vi kommer att göra en mikroinsättning inom de närmaste 1-2 arbetsdagarna. Underlåtenhet att verifiera bankkontot kommer att resultera i en missad betalning och ditt abonnemang stängs av."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Vi har gjort en mikroinsättning till ditt bankkonto. Detta kan ta 1-2 arbetsdagar. När du ser insättningen på ditt konto kan du verifiera ditt bankkonto. Underlåtenhet att verifiera ditt bankkonto resulterar i en missad betalning och ditt abonnemang kommer att stängas av."
+  },
+  "verifyNow": {
+    "message": "Verifiera nu."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Ytterligare maskinkonton"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Ytterligare lagring"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Familjemedlemskap"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premiumsäkerhet för din familj"
+  },
+  "planDescFreeV2": {
+    "message": "Dela med $COUNT$ annan användare",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Avancerade förmågor för alla organisationer"
+  },
+  "planNameCustom": {
+    "message": "Anpassad plan"
+  },
+  "planDescCustom": {
+    "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": "Inbyggd authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Intrångsmonitorering"
+  },
+  "andMoreFeatures": {
+    "message": "Och mer!"
+  },
+  "secureFileStorage": {
+    "message": "Säker fillagring"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Obegränsad delning - välj vem som ser vad"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Obegränsade familjesamlingar"
+  },
+  "familiesSharedStorage": {
+    "message": "Delad lagring för viktig familjeinformation"
+  },
+  "limitedUsersV2": {
+    "message": "Upp till $COUNT$ medlemmar",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Upp till $COUNT$ samlingar",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Alltid gratis"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 hemligheter"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ projekt",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Säker objektdelning"
+  },
+  "scimSupport": {
+    "message": "SCIM-stöd"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ maskinkonton",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Säkerhetspolicyer för företag"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Kostnadsfri familjeplan för alla användare"
+  },
+  "strengthenCybersecurity": {
+    "message": "Förbättrad cybersäkerhet"
+  },
+  "boostProductivity": {
+    "message": "Maximera produktiviteten"
+  },
+  "seamlessIntegration": {
+    "message": "Sömlös integration"
   }
 }
-
diff --git a/apps/web/src/locales/ta/messages.json b/apps/web/src/locales/ta/messages.json
index 2675c4bdb6e..e2426c2d69b 100644
--- a/apps/web/src/locales/ta/messages.json
+++ b/apps/web/src/locales/ta/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "அனைத்து பயன்பாடுகளும்"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "பிட்வார்டன் லோகோ"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "புதிய உள்நுழைவு உருப்படியை உருவாக்கவும்"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "அறிவிக்கப்பட்ட உறுப்பினர்கள் ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "பயனர்கள் உள்நுழைவுகளை சேமிக்கும்போது, ​​பயன்பாடுகள் இங்கே தோன்றி, எந்தவொரு ஆபத்தான கடவுச்சொற்களையும் காண்பிக்கும். முக்கியமான பயன்பாடுகளைக் குறியிட்டு, கடவுச்சொற்களைப் புதுப்பிக்க பயனர்களுக்குத் தெரிவிக்கவும்."
   },
-  "noCriticalAppsTitle": {
-    "message": "நீங்கள் எந்தப் பயன்பாட்டையும் முக்கியமானது என்று குறியிடவில்லை"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "ஆபத்தான கடவுச்சொற்களைக் கண்டறிய உங்கள் மிக முக்கியமான பயன்பாடுகளைத் தேர்ந்தெடுத்து, அந்தக் கடவுச்சொற்களை மாற்ற பயனர்களுக்குத் தெரிவிக்கவும்."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "முக்கியமான பயன்பாடுகளைக் குறியிடு"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "பயன்பாட்டை முக்கியமானதாகக் குறியிடு"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "ஆபத்தில் உள்ள உறுப்பினர்கள்"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "ஆபத்தில் உள்ள உறுப்பினர்கள் ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "முக்கியமானதாக இருந்து குறியீட்டை நீக்கு"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "முக்கியமான பயன்பாட்டின் குறியீடு வெற்றிகரமாக நீக்கப்பட்டது"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "இது என்ன வகை உருப்படி?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "பொருளைக் காண்"
   },
-  "newItemHeader": {
-    "message": "புதிய $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "திருத்து $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "காண் $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "புதியது",
@@ -1395,6 +1542,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": "தவறான கோப்பு கடவுச்சொல், ஏற்றுமதி கோப்பை உருவாக்கியபோது நீங்கள் உள்ளிட்ட கடவுச்சொல்லைப் பயன்படுத்தவும்."
   },
@@ -1404,6 +1560,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": "இந்தத் தொகுப்பிலுள்ள எல்லா உருப்படிகளையும் பார்க்க உங்களுக்கு அனுமதி இல்லை."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "இரு-படி உள்நுழைவு முறையைத் தேர்ந்தெடுக்கவும்"
   },
-  "recoveryCodeDesc": {
-    "message": "உங்கள் இரு-படி உள்நுழைவு வழங்குநர்கள் அனைத்திற்கும் அணுகலை இழந்தீர்களா? உங்கள் கணக்கிலிருந்து அனைத்து இரு-படி உள்நுழைவு வழங்குநர்களையும் அணைக்க உங்கள் மீட்டெடுப்பு குறியீட்டைப் பயன்படுத்தவும்."
-  },
   "recoveryCodeTitle": {
     "message": "மீட்டெடுப்பு குறியீடு"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "வெப் வால்ட் பயன்படுத்தும் மொழியை மாற்றவும்."
   },
-  "enableFavicon": {
-    "message": "வலைத்தள ஐகான்களைக் காட்டு"
-  },
-  "faviconDesc": {
-    "message": "ஒவ்வொரு உள்நுழைவுக்கும் அருகில் அடையாளம் காணக்கூடிய படத்தைக் காட்டு."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "இயல்புநிலை"
@@ -4702,6 +4876,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": "இடைநிறுத்தப்பட்ட நிறுவனங்களை அணுக முடியாது. உதவிக்கு உங்கள் நிறுவன உரிமையாளரைத் தொடர்புகொள்ளவும்."
   },
@@ -4714,9 +4894,6 @@
   "serviceAccountsCannotCreate": {
     "message": "இடைநிறுத்தப்பட்ட நிறுவனங்களில் சேவை கணக்குகளை உருவாக்க முடியாது. உதவிக்கு உங்கள் நிறுவன உரிமையாளரைத் தொடர்புகொள்ளவும்."
   },
-  "disabledOrganizationFilterError": {
-    "message": "இடைநிறுத்தப்பட்ட நிறுவனங்களில் உள்ள பொருட்களை அணுக முடியாது. உதவிக்கு உங்கள் நிறுவன உரிமையாளரைத் தொடர்புகொள்ளவும்."
-  },
   "licenseIsExpired": {
     "message": "உரிமம் காலாவதியாகிவிட்டது."
   },
@@ -5090,9 +5267,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 இணைப்பை நீக்கு"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "எண்டர்பிரைஸ் கொள்கையின் காரணமாக, உங்கள் தனிப்பட்ட வால்ட்டில் பொருட்களைச் சேமிப்பதில் இருந்து நீங்கள் கட்டுப்படுத்தப்பட்டுள்ளீர்கள். உரிமை விருப்பத்தை ஒரு நிறுவனத்திற்கு மாற்றி, கிடைக்கக்கூடிய கலெக்‌ஷன்களிலிருந்து தேர்வு செய்யவும்."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Send-ஐ அகற்று"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO இயக்கப்பட்டது"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "கீ கனெக்டர் செயல்படுத்தப்பட்டது"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "அணுகல் மறுக்கப்பட்டது. இந்தப் பக்கத்தைப் பார்க்க உங்களுக்கு அனுமதி இல்லை."
   },
@@ -7043,6 +7258,9 @@
   "unknownSecret": {
     "message": "அறியப்படாத ரகசியம், இந்த ரகசியத்தை அணுகுவதற்கு நீங்கள் அனுமதி கோர வேண்டியிருக்கலாம்."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "அறியப்படாத திட்டம், இந்த திட்டத்தை அணுகுவதற்கு நீங்கள் அனுமதி கோர வேண்டியிருக்கலாம்."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "நிறுத்தப்பட்டது"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "உறுப்பினர்கள்"
   },
@@ -8287,12 +8508,6 @@
   "groupSlashUser": {
     "message": "குழு/பயனர்"
   },
-  "lowKdfIterations": {
-    "message": "குறைந்த KDF இட்டரேஷன்ஸ்"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "புதிய பாதுகாப்புப் பரிந்துரைகளை பூர்த்தி செய்யவும் மற்றும் கணக்கு பாதுகாப்பை மேம்படுத்தவும் உங்கள் குறியாக்க அமைப்புகளைப் புதுப்பிக்கவும்."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "தொடர்வது அனைத்து செயலில் உள்ள அமர்வுகளிலிருந்தும் உங்களை வெளியேற்றும். நீங்கள் மீண்டும் உள்நுழைய வேண்டும் மற்றும் இரண்டு-படி உள்நுழைவை முடிக்க வேண்டும், ஏதேனும் இருந்தால். தரவு இழப்பைத் தடுக்க உங்கள் குறியாக்க அமைப்புகளை மாற்றுவதற்கு முன் உங்கள் பெட்டகத்தை ஏற்றுமதி செய்யுமாறு பரிந்துரைக்கிறோம்."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "திட்டம் Id: $PROJECT_ID$ அணுகப்பட்டது.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "ஒரு திட்டத்தை திருத்தப்பட்டது: $PROJECT_ID$",
     "placeholders": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "ஒதுக்கு"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "சேகரிப்புகளுக்கு ஒதுக்கு"
   },
@@ -9666,6 +9963,12 @@
   "failedToSaveIntegration": {
     "message": "ஒருங்கிணைப்பைச் சேமிக்கத் தவறிவிட்டது. பின்னர் மீண்டும் முயற்சிக்கவும்."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
+  "failedToDeleteIntegration": {
+    "message": "Failed to delete integration. Please try again later."
+  },
   "deviceIdMissing": {
     "message": "சாதன ஐடி இல்லை"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "$INTEGRATION$ செயல்முறை வழிகாட்டியைத் தொடங்கவும்.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "பியரர் டோக்கன்"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "குறியீடு"
   },
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "குறைந்த KDF இட்டரேஷன்கள். உங்கள் கணக்கின் பாதுகாப்பை மேம்படுத்த, உங்கள் இட்டரேஷன்களை அதிகரிக்கவும்."
-  },
-  "changeKDFSettings": {
-    "message": "KDF அமைப்புகளை மாற்றவும்"
-  },
   "secureYourInfrastructure": {
     "message": "உங்கள் கட்டமைப்பைப் பாதுகாக்கவும்"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Bitwarden's API பற்றி மேலும் அறிக"
   },
-  "fileSend": {
-    "message": "கோப்பு அனுப்பு"
-  },
   "fileSends": {
     "message": "கோப்பு அனுப்புதல்கள்"
   },
-  "textSend": {
-    "message": "உரை அனுப்பு"
-  },
   "textSends": {
     "message": "உரை அனுப்புதல்கள்"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "அபாயகரமான கடவுச்சொல்லை மாற்றவும்"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "பின் குறியீட்டைக் கொண்டு திறக்கும் வசதியை அகற்று"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "இலவச நிறுவனங்களில் 2 சேகரிப்புகள் வரை இருக்கலாம். கூடுதல் சேகரிப்புகளைச் சேர்க்க கட்டணத் திட்டத்திற்கு மேம்படுத்தவும்."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "வணிகப் பிரிவு"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden நீட்டிப்பு நிறுவப்பட்டது!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "உள்நுழைந்து தானாக நிரப்பத் தொடங்க நீட்டிப்பைத் திறக்கவும்."
   },
@@ -11071,6 +11403,12 @@
     "message": "கடன் தொகையைச் சேர்க்க, பில்லிங் முகவரி தேவை.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "பில்லிங் முகவரி"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "கீ கனெக்டர் டொமைனை உறுதிப்படுத்தவும்"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/te/messages.json b/apps/web/src/locales/te/messages.json
index 6b81195467a..173520dab61 100644
--- a/apps/web/src/locales/te/messages.json
+++ b/apps/web/src/locales/te/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "What type of item is this?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "View item"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "Recovery code"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/th/messages.json b/apps/web/src/locales/th/messages.json
index 7981e14b9db..9a8958651a2 100644
--- a/apps/web/src/locales/th/messages.json
+++ b/apps/web/src/locales/th/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "All applications"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
   },
-  "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Mark critical apps"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "What type of item is this?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "ดูรายการ"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "View $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "New",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
-  },
   "recoveryCodeTitle": {
     "message": "รหัสกู้คืน"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Change the language used by the web vault."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Default"
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Remove Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO turned on"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector activated"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Off"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Members"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Learn more about Bitwarden's API"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/tr/messages.json b/apps/web/src/locales/tr/messages.json
index af099018d13..6b19e0b5fe7 100644
--- a/apps/web/src/locales/tr/messages.json
+++ b/apps/web/src/locales/tr/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Tüm uygulamalar"
   },
+  "activity": {
+    "message": "Aktivite"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logosu"
   },
@@ -21,10 +24,10 @@
     "message": "Parola Riski"
   },
   "reviewAtRiskPasswords": {
-    "message": "Uygulamalar genelinde risk altındaki parolaları (zayıf, açık veya yeniden 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."
+    "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."
   },
   "dataLastUpdated": {
-    "message": "Veri son güncellenme tarihi: $DATE$",
+    "message": "Son veri güncellemesi: $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
@@ -39,7 +42,7 @@
     "message": "Üyeleri iptal et"
   },
   "restoreMembers": {
-    "message": "Üyeleri geri yükle"
+    "message": "Üyeleri geri getir"
   },
   "cannotRestoreAccessError": {
     "message": "Kuruluş erişimi geri yüklenemiyor"
@@ -54,7 +57,63 @@
     }
   },
   "createNewLoginItem": {
-    "message": "Yeni giriş öğesi oluşturun"
+    "message": "Yeni hesap kaydı oluştur"
+  },
+  "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, they will display here."
+  },
+  "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$)",
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ kritik uygulama",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Bildirilen üyeler ($COUNT$)",
     "placeholders": {
@@ -75,7 +161,7 @@
     }
   },
   "noAppsInOrgTitle": {
-    "message": "$ORG NAME$'de hiçbir uygulama bulunmadı",
+    "message": "$ORG NAME$ kuruluşunda hiçbir uygulama bulunmadı",
     "placeholders": {
       "org name": {
         "content": "$1",
@@ -84,16 +170,16 @@
     }
   },
   "noAppsInOrgDescription": {
-    "message": "Kullanıcılar oturum açma bilgilerini kaydettikçe, uygulamalar burada görünür ve risk altındaki parolaları gösterir. Kritik uygulamaları işaretleyin ve kullanıcıları parolalarını güncellemeleri için bilgilendirin."
+    "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."
   },
-  "noCriticalAppsTitle": {
+  "noCriticalApplicationsTitle": {
     "message": "Hiçbir uygulamayı kritik olarak işaretlemediniz"
   },
-  "noCriticalAppsDescription": {
-    "message": "Risk altındaki parolaları keşfetmek için en kritik uygulamalarınızı seçin ve kullanıcıları bu parolaları değiştirmeleri için bilgilendirin."
+  "noCriticalApplicationsDescription": {
+    "message": "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."
   },
-  "markCriticalApps": {
-    "message": "Kritik uygulamaları işaretleyin"
+  "markCriticalApplications": {
+    "message": "Kritik uygulamaları seçin"
   },
   "markAppAsCritical": {
     "message": "Uygulamayı kritik olarak işaretle"
@@ -114,11 +200,23 @@
     "message": "Toplam parola"
   },
   "searchApps": {
-    "message": "Uygulamaları ara"
+    "message": "Uygulama ara"
   },
   "atRiskMembers": {
     "message": "Riskli üyeler"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Kritik uygulamalar için risk altındaki kayıtlara erişimi olan üyeler"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ üye risk altında",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Risk altındaki üyeler ($COUNT$)",
     "placeholders": {
@@ -141,10 +239,10 @@
     "message": "Bu üyeler uygulamalara zayıf, ele geçirilmiş veya tekrar kullanılan parolalarla giriş yapmaktadır."
   },
   "atRiskMembersDescriptionNone": {
-    "message": "Bu üyeler zayıf, ele geçirilmiş veya tekrar kullanılan parolalarla uygulamalara giriş yapmazlar."
+    "message": "Zayıf, ele geçirilmiş veya tekrar kullanılan parolayla uygulamalara giriş yapan üye yok."
   },
   "atRiskApplicationsDescription": {
-    "message": "Bu uygulamalarda zayıf, ele geçirilmiş veya tekrar kullanılan parolalar vardır."
+    "message": "Bu uygulamalarda zayıf, ele geçirilmiş veya tekrar kullanılan parolalar var."
   },
   "atRiskApplicationsDescriptionNone": {
     "message": "Bunlar zayıf, ele geçirilmiş veya tekrar kullanılan parolalara sahip uygulamalar değildir."
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Kritik olarak işaretlemeyi kaldır"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Kritik uygulama işareti başarıyla kaldırıldı"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Uygulamanın kritik olarak işaretlenmesi başarıyla kaldırıldı"
   },
   "whatTypeOfItem": {
     "message": "Bu kaydın türü nedir?"
@@ -262,7 +360,7 @@
     "message": "Kimlik doğrulama anahtarı"
   },
   "autofillOptions": {
-    "message": "Otomatik doldurma ayarları"
+    "message": "Otomatik doldurma seçenekleri"
   },
   "websiteUri": {
     "message": "Web sitesi (URI)"
@@ -423,7 +521,7 @@
     "message": "Kimlik doğrulama anahtarı (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "2 adımlı doğrulamayı sorunsuz hale getirin"
   },
   "totpHelper": {
     "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Kaydı göster"
   },
-  "newItemHeader": {
-    "message": "Yeni $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Yeni hesap",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "$TYPE$'ı düzenle",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Yeni kart",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "$ITEMTYPE$ bilgileri",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Yeni kimlik",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Yeni not",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Yeni SSH anahtarı",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Yeni Send metni",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Yeni Send dosyası",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Hesabı düzenle",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Kartı düzenle",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Kimliği düzenle",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Notu düzenle",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "SSH anahtarını düzenle",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Send metnini düzenle",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Send dosyasını düzenle",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Hesabı göster",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Kartı göster",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Kimliği göster",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Notu göster",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "SSH anahtarını göster",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Yeni",
@@ -809,7 +956,7 @@
     "description": "Copy password to clipboard"
   },
   "copyPassphrase": {
-    "message": "Parolayı kopyala",
+    "message": "Parola cümlesini kopyala",
     "description": "Copy passphrase to clipboard"
   },
   "passwordCopied": {
@@ -1039,7 +1186,7 @@
     "message": "Erişim seviyesi"
   },
   "accessing": {
-    "message": "Erişim"
+    "message": "Erişilen konum"
   },
   "loggedOut": {
     "message": "Çıkış yapıldı"
@@ -1222,7 +1369,7 @@
     "message": "Kimlik doğrulama uygulamanızdaki kodu girin"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Kimlik doğrulamak için YubiKey’inize dokunun"
+    "message": "Kimliğinizi doğrulamak için YubiKey’inize dokunun"
   },
   "authenticationTimeout": {
     "message": "Kimlik doğrulama zaman aşımı"
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "İki aşamalı giriş yöntemini seçin"
   },
-  "recoveryCodeDesc": {
-    "message": "İki aşamalı giriş sağlayıcılarınıza ulaşamıyor musunuz? Kurtarma kodunuzu kullanarak hesabınızdaki tüm iki aşamalı giriş sağlayıcılarını devre dışı bırakabilirsiniz."
-  },
   "recoveryCodeTitle": {
     "message": "Kurtarma kodu"
   },
@@ -1914,7 +2091,7 @@
     "message": "Yeni cihaz girişi"
   },
   "turnOffNewDeviceLoginProtection": {
-    "message": "Yeni cihaz oturum açma korumasını kapatın"
+    "message": "Yeni cihaz girişi korumasını kapat"
   },
   "turnOnNewDeviceLoginProtection": {
     "message": "Yeni cihaz oturum açma korumasını açın"
@@ -1926,7 +2103,7 @@
     "message": "Yeni bir cihazdan giriş yaptığınızda Bitwarden'ın size doğrulama e-postaları göndermesi için aşağıdan devam edin."
   },
   "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": "Yeni cihaz oturum açma koruması kapalıyken, ana parolanızı bilen herkes herhangi bir cihazdan hesabınıza erişebilir. Doğrulama e-postaları olmadan hesabınızı korumak için iki adımlı oturum açma özelliğini ayarlayın."
   },
   "accountNewDeviceLoginProtectionSaved": {
     "message": "Yeni cihaz oturum açma koruması değişiklikleri kaydedildi"
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Web kasasında kullanılan dili değiştirin."
   },
-  "enableFavicon": {
-    "message": "Web sitesi simgelerini göster"
-  },
-  "faviconDesc": {
-    "message": "Hesapların yanında tanıdık görseller göster."
+  "showIconsChangePasswordUrls": {
+    "message": "Web sitesi simgelerini göster ve parola değiştirme URL'lerini al"
   },
   "default": {
     "message": "Varsayılan"
@@ -2515,7 +2689,7 @@
     "message": "İki aşamalı girişi olmayan hesaplar bulundu"
   },
   "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": "$VAULT$ kasasında iki aşamalı giriş kullanmıyor olabilecek $COUNT$ web sitesi bulduk (2fa.directory’ye göre). Bu hesapları daha iyi korumak için iki aşamalı girişi etkinleştirmelisiniz.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2543,7 +2717,7 @@
     "message": "Açığa çıkmış parolalar bulundu"
   },
   "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.",
+    "message": "$VAULT$ kasasında, bilinen veri ihlallerine maruz kalmış parolalara sahip $COUNT$ kayıt bulundu. Bu parolaları değiştirmelisiniz.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2611,7 +2785,7 @@
     "message": "Yeniden kullanılmış parolalar bulundu"
   },
   "reusedPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ passwords that are being reused in your $VAULT$. You should change them to a unique value.",
+    "message": "$VAULT$ kasasında tekrar kullanılmakta olan $COUNT$ parola bulduk. Onları benzersiz parolalarla değiştirmelisiniz.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4243,7 +4417,7 @@
     "message": "Hesabınıza normalde kullandığınız iki aşamalı giriş yöntemleriyle erişemiyorsanız iki aşamalı giriş kurtarma kodunuzu kullanarak heasbınızdaki tüm iki aşamalı giriş sağlayıcılarını kapatabilirsiniz."
   },
   "logInBelowUsingYourSingleUseRecoveryCode": {
-    "message": "Log in below using your single-use recovery code. This will turn off all two-step providers on your account."
+    "message": "Tek kullanımlık kurtarma kodunuzu kullanarak aşağıdan giriş yapın. Bu, hesabınızdaki tüm iki adımlı sağlayıcıları kapatacaktır."
   },
   "recoverAccountTwoStep": {
     "message": "Hesabı iki aşamalı girişten kurtar"
@@ -4543,7 +4717,7 @@
     }
   },
   "reorderToggleButton": {
-    "message": "Reorder $LABEL$. Use arrow key to move item up or down.",
+    "message": "$LABEL$'i yeniden sıralayın. Kayıtı yukarı veya aşağı taşımak için ok tuşunu kullanın.",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4552,7 +4726,7 @@
     }
   },
   "reorderFieldUp": {
-    "message": "$LABEL$ moved up, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ yukarı taşındı, konum: $LENGTH$'in $INDEX$'i",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4569,7 +4743,7 @@
     }
   },
   "reorderFieldDown": {
-    "message": "$LABEL$ moved down, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ aşağı taşındı, konum: $LENGTH$'in $INDEX$'i",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4702,6 +4876,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."
   },
@@ -4714,9 +4894,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."
   },
@@ -5040,7 +5217,7 @@
     "message": "Başlamak için kuruluşunuzun SSO tanımlayıcısını girin"
   },
   "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 sağlayıcınızla giriş yapmak için, başlamak üzere kuruluşunuzun SSO tanımlayıcısını girin. Yeni bir cihazdan giriş yaptığınızda bu SSO tanımlayıcısını girmeniz gerekebilir."
   },
   "enterpriseSingleSignOn": {
     "message": "Kurumsal çoklu oturum açma"
@@ -5090,9 +5267,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"
@@ -5110,13 +5291,13 @@
     "message": "Üyelerin diğer kuruluşlara katılmasını kısıtlayın."
   },
   "singleOrgPolicyDesc": {
-    "message": "Restrict members from joining other organizations. This policy is required for organizations that have enabled domain verification."
+    "message": "Üyelerin diğer kuruluşlara katılmasını kısıtlayın. Bu ilke, etki alanı doğrulamasını etkinleştirmiş kuruluşlar için gereklidir."
   },
   "singleOrgBlockCreateMessage": {
     "message": "Mevcut kuruluşunuzun birden fazla kuruluşa katılmanıza izin vermeyen bir ilkesi var. Lütfen kuruluş yöneticilerinizle iletişime geçin veya farklı bir Bitwarden hesabı açın."
   },
   "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": "Uygun olmayan üyeler, diğer tüm kuruluşlardan ayrılana kadar üyelikleri iptal edilmiş durumuna alınacaktır. Yöneticiler bu kuralın dışında tutulur ve uygunluk sağlandığında üyelerin üyeliklerini geri yükleyebilirler."
   },
   "requireSso": {
     "message": "Çoklu oturum açma kimlik doğrulamasını zorunlu tut"
@@ -5445,11 +5626,11 @@
     "message": "Kuruluş veri sahipliğini zorunlu kılın"
   },
   "organizationDataOwnershipDesc": {
-    "message": "Require all items to be owned by an organization, removing the option to store items at the account level.",
+    "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": "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 ",
+    "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.'"
   },
   "organizationDataOwnershipContentAnchor": {
@@ -5460,10 +5641,10 @@
     "message": "Devam etmek istediğinizden emin misiniz?"
   },
   "organizationDataOwnershipWarning1": {
-    "message": "will remain accessible to members"
+    "message": "üyelerin erişimine açık kalacaktır"
   },
   "organizationDataOwnershipWarning2": {
-    "message": "will not be automatically selected when creating new items"
+    "message": "yeni kayıtlar oluşturulurken otomatik olarak seçilmeyecektir"
   },
   "organizationDataOwnershipWarning3": {
     "message": "kullanıcı kapalı oluncaya kadar yönetici arayüzünden yönetilemez"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Bir kuruluş ilkesi nedeniyle kişisel kasanıza hesap kaydetmeniz kısıtlanmış. Sahip seçeneğini bir kuruluş olarak değiştirin ve mevcut koleksiyonlar arasından seçim yapın."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Send'i sil"
   },
@@ -5651,31 +5839,31 @@
     "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": "Geliştirme, DevOps ve BT ekipleri, altyapılarını ve makine sırlarını güvenli bir şekilde yönetmek ve dağıtmak için Bitwarden Sır Yöneticisi'ni seçiyor."
   },
   "centralizeSecretsManagement": {
-    "message": "Centralize secrets management."
+    "message": "Sır yönetimini merkezileştirin."
   },
   "centralizeSecretsManagementDescription": {
-    "message": "Securely store and manage secrets in one location to prevent secret sprawl across your organization."
+    "message": "Kuruluşunuz genelinde gizli bilgilerin yayılmasını önlemek için gizli bilgileri tek bir konumda güvenli bir şekilde depolayın ve yönetin (gizli bilgi = sır)."
   },
   "preventSecretLeaks": {
     "message": "Gizli sızıntıları önleyin."
   },
   "preventSecretLeaksDescription": {
-    "message": "Protect secrets with end-to-end encryption. No more hard coding secrets or sharing through .env files."
+    "message": "Uçtan uca şifreleme ile sırları koruyun. Artık zor kodlama sırları veya .env dosyaları aracılığıyla paylaşım yok."
   },
   "enhanceDeveloperProductivity": {
     "message": "Geliştirici üretkenliğini artırın."
   },
   "enhanceDeveloperProductivityDescription": {
-    "message": "Programmatically retrieve and deploy secrets at runtime so developers can focus on what matters most, like improving code quality."
+    "message": "Sırları çalışma zamanında programlı olarak alın ve dağıtın, böylece geliştiriciler kod kalitesini artırmak gibi en önemli şeylere odaklanabilirler."
   },
   "strengthenBusinessSecurity": {
     "message": "İş güvenliğini güçlendirin."
   },
   "strengthenBusinessSecurityDescription": {
-    "message": "Maintain tight control over machine and human access to secrets with SSO integrations, event logs, and access rotation."
+    "message": "SSO entegrasyonları, olay günlükleri ve erişim rotasyonu ile sırlara makine ve insan erişimi üzerinde sıkı kontrol sağlayın."
   },
   "tryItNow": {
     "message": "Şimdi deneyin"
@@ -5699,7 +5887,7 @@
     "message": "Sır Yöneticisi'ni denemek için yöneticinizden onay almanız gerekir."
   },
   "smAccessRequestEmailSent": {
-    "message": "Access request for secrets manager email sent to admins."
+    "message": "Yöneticilere gönderilen sır yöneticisi e-postası için erişim talebi."
   },
   "requestAccessSMDefaultEmailContent": {
     "message": "Selam,\n\nEkibimiz için Bitwarden Sır Yöneticisi aboneliği talep ediyorum. Desteğiniz çok anlamlı olacaktır!\n\nBitwarden Sır Yöneticisi, API anahtarları, veritabanı parolaları ve kimlik doğrulama sertifikaları gibi makine kimlik bilgilerini güvenli bir şekilde depolamak, paylaşmak ve dağıtmak için uçtan uca şifrelenmiş bir gizli bilgi yönetimi çözümüdür.\n\nSır Yöneticisi bize şu konularda yardımcı olacaktır:\n\n- Güvenliği artırmak\n- Operasyonları kolaylaştırmak\n- Maliyetli gizli bilgi sızıntılarını önlemek\n\nEkibimiz için ücretsiz deneme talep etmek için lütfen Bitwarden ile iletişime geçin.\n\nYardımlarınız için teşekkür ederiz!"
@@ -5993,7 +6181,7 @@
     "message": "Uyumlu olmayan üyeler"
   },
   "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": "Tek kuruluş veya İki aşamalı oturum açma ilkesine uymayan üyeler, ilke gerekliliklerine uymadıkları sürece geri yüklenemezler"
   },
   "fingerprint": {
     "message": "Parmak izi"
@@ -6019,7 +6207,7 @@
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "accountRecoveryManageUsers": {
-    "message": "Manage users must also be granted with the manage account recovery permission"
+    "message": "\"Hesap kurtarmayı yönet\" izniyle birlikte \"Kullanıcıları yönet\" izni de verilmelidir"
   },
   "setupProvider": {
     "message": "Sağlayıcı kurulumu"
@@ -6177,16 +6365,16 @@
     "message": "İzin verilen uygulamalar için kullanıcıların otomatik olarak oturum açması"
   },
   "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+    "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."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Kimlik sağlayıcı ana bilgisayarı"
   },
   "automaticAppLoginIdpHostDesc": {
-    "message": "Enter your identity provider host URL. Enter multiple URLs by separating with a comma."
+    "message": "Kimlik sağlayıcınızın ana bilgisayar URL'sini girin. Virgülle ayırarak birden fazla URL girin."
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
+    "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ı"
@@ -6343,7 +6531,7 @@
     "message": "Özel ad claim türleri"
   },
   "acrValues": {
-    "message": "Requested authentication context class reference values"
+    "message": "İstenen kimlik doğrulama bağlam sınıfı referans değerleri"
   },
   "expectedReturnAcrValue": {
     "message": "Yanıt olarak \"acr\" claim değeri bekleniyordu"
@@ -6424,10 +6612,10 @@
     "message": "Sponsorlu üye olmayan ailelerin planları burada görüntülenecektir"
   },
   "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": "Kuruluşunuzun üyeleri Ücretsiz Bitwarden Aileler'e hak kazanır. Bitwarden kuruluşunuzun üyesi olmayan çalışanlar için Ücretsiz Bitwarden Aileler'e sponsor olabilirsiniz. Üye olmayan bir kişiye sponsor olmak için kuruluşunuzda kullanılabilir bir yer olması gerekir."
   },
   "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": "Etkin bir sponsorluğu kaldırdığınızda, sponsorlu kuruluşun yenileme tarihinden sonra kuruluşunuzdaki bir yer boşalacaktır."
   },
   "sponsoredFamiliesEligible": {
     "message": "Siz ve aileniz Ücretsiz Bitwarden Aileleri için uygunsunuz. Verilerinizi işte olmadığınızda bile güvende tutmak için kişisel e-postanızla kullanın."
@@ -6454,10 +6642,10 @@
     "message": "Aile planlarını kullanan üyeler burada görüntülenecektir"
   },
   "membersWithSponsoredFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. Here you can see members who have sponsored a Families organization."
+    "message": "Kuruluşunuzun üyeleri, Ücretsiz Bitwarden Aileler'e hak kazanır. Burada, Aileler kuruluşuna sponsor olan üyeleri görebilirsiniz."
   },
   "organizationHasMemberMessage": {
-    "message": "A sponsorship cannot be sent to $EMAIL$ because they are a member of your organization.",
+    "message": "Kuruluşunuzun bir üyesi olduğu için $EMAIL$ adresine sponsorluk gönderilemez.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO etkinleştirildi"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ çoklu oturum açma (SSO) ile giriş yapmalıdır",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector etkinleştirildi"
   },
@@ -6772,7 +6969,7 @@
     "message": "Faturalandırma Eşitleme Anahtarı"
   },
   "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": "Otomatik eşitleme, Aileler sponsorluklarını etkinleştirir ve dosya yüklemeden lisansınızı eşitlemenizi sağlar. Bitwarden bulut sunucusunda güncellemeleri yaptıktan sonra, değişiklikleri uygulamak için Lisansı Eşitle veya Lisansı Senkronize Et seçeneğini seçin."
   },
   "active": {
     "message": "Aktif"
@@ -6842,7 +7039,7 @@
     "message": "Varlık Kimliği bir URL değilse gereklidir."
   },
   "offerNoLongerValid": {
-    "message": "This offer is no longer valid. Contact your organization administrators for more information."
+    "message": "Bu teklif artık geçerli değildir. Daha fazla bilgi için kuruluş yöneticilerinizle iletişime geçin."
   },
   "openIdOptionalCustomizations": {
     "message": "İsteğe bağlı özelleştirmeler"
@@ -6881,7 +7078,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": "Yalnızca $ORGANIZATION$ ile ilişkili kuruluş kasası dışarı aktarılacak. Kişisel kasalardaki ve diğer kuruluşlardaki kayıtlar dahil edilmeyecek.",
+    "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",
@@ -7043,6 +7258,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."
   },
@@ -7269,11 +7487,11 @@
     "description": "The text, 'SCIM', is an acronym and should not be translated."
   },
   "scimDescription": {
-    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "message": "SCIM provizyonu aracılığıyla tercih ettiğiniz kimlik sağlayıcınızla kullanıcıları ve grupları otomatik olarak sağlayın",
     "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 provizyonu aracılığıyla tercih ettiğiniz kimlik sağlayıcınızla kullanıcıları ve grupları otomatik olarak sağlayın. Desteklenen entegrasyonları bulun",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimEnabledCheckboxDesc": {
@@ -7407,16 +7625,16 @@
     }
   },
   "duoHealthCheckResultsInNullAuthUrlError": {
-    "message": "Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance."
+    "message": "Duo hizmetine bağlanırken hata oluştu. Başka bir iki aşamalı giriş yöntemi kullanın veya destek almak Duo ile iletişime geçin."
   },
   "duoRequiredByOrgForAccount": {
     "message": "Hesabınız için Duo iki adımlı giriş gereklidir."
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "Hesabınız için Duo iki adımlı giriş gereklidir. Giriş işlemini tamamlamak için aşağıdaki adımları izleyin."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "Girişi tamamlamak için aşağıdaki adımları izleyin."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
     "message": "Güvenlik anahtarınızla girişi tamamlamak için aşağıdaki adımları izleyin."
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Kapalı"
   },
+  "connected": {
+    "message": "Bağlandı"
+  },
   "members": {
     "message": "Üyeler"
   },
@@ -7832,7 +8053,7 @@
     "description": "Title for the section displaying access tokens."
   },
   "createAccessToken": {
-    "message": "Create access token",
+    "message": "Erişim anahtarı oluştur",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -7931,7 +8152,7 @@
     "message": "Kullanıcıları bu gruba ekleyerek koleksiyonlara erişim izni verin."
   },
   "restrictedCollectionAssignmentDesc": {
-    "message": "You can only assign collections you manage."
+    "message": "Yalnızca yönettiğiniz koleksiyonları atayabilirsiniz."
   },
   "selectMembers": {
     "message": "Üyeleri seçin"
@@ -8087,7 +8308,7 @@
     "message": "Grupları seçin"
   },
   "userPermissionOverrideHelperDesc": {
-    "message": "Permissions set for a member will replace permissions set by that member's group."
+    "message": "Bir üye için ayarlanan izinler, o üyenin grubu tarafından ayarlanan izinlerin yerini alacak."
   },
   "noMembersOrGroupsAdded": {
     "message": "Hiç üye veya grup eklenmedi"
@@ -8102,7 +8323,7 @@
     "message": "Üye davet et"
   },
   "addSponsorship": {
-    "message": "Add sponsorship"
+    "message": "Sponsorluk ekle"
   },
   "needsConfirmation": {
     "message": "Onay gerekli"
@@ -8135,7 +8356,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedManageBilling": {
-    "message": "Teams Starter plans may have up to $SEATCOUNT$ members. Upgrade to your plan to invite more members.",
+    "message": "Ekip Başlangıç planları en fazla $SEATCOUNT$ üyeye sahip olabilir. Daha fazla üye davet etmek için planınızı yükseltin.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8144,7 +8365,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedNoManageBilling": {
-    "message": "Teams Starter plans may have up to $SEATCOUNT$ members. Contact your organization owner to upgrade your plan and invite more members.",
+    "message": "Ekip Başlangıç planları en fazla $SEATCOUNT$ üyeye sahip olabilir. Planınızı yükseltmek ve daha fazla üye davet etmek için kuruluş sahibinizle iletişime geçin.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8192,7 +8413,7 @@
     "message": "Dosya yükleme"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Yükle"
   },
   "acceptedFormats": {
     "message": "Kabul edilen biçimler:"
@@ -8222,7 +8443,7 @@
     "message": "Elle yükleme"
   },
   "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": "Fatura eşitlemesini seçmek istemiyorsanız, lisansınızı buradan manuel olarak yükleyin. Bu, Aileler sponsorluklarını otomatik olarak açmaz."
   },
   "syncLicense": {
     "message": "Lisansı eşitle"
@@ -8287,23 +8508,17 @@
   "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": "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": "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."
   },
   "secretsManager": {
     "message": "Sır Yöneticisi"
   },
   "secretsManagerAccessDescription": {
-    "message": "Activate user access to Secrets Manager."
+    "message": "Sır Yöneticisi'ne kullanıcı erişimini etkinleştirin."
   },
   "userAccessSecretsManagerGA": {
-    "message": "This user can access Secrets Manager"
+    "message": "Bu kullanıcı Sır Yöneticisi'ne erişebilir"
   },
   "important": {
     "message": "Önemli:"
@@ -8334,7 +8549,7 @@
     "message": "İçe aktarma dosyası okunurken bir hata oluştu"
   },
   "accessedSecretWithId": {
-    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "message": "Tanımlayıcısı: $SECRET_ID$ olan bir sırra erişildi",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8352,7 +8567,7 @@
     }
   },
   "editedSecretWithId": {
-    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "message": "Tanımlayıcısı: $SECRET_ID$ olan bir sır düzenlendi",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8361,7 +8576,7 @@
     }
   },
   "deletedSecretWithId": {
-    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "message": "Tanımlayıcısı: $SECRET_ID$ olan bir sır silindi",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8370,7 +8585,7 @@
     }
   },
   "permanentlyDeletedSecretWithId": {
-    "message": "Permanently deleted a secret with identifier: $SECRET_ID$",
+    "message": "Tanımlayıcısı: $SECRET_ID$ olan bir sır kalıcı olarak silindi",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8379,7 +8594,7 @@
     }
   },
   "restoredSecretWithId": {
-    "message": "Restored a secret with identifier: $SECRET_ID$",
+    "message": "Tanımlayıcısı: $SECRET_ID$ olan bir sır geri yüklendi",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8388,7 +8603,7 @@
     }
   },
   "createdSecretWithId": {
-    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "message": "Tanımlayıcısı: $SECRET_ID$ olan yeni bir sır oluşturuldu",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8406,7 +8621,7 @@
     }
   },
   "nameUnavailableProjectDeleted": {
-    "message": "Deleted project Id: $PROJECT_ID$",
+    "message": "Proje kimliği silindi: $PROJECT_ID$",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8415,7 +8630,7 @@
     }
   },
   "nameUnavailableSecretDeleted": {
-    "message": "Deleted secret Id: $SECRET_ID$",
+    "message": "Sır kimliği silindi: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8423,8 +8638,17 @@
       }
     }
   },
+  "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$",
+    "message": "Tanımlayıcısı: $PROJECT_ID$ olan bir proje düzenlendi",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8432,8 +8656,78 @@
       }
     }
   },
+  "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$",
+    "message": "Tanımlayıcısı: $PROJECT_ID$ olan bir proje silindi",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8442,7 +8736,7 @@
     }
   },
   "createdProjectWithId": {
-    "message": "Created a new project with identifier: $PROJECT_ID$",
+    "message": "Tanımlayıcısı: $PROJECT_ID$ olan yeni bir proje oluşturuldu",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8635,31 +8929,31 @@
     "message": "Güvenilen cihazlar"
   },
   "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": "Üyeler SSO ile oturum açarken ana parolaya ihtiyaç duymayacaktır. Ana parola, cihazda depolanan bir şifreleme anahtarı ile değiştirilir ve bu cihazı güvenilir hale getirir. Bir üyenin hesabını oluşturduğu ve oturum açtığı ilk cihaz güvenilir olacaktır. Yeni cihazların mevcut bir güvenilir cihaz veya bir yönetici tarafından onaylanması gerekecektir. Bu seçenek kullanıldığında",
     "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": "tek kuruluş",
     "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": "policy,",
+    "message": "ilkesi,",
     "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": "SSO required",
+    "message": "SSO zorunlu",
     "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": "policy, and",
+    "message": "ilkesi ve",
     "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": "hesap kurtarma yönetimi",
     "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": "ilkesi bu seçenek kullanıldığında açılacaktır.",
     "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": {
@@ -8699,18 +8993,18 @@
     "message": "Kullanıcı, hesap kurtarma yoluyla verilen bir parolayı güncelledi."
   },
   "activatedAccessToSecretsManager": {
-    "message": "Activated access to Secrets Manager",
+    "message": "Sır Yöneticisi'ne erişim etkinleştirildi",
     "description": "Confirmation message that one or more users gained access to Secrets Manager"
   },
   "activateAccess": {
     "message": "Erişimi etkinleştir"
   },
   "bulkEnableSecretsManagerDescription": {
-    "message": "Grant the following members access to Secrets Manager. The role granted in the Password Manager will apply to Secrets Manager.",
+    "message": "Aşağıdaki üyelere Sır Yöneticisi için erişim izni verin. Parola Yöneticisi'nde verilen rol, Sır Yöneticisi'nde de uygulanacaktır.",
     "description": "This description is shown to an admin when they are attempting to add more users to Secrets Manager."
   },
   "activateSecretsManager": {
-    "message": "Activate Secrets Manager"
+    "message": "Sır Yöneticisi'ni Etkinleştir"
   },
   "yourOrganizationsFingerprint": {
     "message": "Kuruluşunuzun parmak izi ifadesi",
@@ -8738,16 +9032,16 @@
     "message": "İsteği onayla"
   },
   "deviceApproved": {
-    "message": "Device approved"
+    "message": "Cihaz onaylandı"
   },
   "deviceRemoved": {
-    "message": "Device removed"
+    "message": "Cihaz kaldırıldı"
   },
   "removeDevice": {
     "message": "Cihazı kaldır"
   },
   "removeDeviceConfirmation": {
-    "message": "Are you sure you want to remove this device?"
+    "message": "Cihazı kaldırmak istediğinizden emin misiniz?"
   },
   "noDeviceRequests": {
     "message": "Cihaz isteği yok"
@@ -8768,7 +9062,7 @@
     "message": "Hesabın ana parolası yok"
   },
   "removeOrgUserNoMasterPasswordDesc": {
-    "message": "Removing $USER$ without setting a master password for them may restrict access to their full account. Are you sure you want to continue?",
+    "message": "Onlar için bir ana parola belirlemeden $USER$ kullanıcısını kaldırmak, tüm hesaplarına erişimi kısıtlayabilir. Devam etmek istediğine emin misin?",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -8780,10 +9074,10 @@
     "message": "Ana parola yok"
   },
   "removeMembersWithoutMasterPasswordWarning": {
-    "message": "Removing members who do not have master passwords without setting one for them may restrict access to their full account."
+    "message": "Ana parolası olmayan üyeleri, kendileri için bir parola belirlemeden kaldırmak, tüm hesaplarına erişimi kısıtlayabilir."
   },
   "approvedAuthRequest": {
-    "message": "Approved device for $ID$.",
+    "message": "$ID$ için cihaz onaylandı.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -8792,7 +9086,7 @@
     }
   },
   "rejectedAuthRequest": {
-    "message": "Denied device for $ID$.",
+    "message": "$ID$ için cihaz reddedildi.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -8804,7 +9098,7 @@
     "message": "Cihaz onayı istendi."
   },
   "tdeOffboardingPasswordSet": {
-    "message": "User set a master password during TDE offboarding."
+    "message": "Kullanıcı TDE offboarding sırasında bir ana parola belirledi."
   },
   "startYour7DayFreeTrialOfBitwardenFor": {
     "message": "7 günlük ücretsiz $ORG$ için Bitwarden denemenizi başlatın",
@@ -8861,7 +9155,7 @@
     "message": "Kullanıcıları davet et"
   },
   "secretsManagerForPlan": {
-    "message": "Secrets Manager for $PLAN$",
+    "message": "$PLAN$ için Sır Yöneticisi",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -8870,10 +9164,10 @@
     }
   },
   "secretsManagerForPlanDesc": {
-    "message": "For engineering and DevOps teams to manage secrets throughout the software development lifecycle."
+    "message": "Mühendislik ve DevOps ekiplerinin yazılım geliştirme yaşam döngüsü boyunca sırları yönetmesi için."
   },
   "free2PersonOrganization": {
-    "message": "Free 2-person Organizations"
+    "message": "Ücretsiz 2 Kişilik Kuruluşlar"
   },
   "unlimitedSecrets": {
     "message": "Sınırsız sır"
@@ -8912,13 +9206,13 @@
     "message": "Secrets Manager'a abone olun"
   },
   "addSecretsManagerUpgradeDesc": {
-    "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
+    "message": "Önceki planınızla oluşturulan sırlara erişimi sürdürmek için yükseltilmiş planınıza Sır Yöneticisi'ni ekleyin."
   },
   "additionalServiceAccounts": {
-    "message": "Additional service accounts"
+    "message": "İlave hizmet hesapları"
   },
   "includedServiceAccounts": {
-    "message": "Your plan comes with $COUNT$ service accounts.",
+    "message": "Planınız $COUNT$ hizmet hesabıyla birlikte gelir.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -8927,7 +9221,7 @@
     }
   },
   "addAdditionalServiceAccounts": {
-    "message": "You can add additional service accounts for $COST$ per month.",
+    "message": "Aylık $COST$ karşılığında ilave hizmet hesapları ekleyebilirsiniz.",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -8936,54 +9230,54 @@
     }
   },
   "collectionManagement": {
-    "message": "Collection management"
+    "message": "Koleksiyon yönetimi"
   },
   "collectionManagementDescription": {
     "message": "Kuruluş için koleksiyon davranışını yapılandır"
   },
   "allowAdminAccessToAllCollectionItemsDescription": {
-    "message": "Allow owners and admins to manage all collections and items from the Admin Console"
+    "message": "Sahiplerin ve yöneticilerin tüm koleksiyonları ve kayıtları Yönetici Konsolu'ndan yönetmesine izin verin"
   },
   "restrictCollectionCreationDescription": {
-    "message": "Restrict collection creation to owners and admins"
+    "message": "Koleksiyon oluşturmayı sahipler ve yöneticilerle kısıtla"
   },
   "restrictCollectionDeletionDescription": {
-    "message": "Restrict collection deletion to owners and admins"
+    "message": "Koleksiyon silme işlemini sahipler ve yöneticilerle kısıtla"
   },
   "restrictItemDeletionDescriptionStart": {
-    "message": "Restrict item deletion to members with the ",
+    "message": "Kayıt silme işlemini ",
     "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": " iznine sahip üyelerle kısıtlayın",
     "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": "Updated collection management setting"
+    "message": "Güncellenmiş koleksiyon yönetimi ayarı"
   },
   "passwordManagerPlanPrice": {
-    "message": "Password Manager plan price"
+    "message": "Parola Yöneticisi plan fiyatı"
   },
   "secretsManagerPlanPrice": {
-    "message": "Secrets Manager plan price"
+    "message": "Sır Yöneticisi plan fiyatı"
   },
   "passwordManager": {
     "message": "Parola Yöneticisi"
   },
   "freeOrganization": {
-    "message": "Free Organization"
+    "message": "Ücretsiz Kuruluş"
   },
   "limitServiceAccounts": {
-    "message": "Limit service accounts (optional)"
+    "message": "Hizmet hesaplarını sınırlayın (isteğe bağlı)"
   },
   "limitServiceAccountsDesc": {
-    "message": "Set a limit for your service accounts. Once this limit is reached, you will not be able to create new service accounts."
+    "message": "Hizmet hesaplarınız için bir limit belirleyin. Bu sınıra ulaşıldığında, yeni hizmet hesapları oluşturamazsınız."
   },
   "serviceAccountLimit": {
-    "message": "Service account limit (optional)"
+    "message": "Hizmet hesabı limiti (isteğe bağlı)"
   },
   "maxServiceAccountCost": {
-    "message": "Max potential service account cost"
+    "message": "Maksimum potansiyel hizmet hesabı maliyeti"
   },
   "loggedInExclamation": {
     "message": "Giriş yapıldı!"
@@ -8992,16 +9286,16 @@
     "message": "Beta"
   },
   "assignCollectionAccess": {
-    "message": "Assign collection access"
+    "message": "Koleksiyon erişimi ata"
   },
   "editedCollections": {
-    "message": "Edited collections"
+    "message": "Düzenlenmiş koleksiyonlar"
   },
   "baseUrl": {
     "message": "Sunucu URL'si"
   },
   "selfHostBaseUrl": {
-    "message": "Self-host server URL",
+    "message": "Kendi kendine barındırılan sunucu URL'si",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "alreadyHaveAccount": {
@@ -9035,7 +9329,7 @@
     }
   },
   "limitCollectionCreationEnabled": {
-    "message": "Turned on Restrict collection creation setting $ID$.",
+    "message": "Koleksiyon oluşturmayı kısıtlamak için $ID$ ayarı açıldı.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9044,7 +9338,7 @@
     }
   },
   "limitCollectionCreationDisabled": {
-    "message": "Turned off Restrict collection creation setting $ID$.",
+    "message": "Koleksiyon oluşturmayı kısıtlamak için $ID$ ayarı kapatıldı.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9053,7 +9347,7 @@
     }
   },
   "limitCollectionDeletionEnabled": {
-    "message": "Turned on Restrict collection deletion setting $ID$.",
+    "message": "Koleksiyon silmeyi kısıtlamak için $ID$ ayarı açıldı.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9062,7 +9356,7 @@
     }
   },
   "limitCollectionDeletionDisabled": {
-    "message": "Turned off Restrict collection deletion setting $ID$.",
+    "message": "Koleksiyon silmeyi kısıtlamak için $ID$ ayarı kapatıldı.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9071,7 +9365,7 @@
     }
   },
   "limitItemDeletionEnabled": {
-    "message": "Turned on Restrict item deletion setting $ID$.",
+    "message": "Kayıt silmeyi kısıtlamak için $ID$ ayarı açıldı.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9080,7 +9374,7 @@
     }
   },
   "limitItemDeletionDisabled": {
-    "message": "Turned off Restrict item deletion setting $ID$.",
+    "message": "Kayıt silmeyi kısıtlamak için $ID$ ayarı kapatıldı.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9089,7 +9383,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsEnabled": {
-    "message": "Turned on Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Sahiplerin ve yöneticilerin $ID$ ayarlı tüm koleksiyonları ve kayıtları yönetmesine izin verme seçeneği açıldı.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9098,7 +9392,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsDisabled": {
-    "message": "Turned off Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Sahiplerin ve yöneticilerin $ID$ ayarlı tüm koleksiyonları ve kayıtları yönetmesine izin verme seçeneği kapatıldı.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9123,25 +9417,25 @@
     "message": "Bu Gönderim yüklenirken beklenmeyen bir hata oluştu. Daha sonra tekrar deneyin."
   },
   "seatLimitReached": {
-    "message": "Seat limit has been reached"
+    "message": "Yer limitine ulaşıldı"
   },
   "contactYourProvider": {
-    "message": "Contact your provider to purchase additional seats."
+    "message": "Ek yerler satın almak için sağlayıcınızla iletişime geçin."
   },
   "seatLimitReachedContactYourProvider": {
-    "message": "Seat limit has been reached. Contact your provider to purchase additional seats."
+    "message": "Yer limitine ulaşıldı. Ek yerler satın almak için sağlayıcınızla iletişime geçin."
   },
   "collectionAccessRestricted": {
     "message": "Koleksiyona erişim kısıtlı"
   },
   "readOnlyCollectionAccess": {
-    "message": "You do not have access to manage this collection."
+    "message": "Bu koleksiyonu yönetmek için erişiminiz yok."
   },
   "grantManageCollectionWarningTitle": {
-    "message": "Missing Manage Collection Permissions"
+    "message": "Koleksiyon Yönetme İzinleri Eksik"
   },
   "grantManageCollectionWarning": {
-    "message": "Grant Manage collection permissions to allow full collection management including deletion of collection."
+    "message": "Koleksiyon silme de dahil olmak üzere tam koleksiyon yönetimine izin vermek için \"Koleksiyon yönetme\" izinleri verin."
   },
   "grantCollectionAccess": {
     "message": "Gruplara veya üyelere bu koleksiyona erişim izni verin."
@@ -9160,19 +9454,19 @@
     "description": "Label indicating the most common import formats"
   },
   "uriMatchDefaultStrategyHint": {
-    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "message": "URl eşleştirme tespiti, Bitwarden'ın otomatik doldurma önerilerini nasıl tanımladığıdır.",
     "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": "\"Düzenli ifadeler\" gelişmiş bir seçenektir ve kimlik bilgilerini açığa çıkarma riski taşır.",
     "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": "\"İle başla\" gelişmiş bir seçenektir ve kimlik bilgilerini açığa çıkarma riski taşır.",
     "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": "Eşleşme tespiti hakkında daha fazla bilgi",
     "description": "Link to match detection docs on warning dialog for advance match strategy"
   },
   "uriAdvancedOption": {
@@ -9226,7 +9520,7 @@
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "movingToAnotherTool": {
-    "message": "Moving to another tool",
+    "message": "Başka bir araca geçme",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "tooDifficultToUse": {
@@ -9263,11 +9557,14 @@
     "message": "Kendinizi gruplara ekleyemezsiniz."
   },
   "cannotAddYourselfToCollections": {
-    "message": "You cannot add yourself to collections."
+    "message": "Kendinizi koleksiyonlara ekleyemezsiniz."
   },
   "assign": {
     "message": "Ata"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Koleksiyonlara ata"
   },
@@ -9275,10 +9572,10 @@
     "message": "Bu koleksiyonlara ata"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Only organization members with access to these collections will be able to see the item."
+    "message": "Yalnızca bu koleksiyonlara erişimi olan kuruluş üyeleri kayıtı görebilecektir."
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Only organization members with access to these collections will be able to see the items."
+    "message": "Yalnızca bu koleksiyonlara erişimi olan kuruluş üyeleri kayıtları görebilecektir."
   },
   "selectCollectionsToAssign": {
     "message": "Atanacak koleksiyonları seçin"
@@ -9312,10 +9609,10 @@
     "message": "Kayıtlar"
   },
   "assignedSeats": {
-    "message": "Assigned seats"
+    "message": "Atanmış yerler"
   },
   "assigned": {
-    "message": "Assigned"
+    "message": "Atandı"
   },
   "used": {
     "message": "Kullanılan"
@@ -9324,32 +9621,32 @@
     "message": "Kalan"
   },
   "unlinkOrganization": {
-    "message": "Unlink organization"
+    "message": "Kuruluş bağlantısını kaldır"
   },
   "manageSeats": {
-    "message": "MANAGE SEATS"
+    "message": "YERLERİ YÖNET"
   },
   "manageSeatsDescription": {
-    "message": "Adjustments to seats will be reflected in the next billing cycle."
+    "message": "Yerlerde yapılacak ayarlamalar bir sonraki faturalandırma döngüsüne yansıtılacaktır."
   },
   "unassignedSeatsDescription": {
-    "message": "Unassigned seats"
+    "message": "Atanmamış yerler"
   },
   "purchaseSeatDescription": {
-    "message": "Additional seats purchased"
+    "message": "Satın alınan ek yerler"
   },
   "assignedSeatCannotUpdate": {
-    "message": "Assigned Seats can not be updated. Please contact your organization owner for assistance."
+    "message": "Atanmış Yerler güncellenemez. Yardım için lütfen kuruluş sahibinizle iletişime geçin."
   },
   "subscriptionUpdateFailed": {
-    "message": "Subscription update failed"
+    "message": "Abonelik güncellemesi başarısız oldu"
   },
   "trial": {
     "message": "Deneme",
     "description": "A subscription status label."
   },
   "pastDue": {
-    "message": "Past due",
+    "message": "Vadesi geçmiş",
     "description": "A subscription status label"
   },
   "subscriptionExpired": {
@@ -9357,7 +9654,7 @@
     "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": "Aboneliğinizi sürdürmek için abonelik son kullanma tarihinden itibaren $DAYS$ gün süreli bir ödemesiz döneminiz vardır. Lütfen vadesi geçmiş faturaları $SUSPENSION_DATE$ tarihine kadar ödeyiniz.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -9371,7 +9668,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": "Aboneliğinizi sürdürmek için, ilk ödenmemiş faturanızın vadesi geldiği tarihten itibaren $DAYS$ gün süreli bir ödemesiz döneminiz vardır. Lütfen vadesi geçmiş faturaları $SUSPENSION_DATE$ tarihine kadar ödeyiniz.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -9385,11 +9682,11 @@
     "description": "A warning shown to the user when their subscription is past due and they pay via invoice."
   },
   "unpaidInvoice": {
-    "message": "Unpaid invoice",
+    "message": "Ödenmemiş fatura",
     "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": "Aboneliğinizi yeniden etkinleştirmek için lütfen vadesi geçmiş faturaları çözün.",
     "description": "The body of a warning box shown to a user whose subscription is unpaid."
   },
   "cancellationDate": {
@@ -9397,7 +9694,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": "Askıya alınan kuruluşlarda makine hesapları oluşturulamaz. Lütfen yardım için kuruluşunuzun sahibiyle iletişime geçin."
   },
   "machineAccount": {
     "message": "Makine hesabı",
@@ -9527,7 +9824,7 @@
     "message": "İlave makine hesapları"
   },
   "includedMachineAccounts": {
-    "message": "Your plan comes with $COUNT$ machine accounts.",
+    "message": "Planınız $COUNT$ makine hesabıyla birlikte gelir.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9536,7 +9833,7 @@
     }
   },
   "addAdditionalMachineAccounts": {
-    "message": "You can add additional machine accounts for $COST$ per month.",
+    "message": "Aylık $COST$ karşılığında ilave makine hesapları ekleyebilirsiniz.",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -9545,16 +9842,16 @@
     }
   },
   "limitMachineAccounts": {
-    "message": "Limit machine accounts (optional)"
+    "message": "Makine hesaplarını sınırlayın (isteğe bağlı)"
   },
   "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": "Makine hesaplarınız için bir limit belirleyin. Bu sınıra ulaşıldığında, yeni makine hesapları oluşturamazsınız."
   },
   "machineAccountLimit": {
-    "message": "Machine account limit (optional)"
+    "message": "Makine hesabı limiti (isteğe bağlı)"
   },
   "maxMachineAccountCost": {
-    "message": "Max potential machine account cost"
+    "message": "Maksimum potansiyel makine hesabı maliyeti"
   },
   "machineAccountAccessUpdated": {
     "message": "Makine hesabı erişimi güncellendi"
@@ -9563,10 +9860,10 @@
     "message": "Kendinizi gruba ekleyemezsiniz."
   },
   "deleteProvider": {
-    "message": "Delete provider"
+    "message": "Sağlayıcıyı sil"
   },
   "deleteProviderConfirmation": {
-    "message": "Deleting a provider is permanent and irreversible. Enter your master password to confirm the deletion of the provider and all associated data."
+    "message": "Bir sağlayıcıyı silmek kalıcı ve geri alınamaz bir işlemdir. Sağlayıcıyı ve ilgili tüm verileri silmeyi onaylamak için ana parolanızı girin."
   },
   "deleteProviderName": {
     "message": "$ID$ silinemedi",
@@ -9578,7 +9875,7 @@
     }
   },
   "deleteProviderWarningDescription": {
-    "message": "You must unlink all clients before you can delete $ID$.",
+    "message": "$ID$'yi silmeden önce tüm istemcilerin bağlantısını kaldırmanız gerekir.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9590,46 +9887,46 @@
     "message": "Sağlayıcı silindi"
   },
   "providerDeletedDesc": {
-    "message": "The Provider and all associated data has been deleted."
+    "message": "Sağlayıcı ve ilişkili tüm veriler silindi."
   },
   "deleteProviderRecoverConfirmDesc": {
-    "message": "You have requested to delete this Provider. Use the button below to confirm."
+    "message": "Bu Sağlayıcının silinmesini talep ettiniz. Onaylamak için aşağıdaki düğmeyi kullanın."
   },
   "deleteProviderWarning": {
-    "message": "Deleting your provider is permanent. It cannot be undone."
+    "message": "Sağlayıcınızı silmek kalıcıdır. Geri alınamaz."
   },
   "errorAssigningTargetCollection": {
-    "message": "Error assigning target collection."
+    "message": "Hedef koleksiyon atama hatası."
   },
   "errorAssigningTargetFolder": {
-    "message": "Error assigning target folder."
+    "message": "Hedef klasör atama hatası."
   },
   "integrationsAndSdks": {
-    "message": "Integrations & SDKs",
+    "message": "Entegrasyonlar & SDK'lar",
     "description": "The title for the section that deals with integrations and SDKs."
   },
   "integrations": {
     "message": "Entegrasyonlar"
   },
   "integrationsDesc": {
-    "message": "Automatically sync secrets from Bitwarden Secrets Manager to a third-party service."
+    "message": "Sırları Bitwarden Sır Yöneticisi'nden üçüncü taraf bir hizmetle otomatik olarak eşitleyin."
   },
   "sdks": {
-    "message": "SDKs"
+    "message": "SDK'lar"
   },
   "sdksDesc": {
-    "message": "Use Bitwarden Secrets Manager SDK in the following programming languages to build your own applications."
+    "message": "Kendi uygulamalarınızı oluşturmak için aşağıdaki programlama dillerinde Bitwarden Sır Yöneticisi SDK'yı kullanın."
   },
   "ssoDescStart": {
-    "message": "Configure",
+    "message": "Yapılandır:",
     "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": "Kimlik Sağlayıcınızın uygulama kılavuzunu kullanarak Bitwarden için.",
     "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": "Kullanıcı hazırlama"
   },
   "scimIntegration": {
     "message": "SCIM"
@@ -9639,50 +9936,65 @@
     "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": "(Etki Alanları Arası Kimlik Yönetimi Sistemi (System for Cross-domain Identity Management (SCIM))) Kimlik Sağlayıcınızın uygulama kılavuzunu kullanarak kullanıcıları ve grupları Bitwarden'e otomatik olarak ekleyin.",
     "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 Dizin Bağlayıcısı"
   },
   "bwdcDesc": {
-    "message": "Configure Bitwarden Directory Connector to automatically provision users and groups using the implementation guide for your Identity Provider."
+    "message": "Kimlik Sağlayıcınızın uygulama kılavuzunu kullanarak kullanıcıları ve grupları otomatik olarak sağlamak için Bitwarden Dizin Bağlayıcısını yapılandırın."
   },
   "eventManagement": {
-    "message": "Event management"
+    "message": "Olay yönetimi"
   },
   "eventManagementDesc": {
-    "message": "Integrate Bitwarden event logs with your SIEM (system information and event management) system by using the implementation guide for your platform."
+    "message": "Platformunuz için uygulama kılavuzunu kullanarak Bitwarden olay günlüklerini SIEM (sistem bilgisi ve olay yönetimi) sisteminizle entegre edin."
   },
   "deviceManagement": {
-    "message": "Device management"
+    "message": "Cihaz yönetimi"
   },
   "deviceManagementDesc": {
-    "message": "Configure device management for Bitwarden using the implementation guide for your platform."
+    "message": "Platformunuz için uygulama kılavuzunu kullanarak Bitwarden için cihaz yönetimini yapılandırın."
   },
   "crowdstrikeEventIntegrationDesc": {
     "message": "Etkinlik verilerini Logscale'e gönderin"
   },
   "failedToSaveIntegration": {
-    "message": "Failed to save integration. Please try again later."
+    "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."
   },
   "deviceIdMissing": {
-    "message": "Device ID is missing"
+    "message": "Cihaz kimliği eksik"
   },
   "deviceTypeMissing": {
-    "message": "Device type is missing"
+    "message": "Cihaz türü eksik"
   },
   "deviceCreationDateMissing": {
-    "message": "Device creation date is missing"
+    "message": "Cihaz oluşturma tarihi eksik"
   },
   "desktopRequired": {
-    "message": "Desktop required"
+    "message": "Masaüstü gerekli"
   },
   "reopenLinkOnDesktop": {
-    "message": "Reopen this link from your email on a desktop."
+    "message": "Bu bağlantıyı e-postanızdan bir masaüstünde yeniden açın."
   },
   "connectIntegrationButtonDesc": {
-    "message": "Connect $INTEGRATION$",
+    "message": "$INTEGRATION$ Entegrasyonuna Bağlan",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
+  "updateIntegrationButtonDesc": {
+    "message": "$INTEGRATION$ entegrasyonunu güncelle",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9691,7 +10003,7 @@
     }
   },
   "integrationCardTooltip": {
-    "message": "Launch $INTEGRATION$ implementation guide.",
+    "message": "$INTEGRATION$ uygulama kılavuzunu başlatın.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9700,7 +10012,7 @@
     }
   },
   "smIntegrationTooltip": {
-    "message": "Set up $INTEGRATION$.",
+    "message": "$INTEGRATION$ entegrasyonunu ayarlayın.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9709,7 +10021,7 @@
     }
   },
   "smSdkTooltip": {
-    "message": "View $SDK$ repository",
+    "message": "$SDK$ deposunu görüntüle",
     "placeholders": {
       "sdk": {
         "content": "$1",
@@ -9718,7 +10030,7 @@
     }
   },
   "integrationCardAriaLabel": {
-    "message": "open $INTEGRATION$ implementation guide in a new tab.",
+    "message": "yeni bir sekmede $INTEGRATION$ uygulama kılavuzunu açın.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9727,7 +10039,7 @@
     }
   },
   "smSdkAriaLabel": {
-    "message": "view $SDK$ repository in a new tab.",
+    "message": "$SDK$ deposunu yeni bir sekmede görüntüleyin.",
     "placeholders": {
       "sdk": {
         "content": "$1",
@@ -9736,7 +10048,7 @@
     }
   },
   "smIntegrationCardAriaLabel": {
-    "message": "set up $INTEGRATION$ implementation guide in a new tab.",
+    "message": "yeni bir sekmede $INTEGRATION$ uygulama kılavuzunu kurun.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9745,16 +10057,19 @@
     }
   },
   "createNewClientToManageAsProvider": {
-    "message": "Create a new client organization to manage as a Provider. Additional seats will be reflected in the next billing cycle."
+    "message": "Sağlayıcı olarak yönetmek için yeni bir istemci kuruluşu oluşturun. Ek yerler bir sonraki faturalandırma döngüsüne yansıtılacaktır."
   },
   "url": {
     "message": "URL"
   },
   "bearerToken": {
-    "message": "Bearer Token"
+    "message": "Taşıyıcı Erişim Anahtarı"
+  },
+  "repositoryNameHint": {
+    "message": "İçe aktarılacak deponun adı"
   },
   "index": {
-    "message": "Index"
+    "message": "İndeks"
   },
   "selectAPlan": {
     "message": "Bir plan seçin"
@@ -9763,19 +10078,19 @@
     "message": "35% indirim"
   },
   "monthPerMember": {
-    "message": "month per member"
+    "message": "üye başına aylık"
   },
   "monthPerMemberBilledAnnually": {
-    "message": "month per member billed annually"
+    "message": "yıllık faturalandırılan üye başına aylık"
   },
   "seats": {
-    "message": "Seats"
+    "message": "Yerler"
   },
   "addOrganization": {
     "message": "Kuruluş ekle"
   },
   "createdNewClient": {
-    "message": "Successfully created new client"
+    "message": "Başarıyla yeni istemci oluşturuldu"
   },
   "noAccess": {
     "message": "Erişim yok"
@@ -9784,46 +10099,46 @@
     "message": "Bu derlem yalnızca yönetici arayüzünden erişilebilir"
   },
   "organizationOptionsMenu": {
-    "message": "Toggle Organization Menu"
+    "message": "Kuruluş Menüsünü Aç / Kapat"
   },
   "vaultItemSelect": {
-    "message": "Select vault item"
+    "message": "Kasa kaydını seçin"
   },
   "collectionItemSelect": {
-    "message": "Select collection item"
+    "message": "Koleksiyon kaydını seçin"
   },
   "manageBillingFromProviderPortalMessage": {
-    "message": "Manage billing from the Provider Portal"
+    "message": "Faturalandırmayı Sağlayıcı Portalından yönetin"
   },
   "continueSettingUp": {
     "message": "Bitwarden’ı kurmaya devam et"
   },
   "continueSettingUpFreeTrial": {
-    "message": "Continue setting up your free trial of Bitwarden"
+    "message": "Ücretsiz Bitwarden denemenizi kurmaya devam edin"
   },
   "continueSettingUpPasswordManager": {
     "message": "Bitwarden Parola Yöneticisi’ni kurmaya devam et"
   },
   "continueSettingUpFreeTrialPasswordManager": {
-    "message": "Continue setting up your free trial of Bitwarden Password Manager"
+    "message": "Bitwarden Parola Yöneticisi'nin ücretsiz deneme sürümünü kurmaya devam edin"
   },
   "continueSettingUpSecretsManager": {
     "message": "Bitwarden Secrets Manager’ı kurmaya devam et"
   },
   "continueSettingUpFreeTrialSecretsManager": {
-    "message": "Continue setting up your free trial of Bitwarden Secrets Manager"
+    "message": "Bitwarden Sır Yöneticisi'nin ücretsiz deneme sürümünü kurmaya devam edin"
   },
   "enterTeamsOrgInfo": {
-    "message": "Enter your Teams organization information"
+    "message": "Ekip kuruluş bilgilerinizi girin"
   },
   "enterFamiliesOrgInfo": {
-    "message": "Enter your Families organization information"
+    "message": "Aileler kuruluş bilgilerinizi girin"
   },
   "enterEnterpriseOrgInfo": {
-    "message": "Enter your Enterprise organization information"
+    "message": "Kurumsal kuruluş bilgilerinizi girin"
   },
   "viewItemsIn": {
-    "message": "View items in $NAME$",
+    "message": "$NAME$ içindeki kayıtları görüntüle",
     "description": "Button to view the contents of a folder or collection",
     "placeholders": {
       "name": {
@@ -9833,7 +10148,7 @@
     }
   },
   "backTo": {
-    "message": "Back to $NAME$",
+    "message": "$NAME$ klasörüne dön",
     "description": "Navigate back to a previous folder or collection",
     "placeholders": {
       "name": {
@@ -9863,25 +10178,25 @@
     "message": "Erişimi görüntüle"
   },
   "noCollectionsSelected": {
-    "message": "You have not selected any collections."
+    "message": "Herhangi bir koleksiyon seçmediniz."
   },
   "updateName": {
-    "message": "Update name"
+    "message": "İsmi güncelle"
   },
   "updatedOrganizationName": {
-    "message": "Updated organization name"
+    "message": "Güncellenmiş kuruluş ismi"
   },
   "providerPlan": {
-    "message": "Managed Service Provider"
+    "message": "Yönetilen Hizmet Sağlayıcısı"
   },
   "managedServiceProvider": {
-    "message": "Managed service provider"
+    "message": "Yönetilen hizmet sağlayıcısı"
   },
   "multiOrganizationEnterprise": {
-    "message": "Multi-organization enterprise"
+    "message": "Çoklu kuruluşlu işletme"
   },
   "orgSeats": {
-    "message": "Organization Seats"
+    "message": "Kuruluş Yerleri"
   },
   "providerDiscount": {
     "message": "%$AMOUNT$ indirim",
@@ -9892,29 +10207,23 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "KDF ayarlarını değiştir"
-  },
   "secureYourInfrastructure": {
-    "message": "Secure your infrastructure"
+    "message": "Altyapınızı güvence altına alın"
   },
   "protectYourFamilyOrBusiness": {
-    "message": "Protect your family or business"
+    "message": "Ailenizi veya işinizi koruyun"
   },
   "upgradeOrganizationCloseSecurityGaps": {
-    "message": "Close security gaps with monitoring reports"
+    "message": "İzleme raporları ile güvenlik açıklarını kapatın"
   },
   "upgradeOrganizationCloseSecurityGapsDesc": {
-    "message": "Stay ahead of security vulnerabilities by upgrading to a paid plan for enhanced monitoring."
+    "message": "Gelişmiş izleme için ücretli bir plana geçerek güvenlik açıklarının önüne geçin."
   },
   "approveAllRequests": {
-    "message": "Approve all requests"
+    "message": "Tüm istekleri onayla"
   },
   "allLoginRequestsApproved": {
-    "message": "All login requests approved"
+    "message": "Tüm giriş istekleri onaylandı"
   },
   "payPal": {
     "message": "PayPal"
@@ -9923,19 +10232,19 @@
     "message": "Bitcoin"
   },
   "updatedTaxInformation": {
-    "message": "Updated tax information"
+    "message": "Güncellenmiş vergi bilgileri"
   },
   "billingInvalidTaxIdError": {
-    "message": "Invalid tax ID, if you believe this is an error please contact support."
+    "message": "Geçersiz vergi kimliği, bunun bir hata olduğunu düşünüyorsanız lütfen destek ekibiyle iletişime geçin."
   },
   "billingTaxIdTypeInferenceError": {
-    "message": "We were unable to validate your tax ID, if you believe this is an error please contact support."
+    "message": "Vergi kimliğinizi doğrulayamadık, bunun bir hata olduğunu düşünüyorsanız lütfen destek ekibiyle iletişime geçin."
   },
   "billingPreviewInvalidTaxIdError": {
-    "message": "Invalid tax ID, if you believe this is an error please contact support."
+    "message": "Geçersiz vergi kimliği, bunun bir hata olduğunu düşünüyorsanız lütfen destek ekibiyle iletişime geçin."
   },
   "billingPreviewInvoiceError": {
-    "message": "An error occurred while previewing the invoice. Please try again later."
+    "message": "Fatura önizlenirken bir hata oluştu. Lütfen daha sonra tekrar deneyin."
   },
   "unverified": {
     "message": "Doğrulanmadı"
@@ -9944,35 +10253,35 @@
     "message": "Doğrulandı"
   },
   "viewSecret": {
-    "message": "View secret"
+    "message": "Sırrı görüntüle"
   },
   "noClients": {
-    "message": "There are no clients to list"
+    "message": "Listelenecek istemci yok"
   },
   "providerBillingEmailHint": {
-    "message": "This email address will receive all invoices pertaining to this provider",
+    "message": "Bu e-posta adresi, bu sağlayıcıya ait tüm faturaları alacaktır",
     "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": "Üye erişimini denetleyerek güvenlik risklerini belirleyin"
   },
   "onlyAvailableForEnterpriseOrganization": {
-    "message": "Quickly view member access across the organization by upgrading to an Enterprise plan."
+    "message": "Kurumsal plana geçerek kuruluş genelinde üye erişimini hızlıca görüntüleyin."
   },
   "date": {
     "message": "Tarih"
   },
   "exportClientReport": {
-    "message": "Export client report"
+    "message": "İstemci raporunu dışa aktar"
   },
   "memberAccessReport": {
     "message": "Üye erişimi"
   },
   "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": "Üyelerin doğru kimlik bilgilerine erişebildiğinden ve hesaplarının güvenli olduğundan emin olun. Bu raporu kullanarak üye erişimi ve hesap yapılandırmalarının CSV dosyasını elde edin."
   },
   "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": "Gruplar, koleksiyonlar ve koleksiyon kayıtları genelinde denetim kuruluşu üyelerinin erişimini denetleyin. CSV dışa aktarımı, koleksiyon izinleri ve hesap yapılandırmaları hakkında bilgiler dahil olmak üzere üye başına ayrıntılı bir döküm sağlar."
   },
   "memberAccessReportNoCollection": {
     "message": "(Koleksiyon yok)"
@@ -10020,28 +10329,28 @@
     "message": " Aboneliğinizi yeniden başlatmak için müşteri hizmetleri ile iletişime geçebilirsiniz."
   },
   "secretPeopleDescription": {
-    "message": "Grant groups or people access to this secret. Permissions set for people will override permissions set by groups."
+    "message": "Gruplara veya kişilere bu sırra erişim izni verin. Kişiler için ayarlanan izinler, gruplar tarafından ayarlanan izinleri geçersiz kılar."
   },
   "secretPeopleEmptyMessage": {
-    "message": "Add people or groups to share access to this secret"
+    "message": "Bu sırra erişimi paylaşacak kişi veya gruplar ekleyin"
   },
   "secretMachineAccountsDescription": {
-    "message": "Grant machine accounts access to this secret."
+    "message": "Makine hesaplarına bu sırra erişim izni verin."
   },
   "secretMachineAccountsEmptyMessage": {
-    "message": "Add machine accounts to grant access to this secret"
+    "message": "Bu sırra erişim izni vermek için makine hesapları ekleyin"
   },
   "smAccessRemovalWarningSecretTitle": {
-    "message": "Remove access to this secret"
+    "message": "Bu sırra erişimi kaldır"
   },
   "smAccessRemovalSecretMessage": {
-    "message": "This action will remove your access to this secret."
+    "message": "Bu işlem, bu sırra erişiminizi kaldıracaktır."
   },
   "invoice": {
     "message": "Fatura"
   },
   "unassignedSeatsAvailable": {
-    "message": "You have $SEATS$ unassigned seats available.",
+    "message": "Mevcut $SEATS$ tane atanmamış yeriniz var.",
     "placeholders": {
       "seats": {
         "content": "$1",
@@ -10051,30 +10360,30 @@
     "description": "A message showing how many unassigned seats are available for a provider."
   },
   "contactYourProviderForAdditionalSeats": {
-    "message": "Contact your provider admin to purchase additional seats."
+    "message": "Ek yerler satın almak için sağlayıcınızın yöneticisiyle iletişime geçin."
   },
   "open": {
     "message": "Açık",
     "description": "The status of an invoice."
   },
   "uncollectible": {
-    "message": "Uncollectible",
+    "message": "Toplanamaz",
     "description": "The status of an invoice."
   },
   "clientDetails": {
-    "message": "Client details"
+    "message": "İstemci detayları"
   },
   "downloadCSV": {
     "message": "CSV'yi indir"
   },
   "monthlySubscriptionUserSeatsMessage": {
-    "message": "Adjustments to your subscription will result in prorated charges to your billing totals on your next billing period. "
+    "message": "Aboneliğinizde yapılan değişiklikler, bir sonraki fatura döneminizde fatura toplamınıza orantılı olarak yansıtılacaktır. "
   },
   "annualSubscriptionUserSeatsMessage": {
-    "message": "Adjustments to your subscription will result in prorated charges on a monthly billing cycle. "
+    "message": "Aboneliğinizde yapılan değişiklikler, aylık fatura döngüsünde orantılı olarak hesaplanan ücretlere neden olacaktır. "
   },
   "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": "Her fatura tarihi için müşteri bilgilerini almak üzere bir CSV dosyası indirin. Orantılı ücretler CSV dosyasına dahil değildir ve bağlantılı faturadan farklılık gösterebilir. En doğru fatura bilgileri için aylık faturalarınıza bakın.",
     "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": {
@@ -10082,18 +10391,18 @@
     "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": "Bildirim: Bu ayın sonlarında, istemci kasası gizliliği iyileştirilecek ve sağlayıcı üyeleri artık müşteri kasası kayıtlarına doğrudan erişemeyecektir. Sorularınız için,",
     "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 desteğiyle iletişime geçin.",
     "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": "Sponsorlu"
   },
   "licenseAndBillingManagementDesc": {
-    "message": "After making updates in the Bitwarden cloud server, upload your license file to apply the most recent changes."
+    "message": "Bitwarden bulut sunucusunda güncellemeler yaptıktan sonra, en son değişiklikleri uygulamak için lisans dosyanızı yükleyin."
   },
   "addToFolder": {
     "message": "Klasöre ekle"
@@ -10102,10 +10411,10 @@
     "message": "Klasör seç"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+    "message": "1 kayıt kalıcı olarak seçilen kuruluşa aktarılacaktır. Artık bu kayıta sahip olmayacaksınız."
   },
   "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$ kayıt kalıcı olarak seçilen kuruluşa aktarılacaktır. Artık bu kayıtlara sahip olmayacaksınız.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -10114,7 +10423,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "message": "1 kayıt kalıcı olarak $ORG$ kuruluşuna aktarılacaktır. Artık bu kayda sahip olmayacaksınız.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -10123,7 +10432,7 @@
     }
   },
   "personalItemsWithOrgTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ kayıt kalıcı olarak $ORG$ kuruluşuna aktarılacaktır. Artık bu kayıtlara sahip olmayacaksınız.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -10139,7 +10448,7 @@
     "message": "Veri"
   },
   "purchasedSeatsRemoved": {
-    "message": "purchased seats removed"
+    "message": "satın alınan yerler kaldırıldı"
   },
   "environmentVariables": {
     "message": "Ortam değişkenleri"
@@ -10154,67 +10463,61 @@
     "message": "Proje kimliği"
   },
   "projectsAccessedByMachineAccount": {
-    "message": "The following projects can be accessed by this machine account."
+    "message": "Aşağıdaki projelere bu makine hesabı tarafından erişilebilir."
   },
   "config": {
     "message": "Yapılandırma"
   },
   "learnMoreAboutEmergencyAccess": {
-    "message": "Learn more about emergency access"
+    "message": "Acil durum erişimi hakkında daha fazla bilgi edinin"
   },
   "learnMoreAboutMatchDetection": {
-    "message": "Learn more about match detection"
+    "message": "Eşleşme tespiti hakkında daha fazla bilgi edinin"
   },
   "learnMoreAboutMasterPasswordReprompt": {
-    "message": "Learn more about master password re-prompt"
+    "message": "Ana parolanın yeniden sorulması hakkında daha fazla bilgi edinin"
   },
   "learnMoreAboutSearchingYourVault": {
-    "message": "Learn more about searching your vault"
+    "message": "Kasanızda arama yapma hakkında daha fazla bilgi edinin"
   },
   "learnMoreAboutYourAccountFingerprintPhrase": {
-    "message": "Learn about your account fingerprint phrase"
+    "message": "Hesap parmak izi ifadeniz hakkında bilgi edinin"
   },
   "impactOfRotatingYourEncryptionKey": {
-    "message": "Impact of rotating your encryption key"
+    "message": "Şifreleme anahtarınızı döndürmenin etkisi"
   },
   "learnMoreAboutEncryptionAlgorithms": {
-    "message": "Learn more about encryption algorithms"
+    "message": "Şifreleme algoritmaları hakkında daha fazla bilgi edinin"
   },
   "learnMoreAboutKDFIterations": {
-    "message": "Learn more about KDF iterations"
+    "message": "KDF iterasyonu hakkında daha fazla bilgi edinin"
   },
   "learnMoreAboutLocalization": {
-    "message": "Learn more about localization"
+    "message": "Yerelleştirme hakkında daha fazla bilgi edinin"
   },
   "learnMoreAboutWebsiteIcons": {
-    "message": "Learn more about using website icons"
+    "message": "Web sitesi simgelerini kullanma hakkında daha fazla bilgi edinin"
   },
   "learnMoreAboutUserAccess": {
-    "message": "Learn more about user access"
+    "message": "Kullanıcı erişimi hakkında daha fazla bilgi edinin"
   },
   "learnMoreAboutMemberRoles": {
-    "message": "Learn more about member roles and permissions"
+    "message": "Üye rolleri ve izinleri hakkında daha fazla bilgi edinin"
   },
   "whatIsACvvNumber": {
-    "message": "What is a CVV number?"
+    "message": "CVV numarası nedir?"
   },
   "learnMoreAboutApi": {
-    "message": "Learn more about Bitwarden's API"
-  },
-  "fileSend": {
-    "message": "Dosya Send'i"
+    "message": "Bitwarden'ın API'si hakkında daha fazla bilgi edinin"
   },
   "fileSends": {
     "message": "Dosya Send'leri"
   },
-  "textSend": {
-    "message": "Metin Send'i"
-  },
   "textSends": {
     "message": "Metin Send'leri"
   },
   "includesXMembers": {
-    "message": "for $COUNT$ member",
+    "message": "$COUNT$ üye için",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -10232,10 +10535,10 @@
     }
   },
   "optionalOnPremHosting": {
-    "message": "Optional on-premises hosting"
+    "message": "İsteğe bağlı şirket içi barındırma"
   },
   "upgradeFreeOrganization": {
-    "message": "Upgrade your $NAME$ organization ",
+    "message": "$NAME$ kuruluşunuzu yükseltin ",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10244,10 +10547,10 @@
     }
   },
   "includeSsoAuthenticationMessage": {
-    "message": "SSO Authentication"
+    "message": "SSO Kimlik Doğrulama"
   },
   "familiesPlanInvLimitReachedManageBilling": {
-    "message": "Families organizations may have up to $SEATCOUNT$ members. Upgrade to a paid plan to invite more members.",
+    "message": "Aile kuruluşlarının en fazla $SEATCOUNT$ üyesi olabilir. Daha fazla üye davet etmek için ücretli bir plana geçin.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -10256,7 +10559,7 @@
     }
   },
   "familiesPlanInvLimitReachedNoManageBilling": {
-    "message": "Families organizations may have up to $SEATCOUNT$ members. Contact your organization owner to upgrade.",
+    "message": "Aile kuruluşlarının en fazla $SEATCOUNT$ üyesi olabilir. Yükseltmek için kuruluşunuzun sahibiyle iletişime geçin.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -10265,10 +10568,10 @@
     }
   },
   "upgradePlans": {
-    "message": "Upgrade your plan to invite members and experience powerful security features."
+    "message": "Üyeleri davet etmek ve güçlü güvenlik özelliklerini deneyimlemek için planınızı yükseltin."
   },
   "upgradeDiscount": {
-    "message": "Save $AMOUNT$%",
+    "message": "%$AMOUNT$ indirim",
     "placeholders": {
       "amount": {
         "content": "$1",
@@ -10277,31 +10580,31 @@
     }
   },
   "enterprisePlanUpgradeMessage": {
-    "message": "Advanced capabilities for larger organizations"
+    "message": "Daha büyük kuruluşlar için gelişmiş yetenekler"
   },
   "teamsPlanUpgradeMessage": {
-    "message": "Resilient protection for growing teams"
+    "message": "Büyüyen ekipler için esnek koruma"
   },
   "teamsInviteMessage": {
-    "message": "Invite unlimited members"
+    "message": "Sınırsız üye davet edin"
   },
   "accessToCreateGroups": {
-    "message": "Access to create groups"
+    "message": "Grup oluşturma erişimi"
   },
   "syncGroupsAndUsersFromDirectory": {
-    "message": "Sync groups and users from a directory"
+    "message": "Grupları ve kullanıcıları bir dizinden eşitleme"
   },
   "familyPlanUpgradeMessage": {
-    "message": "Secure your family logins"
+    "message": "Aile hesaplarınızı güvence altına alın"
   },
   "accessToPremiumFeatures": {
-    "message": "Access to Premium features"
+    "message": "Premium özelliklere erişim"
   },
   "additionalStorageGbMessage": {
     "message": "GB ek depolama"
   },
   "sshKeyAlgorithm": {
-    "message": "Key algorithm"
+    "message": "Anahtar algoritması"
   },
   "sshPrivateKey": {
     "message": "Özel anahtar"
@@ -10313,13 +10616,13 @@
     "message": "Parmak izi"
   },
   "sshKeyFingerprint": {
-    "message": "Fingerprint"
+    "message": "Parmak izi"
   },
   "sshKeyPrivateKey": {
-    "message": "Private key"
+    "message": "Özel anahtar"
   },
   "sshKeyPublicKey": {
-    "message": "Public key"
+    "message": "Ortak anahtar"
   },
   "sshKeyAlgorithmED25519": {
     "message": "ED25519"
@@ -10382,7 +10685,7 @@
     "message": "Bitwarden Parola Yöneticisi"
   },
   "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": "Ücretsiz bir yıllık Parola Yöneticisi aboneliğiniz, seçtiğiniz plana yükseltilecektir. Ücretsiz süre sona erene kadar sizden herhangi bir ücret talep edilmeyecektir."
   },
   "fileSavedToDevice": {
     "message": "Dosya cihaza kaydedildi. Cihazınızın indirilenler klasöründen yönetebilirsiniz."
@@ -10398,7 +10701,7 @@
     "message": "Karakter sayacını gizle"
   },
   "editAccess": {
-    "message": "Edit access"
+    "message": "Erişimi düzenle"
   },
   "textHelpText": {
     "message": "Güvenlik sorusu gibi veriler için metin alanlarını kullanın"
@@ -10410,10 +10713,10 @@
     "message": "Formlardaki onay kutularını (örn. \"e-posta adresimi hatırla\") otomatik doldurmak isterseniz onay kutularını kullanın"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "Belirli bir web sitesi için otomatik doldurma sorunları yaşıyorsanız bağlantılı bir alan kullanın."
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "Alanın html kimliğini (id), adını (name), aria-label etiketini veya yer tutucusunu (placeholder) girin."
   },
   "uppercaseDescription": {
     "message": "Büyük harfleri dahil et",
@@ -10453,23 +10756,23 @@
     "message": "Bu dosyayı kalıcı olarak silmek istediğinizden emin misiniz?"
   },
   "manageSubscriptionFromThe": {
-    "message": "Manage subscription from the",
+    "message": "Aboneliğinizi şuradan yönetin:",
     "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'ı kendi sunucunuzda barındırmak için lisans dosyanızı yüklemeniz gerekir. Kendi sunucunuzda barındırılan kuruluşunuz için Ücretsiz Aileler planlarını ve gelişmiş faturalandırma özelliklerini desteklemek için, kendi sunucunuzda barındırılan kuruluşunuzda otomatik eşitlemeyi ayarlamanız gerekir."
   },
   "selfHostingTitleProper": {
-    "message": "Self-Hosting"
+    "message": "Kendi Kendinize Barındırma"
   },
   "claim-domain-single-org-warning": {
-    "message": "Claiming a domain will turn on the single organization policy."
+    "message": "Bir alan adının talep edilmesi tek kuruluş ilkesini etkinleştirir."
   },
   "single-org-revoked-user-warning": {
-    "message": "Non-compliant members will be revoked. Administrators can restore members once they leave all other organizations."
+    "message": "Uygun olmayan üyeler iptal edilecektir. Yöneticiler, üyeler diğer tüm kuruluşlardan ayrıldıktan sonra onları geri yükleyebilirler."
   },
   "deleteOrganizationUser": {
-    "message": "Delete $NAME$",
+    "message": "$NAME$ - sil",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10479,7 +10782,7 @@
     }
   },
   "deleteOrganizationUserWarningDesc": {
-    "message": "This will permanently delete all items owned by $NAME$. Collection items are not impacted.",
+    "message": "Bu, $NAME$ tarafından sahip olunan tüm kayıtları kalıcı olarak silecektir. Koleksiyon kayıtları etkilenmez.",
     "description": "Warning description for the delete organization user dialog",
     "placeholders": {
       "name": {
@@ -10489,11 +10792,11 @@
     }
   },
   "deleteManyOrganizationUsersWarningDesc": {
-    "message": "This will permanently delete all items owned by the following members. Collection items are not impacted.",
+    "message": "Bu, aşağıdaki üyelerin sahip olduğu tüm kayıtları kalıcı olarak silecektir. Koleksiyon kayıtları etkilenmez.",
     "description": "Warning description for the bulk delete organization users dialog"
   },
   "organizationUserDeleted": {
-    "message": "Deleted $NAME$",
+    "message": "$NAME$ silindi",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10502,7 +10805,7 @@
     }
   },
   "organizationUserDeletedDesc": {
-    "message": "The user was removed from the organization and all associated user data has been deleted."
+    "message": "Kullanıcı kuruluştan kaldırılmış ve ilişkili tüm kullanıcı verileri silinmiştir."
   },
   "deletedUserIdEventMessage": {
     "message": "Kullanıcı silindi: $ID$",
@@ -10514,7 +10817,7 @@
     }
   },
   "userLeftOrganization": {
-    "message": "User $ID$ left organization",
+    "message": "Kullanıcı $ID$ kuruluşundan ayrıldı",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -10523,7 +10826,7 @@
     }
   },
   "suspendedOrganizationTitle": {
-    "message": "The $ORGANIZATION$ is suspended",
+    "message": "$ORGANIZATION$ kuruluşu askıya alındı",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -10532,10 +10835,10 @@
     }
   },
   "suspendedUserOrgMessage": {
-    "message": "Contact your organization owner for assistance."
+    "message": "Yardım için kuruluş sahibinizle iletişime geçin."
   },
   "suspendedOwnerOrgMessage": {
-    "message": "To regain access to your organization, add a payment method."
+    "message": "Kuruluşunuza yeniden erişim kazanmak için bir ödeme yöntemi ekleyin."
   },
   "deleteMembers": {
     "message": "Üyeleri sil"
@@ -10547,19 +10850,19 @@
     "message": "Başarıyla silindi"
   },
   "freeFamiliesSponsorship": {
-    "message": "Remove Free Bitwarden Families sponsorship"
+    "message": "Ücretsiz Bitwarden Aileler sponsorluğunu kaldırın"
   },
   "freeFamiliesSponsorshipPolicyDesc": {
-    "message": "Do not allow members to redeem a Families plan through this organization."
+    "message": "Üyelerin bu kuruluş aracılığıyla bir Aile planını kullanmalarına izin vermeyin."
   },
   "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": "Banka hesabı ile ödeme yalnızca Amerika Birleşik Devletleri'ndeki müşteriler için geçerlidir. Banka hesabınızı doğrulamanız gerekecektir. Önümüzdeki 1-2 iş günü içinde mikro bir para yatırma işlemi gerçekleştireceğiz. Banka hesabını doğrulamak için kuruluşun fatura sayfasına bu para yatırma işleminin açıklama kodunu girin. Banka hesabının doğrulanmaması, ödemenin yapılmaması ve aboneliğinizin askıya alınmasıyla sonuçlanacaktır."
   },
   "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": "Banka hesabınıza mikro bir para yatırımı yaptık (bu işlem 1-2 iş günü sürebilir). Para yatırma açıklamasında bulunan 'SM' ile başlayan altı haneli kodu girin. Banka hesabının doğrulanmaması, ödemenin yapılmaması ve aboneliğinizin askıya alınmasıyla sonuçlanacaktır."
   },
   "descriptorCode": {
-    "message": "Descriptor code"
+    "message": "Tanımlayıcı kodu"
   },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
@@ -10571,37 +10874,37 @@
     }
   },
   "removeMembers": {
-    "message": "Remove members"
+    "message": "Üyeleri kaldır"
   },
   "devices": {
     "message": "Cihazlar"
   },
   "deviceListDescription": {
-    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+    "message": "Hesabınız aşağıdaki cihazların her birinde giriş yaptı. Bir cihazı tanımıyorsanız, şimdi kaldırın."
   },
   "deviceListDescriptionTemp": {
     "message": "Hesabınıza aşağıdaki cihazlardan giriş yapıldı."
   },
   "claimedDomains": {
-    "message": "Claimed domains"
+    "message": "Alınan alan adları"
   },
   "claimDomain": {
-    "message": "Claim domain"
+    "message": "Alan adını al"
   },
   "reclaimDomain": {
-    "message": "Reclaim domain"
+    "message": "Alan adını geri al"
   },
   "claimDomainNameInputHint": {
-    "message": "Example: mydomain.com. Subdomains require separate entries to be claimed."
+    "message": "Örnek: mydomain.com. Alt alan adlarının alınması için ayrı kayıtlar gerekir."
   },
   "automaticClaimedDomains": {
-    "message": "Automatic Claimed Domains"
+    "message": "Otomatik Alınan Alan Adları"
   },
   "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, ilk 72 saat içinde etki alanını 3 kez talep etmeye çalışacaktır. Etki alanı talep edilemezse, barındırıcınızdaki DNS kaydını kontrol edin ve manuel olarak talep edin. Etki alanı talep edilmezse, 7 gün içinde kuruluşunuzdan kaldırılacaktır."
   },
   "domainNotClaimed": {
-    "message": "$DOMAIN$ not claimed. Check your DNS records.",
+    "message": "$DOMAIN$ alınmadı. DNS kayıtlarınızı kontrol edin.",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10610,19 +10913,19 @@
     }
   },
   "domainStatusClaimed": {
-    "message": "Claimed"
+    "message": "Alındı"
   },
   "domainStatusUnderVerification": {
-    "message": "Under verification"
+    "message": "Doğrulama altında"
   },
   "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": "Üye hesaplarını sahip olmak için bir alan adı talep edin. Alan adı talep eden üyelerin oturum açma sırasında SSO tanımlayıcı sayfası atlanacak ve yöneticiler talep edilen hesapları silebilecek."
   },
   "invalidDomainNameClaimMessage": {
-    "message": "Input is not a valid format. Format: mydomain.com. Subdomains require separate entries to be claimed."
+    "message": "Giriş geçerli bir format değil. Biçim: mydomain.com. Alt alan adlarının alınması için ayrı girişler gerekir."
   },
   "domainClaimedEvent": {
-    "message": "$DOMAIN$ claimed",
+    "message": "$DOMAIN$ alındı",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10631,7 +10934,7 @@
     }
   },
   "domainNotClaimedEvent": {
-    "message": "$DOMAIN$ not claimed",
+    "message": "$DOMAIN$ alınmadı",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10640,7 +10943,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$ e-postasını kaldırırsanız, bu Aile planı için sponsorluk kullanılamaz. Devam etmek istediğine emin misin?",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10649,7 +10952,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$ e-postasını kaldırırsanız, bu Aile planının sponsorluğu sona erecek ve kaydedilen ödeme yönteminden $DATE$ tarihinde 40 $ + geçerli vergi tahsil edilecektir. $DATE$ tarihine kadar yeni bir sponsorluk kullanamazsınız. Devam etmek istediğine emin misin?",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10662,43 +10965,43 @@
     }
   },
   "domainClaimed": {
-    "message": "Domain claimed"
+    "message": "Alan adı alındı"
   },
   "organizationNameMaxLength": {
-    "message": "Organization name cannot exceed 50 characters."
+    "message": "Kuruluş adı 50 karakteri geçemez."
   },
   "rotationCompletedTitle": {
-    "message": "Key rotation successful"
+    "message": "Anahtar rotasyonu başarılı"
   },
   "rotationCompletedDesc": {
-    "message": "Your master password and encryption keys have been updated. Your other devices have been logged out."
+    "message": "Ana parolanız ve şifreleme anahtarlarınız güncellendi. Diğer cihazlarınızın oturumu kapatıldı."
   },
   "trustUserEmergencyAccess": {
-    "message": "Trust and confirm user"
+    "message": "Kullanıcıya güven ve onayla"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Kuruluşa güven"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Güven"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Güvenme"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Kuruluşa güvenilmiyor"
   },
   "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": "Hesabınızın güvenliği için, yalnızca bu kullanıcıya acil erişim yetkisi verdiyseniz ve parmak izi hesaplarındakiyle uyuşuyorsa onaylayın"
   },
   "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": "Hesabınızın güvenliği için, yalnızca bu kuruluşun bir üyesiyseniz, hesap kurtarma etkinse ve aşağıda görüntülenen parmak izi kuruluşun parmak iziyle eşleşiyorsa devam edin."
   },
   "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": "Bu kuruluşun, sizi hesap kurtarma sistemine kaydedecek bir kurumsal politikası vardır. Bu kaydolma işlemi, kuruluş yöneticilerinin parolanızı değiştirmesine izin verir. Yalnızca bu kuruluşu tanıyorsanız ve aşağıda görüntülenen parmak izi ifadesi kuruluşun parmak iziyle eşleşiyorsa devam edin."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Kullanıcıya güven"
   },
   "sshKeyWrongPassword": {
     "message": "Girdiğiniz parola yanlış."
@@ -10716,54 +11019,54 @@
     "message": "Parolayı girin"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "SSH anahtarı geçersiz"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "SSH anahtar türü desteklenmiyor"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "Anahtarı panodan içe aktar"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "SSH anahtarı başarıyla içe aktarıldı"
   },
   "copySSHPrivateKey": {
-    "message": "Copy private key"
+    "message": "Özel anahtarı kopyala"
   },
   "openingExtension": {
-    "message": "Opening the Bitwarden browser extension"
+    "message": "Bitwarden tarayıcı uzantısı açılıyor"
   },
   "somethingWentWrong": {
     "message": "Bir şeyler ters gitti..."
   },
   "openingExtensionError": {
-    "message": "We had trouble opening the Bitwarden browser extension. Click the button to open it now."
+    "message": "Bitwarden tarayıcı uzantısını açmakta sorun yaşadık. Şimdi açmak için düğmeye tıklayın."
   },
   "openExtension": {
     "message": "Uzantıyı aç"
   },
   "doNotHaveExtension": {
-    "message": "Don't have the Bitwarden browser extension?"
+    "message": "Bitwarden tarayıcı uzantısına sahip değil misiniz?"
   },
   "installExtension": {
     "message": "Uzantıyı yükle"
   },
   "openedExtension": {
-    "message": "Opened the browser extension"
+    "message": "Tarayıcı uzantısı açıldı"
   },
   "openedExtensionViewAtRiskPasswords": {
-    "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
+    "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": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
+    "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": "from the toolbar.",
+    "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": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
+    "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": {
       "reseller": {
         "content": "$1",
@@ -10776,7 +11079,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": "Aboneliğiniz için fatura $ISSUED_DATE$ tarihinde düzenlenmiştir. Hizmetin kesintisiz devam etmesi için, $DUE_DATE$ tarihinden önce $RESELLER$ ile iletişime geçerek yenileme işleminizi onaylatın.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10793,7 +11096,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": "Aboneliğinizin faturası ödenmemiştir. Hizmetin kesintisiz devam etmesi için, $RESELLER$ ile iletişime geçerek $GRACE_PERIOD_END$ tarihinden önce yenileme işleminizi onaylatın.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10806,13 +11109,13 @@
     }
   },
   "restartOrganizationSubscription": {
-    "message": "Organization subscription restarted"
+    "message": "Kuruluş aboneliği yeniden başlatıldı"
   },
   "restartSubscription": {
-    "message": "Restart your subscription"
+    "message": "Aboneliğinizi yeniden başlatın"
   },
   "suspendedManagedOrgMessage": {
-    "message": "Contact $PROVIDER$ for assistance.",
+    "message": "Yardım için $PROVIDER$ ile iletişime geçin.",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -10821,16 +11124,16 @@
     }
   },
   "accountDeprovisioningNotification": {
-    "message": "Administrators now have the ability to delete member accounts that belong to a claimed domain."
+    "message": "Yöneticiler artık talep edilen bir etki alanına ait üye hesaplarını silme yetkisine sahiptir."
   },
   "deleteManagedUserWarningDesc": {
-    "message": "This action will delete the member account including all items in their vault. This replaces the previous Remove action."
+    "message": "Bu işlem, üye hesabını ve kasasındaki tüm kayıtları siler. Bu, önceki Kaldır işleminin yerini alır."
   },
   "deleteManagedUserWarning": {
-    "message": "Delete is a new action!"
+    "message": "Silme yeni bir eylemdir!"
   },
   "seatsRemaining": {
-    "message": "You have $REMAINING$ seats remaining out of $TOTAL$ seats assigned to this organization. Contact your provider to manage your subscription.",
+    "message": "Bu kuruluşa tahsis edilen $TOTAL$ yerden kalan $REMAINING$ yeriniz bulunmaktadır. Aboneliğinizi yönetmek için sağlayıcınızla iletişime geçin.",
     "placeholders": {
       "remaining": {
         "content": "$1",
@@ -10843,19 +11146,19 @@
     }
   },
   "existingOrganization": {
-    "message": "Existing organization"
+    "message": "Mevcut kuruluş"
   },
   "selectOrganizationProviderPortal": {
-    "message": "Select an organization to add to your Provider Portal."
+    "message": "Sağlayıcı Portalınıza eklemek için bir kuruluş seçin."
   },
   "noOrganizations": {
-    "message": "There are no organizations to list"
+    "message": "Listelenecek kuruluş yok"
   },
   "yourProviderSubscriptionCredit": {
-    "message": "Your provider subscription will receive a credit for any remaining time in the organization's subscription."
+    "message": "Sağlayıcı aboneliğiniz, kuruluşun aboneliğinde kalan süre için bir kredi alacaktır."
   },
   "doYouWantToAddThisOrg": {
-    "message": "Do you want to add this organization to $PROVIDER$?",
+    "message": "Bu kuruluşu $PROVIDER$ sağlayıcısına eklemek istiyor musunuz?",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -10864,13 +11167,13 @@
     }
   },
   "addedExistingOrganization": {
-    "message": "Added existing organization"
+    "message": "Mevcut kuruluş eklendi"
   },
   "assignedExceedsAvailable": {
-    "message": "Assigned seats exceed available seats."
+    "message": "Atanan yer sayısı mevcut yer sayısından fazladır."
   },
   "userkeyRotationDisclaimerEmergencyAccessText": {
-    "message": "Fingerprint phrase for $NUM_USERS$ contacts for which you have enabled emergency access.",
+    "message": "Acil durum erişimini etkinleştirdiğiniz $NUM_USERS$ kişi için parmak izi ifadesi.",
     "placeholders": {
       "num_users": {
         "content": "$1",
@@ -10879,7 +11182,7 @@
     }
   },
   "userkeyRotationDisclaimerAccountRecoveryOrgsText": {
-    "message": "Fingerprint phrase for the organization $ORG_NAME$ for which you have enabled account recovery.",
+    "message": "Hesap kurtarmayı etkinleştirdiğiniz $ORG_NAME$ kuruluşu için parmak izi ifadesi.",
     "placeholders": {
       "org_name": {
         "content": "$1",
@@ -10888,43 +11191,66 @@
     }
   },
   "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": "Şifreleme anahtarlarınızı değiştirmek için, hesabınızı kurtarabilecek tüm kuruluşların anahtarlarına ve acil durum erişimi etkinleştirdiğiniz tüm kişilere güvenmeniz gerekir. Devam etmek için aşağıdakileri doğruladığınızdan emin olun:"
   },
   "userkeyRotationDisclaimerTitle": {
-    "message": "Untrusted encryption keys"
+    "message": "Güvenilmeyen şifreleme anahtarları"
   },
   "changeAtRiskPassword": {
-    "message": "Change at-risk password"
+    "message": "Risk altındaki parolayı değiştirin"
+  },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Bu hesap risk altında ve web sitesi eksik. Bir web sitesi ekleyin ve güvenliğinizi artırmak için parolayı değiştirin."
+  },
+  "missingWebsite": {
+    "message": "Web sitesi eksik"
   },
   "removeUnlockWithPinPolicyTitle": {
-    "message": "Remove Unlock with PIN"
+    "message": "PIN ile Kilit Açmayı Kaldır"
   },
   "removeUnlockWithPinPolicyDesc": {
-    "message": "Do not allow members to unlock their account with a PIN."
+    "message": "Üyelerin hesaplarının kilidini PIN ile açmalarına izin vermeyin."
   },
   "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": "Olay günlükleri kuruluşunuz için depolanmaz. Kuruluş olay günlüklerine tam erişim elde etmek için Ekip veya Kurumsal planına yükseltin."
   },
   "upgradeEventLogTitleMessage": {
-    "message": "Upgrade to see event logs from your organization."
+    "message": "Kuruluşunuzdaki olay günlüklerini görmek için yükseltin."
   },
   "upgradeEventLogMessage": {
-    "message": "These events are examples only and do not reflect real events within your Bitwarden organization."
+    "message": "Bu olaylar yalnızca örnektir ve Bitwarden kuruluşunuzdaki gerçek olayları yansıtmaz."
   },
   "viewEvents": {
-    "message": "View Events"
+    "message": "Olayları Görüntüle"
   },
   "cannotCreateCollection": {
     "message": "Ücretsiz kuruluşların en fazla 2 koleksiyonu olabilir. Daha fazla koleksiyon eklemek için ücretli bir plana geçin."
   },
+  "searchArchive": {
+    "message": "Arşivde ara"
+  },
+  "archiveNoun": {
+    "message": "Arşiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arşivle",
+    "description": "Verb"
+  },
+  "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."
+  },
   "businessUnit": {
-    "message": "Business Unit"
+    "message": "İş Birimi"
   },
   "businessUnits": {
-    "message": "Business Units"
+    "message": "İş Birimleri"
   },
   "newBusinessUnit": {
-    "message": "New business unit"
+    "message": "Yeni iş birimi"
   },
   "sendsTitleNoItems": {
     "message": "Hassas bilgileri güvenle paylaşın",
@@ -10935,20 +11261,20 @@
     "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": "Hızlıca parola oluşturun"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Tıklayarak güçlü ve benzersiz parolaları kolayca oluşturun",
     "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": "hesaplarınızı güvende tutmanıza yardımcı olmak için.",
     "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": "Güvenli oturumlar açmaya yardımcı olmak için Parola Oluştur düğmesine tıklayarak güçlü ve benzersiz parolalar oluşturun.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
@@ -10973,30 +11299,30 @@
     "message": "Kesintisiz çevrimiçi alışveriş"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Kartlarla, ödeme formlarını güvenli ve doğru bir şekilde kolayca otomatik doldurun."
   },
   "newIdentityNudgeTitle": {
     "message": "Hesap oluşturmak artık daha basit"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Kimlikler ile uzun kayıt veya iletişim formlarını hızla otomatik doldurun."
   },
   "newNoteNudgeTitle": {
     "message": "Hassas verilerinizi güvende tutun"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Notlarla, bankacılık veya sigorta bilgileri gibi hassas verileri güvenli bir şekilde saklayın."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Geliştirici dostu SSH erişimi"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Anahtarlarınızı saklayın ve hızlı, şifreli kimlik doğrulama için SSH aracısıyla bağlantı kurun.",
     "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 agent hakkında daha fazla bilgi edinin",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden uzantısı yüklendi!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Bitwarden uzantısını aç"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Otomatik doldurmaya başlamak için uzantıyı açıp giriş yapın."
   },
@@ -11031,15 +11363,15 @@
     "message": "Bitwarden uzantısını aç"
   },
   "gettingStartedWithBitwardenPart1": {
-    "message": "For tips on getting started with Bitwarden visit the",
+    "message": "Bitwarden ile çalışmaya başlamaya ilişkin ipuçları için",
     "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": "Öğ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'"
   },
   "gettingStartedWithBitwardenPart3": {
-    "message": "Help Center",
+    "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'"
   },
   "setupExtensionContentAlt": {
@@ -11049,13 +11381,13 @@
     "message": "Yeniden başlat"
   },
   "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": "Banka hesabı ile ödeme yalnızca Amerika Birleşik Devletleri'ndeki müşteriler için geçerlidir. Banka hesabınızı doğrulamanız gerekecektir. Önümüzdeki 1-2 iş günü içinde mikro bir para yatırma işlemi gerçekleştireceğiz. Banka hesabını doğrulamak için, sağlayıcının abonelik sayfasına bu para yatırma işleminin ekstre tanımlama kodunu girin. Banka hesabının doğrulanmaması, ödemenin yapılmaması ve aboneliğinizin askıya alınmasıyla sonuçlanacaktır."
   },
   "clickPayWithPayPal": {
-    "message": "Please click the Pay with PayPal button to add your payment method."
+    "message": "Ödeme yönteminizi eklemek için lütfen PayPal ile Öde düğmesine tıklayın."
   },
   "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$ adresini kaldırırsanız, bu Aile planının sponsorluğu sona erecektir. $DATE$ tarihinde sponsorlu kuruluşun yenileme tarihinden sonra, kuruluşunuzdaki bir yer üyeler veya sponsorluklar için kullanılabilir hale gelecektir.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -11068,9 +11400,15 @@
     }
   },
   "billingAddressRequiredToAddCredit": {
-    "message": "Billing address required to add credit.",
+    "message": "Kredi eklemek için fatura adresi gereklidir.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "Bu ayar hakkında"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden, deneyiminizi iyileştirmek için hangi simgenin veya şifre değiştirme URL'sinin kullanılması gerektiğini belirlemek için kayıtlı giriş URI'lerini kullanacaktır. Bu hizmeti kullandığınızda hiçbir bilgi toplanmaz veya kaydedilmez."
+  },
   "billingAddress": {
     "message": "Fatura adresi"
   },
@@ -11084,34 +11422,34 @@
     "message": "Kayıtlı adres yok."
   },
   "billingAddressUpdated": {
-    "message": "Your billing address has been updated."
+    "message": "Fatura adresiniz güncellendi."
   },
   "paymentDetails": {
     "message": "Ödeme bilgileri"
   },
   "paymentMethodUpdated": {
-    "message": "Your payment method has been updated."
+    "message": "Ödeme yönteminiz güncellendi."
   },
   "bankAccountVerified": {
-    "message": "Your bank account has been verified."
+    "message": "Banka hesabınız doğrulandı."
   },
   "availableCreditAppliedToInvoice": {
-    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+    "message": "Mevcut herhangi bir kredi, bu hesap için oluşturulan faturalara otomatik olarak uygulanacaktır."
   },
   "mustBePositiveNumber": {
-    "message": "Must be a positive number"
+    "message": "Pozitif bir sayı olmalıdır"
   },
   "cardSecurityCode": {
-    "message": "Card security code"
+    "message": "Kart güvenlik kodu"
   },
   "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 veya CVC olarak da bilinen kart güvenlik kodu, tipik olarak kredi kartınızın arkasında basılı 3 haneli bir sayı veya kart numaranızın üzerinde ön tarafta basılı 4 haneli bir sayıdır."
   },
   "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": "Banka hesabı ile ödeme yalnızca Amerika Birleşik Devletleri'ndeki müşteriler için geçerlidir. Banka hesabınızı doğrulamanız gerekecektir. Önümüzdeki 1-2 iş günü içinde mikro bir para yatırma işlemi gerçekleştireceğiz. Banka hesabını doğrulamak için Ödeme Ayrıntıları sayfasına bu para yatırma işleminin ekstre tanımlama kodunu girin. Banka hesabının doğrulanmaması, ödemenin kaçırılmasına ve aboneliğinizin askıya alınmasına neden olacaktır."
   },
   "taxId": {
-    "message": "Tax ID: $TAX_ID$",
+    "message": "Vergi Kimliği: $TAX_ID$",
     "placeholders": {
       "tax_id": {
         "content": "$1",
@@ -11123,11 +11461,11 @@
     "message": "Ödenmemiş faturalar"
   },
   "unpaidInvoicesForServiceUser": {
-    "message": "Your subscription has not been paid. Contact your provider administrator to restore service to you and your clients.",
+    "message": "Aboneliğiniz ödenmemiştir. Hizmetin size ve müşterilerinize yeniden sağlanması için sağlayıcı yöneticinizle iletişime geçin.",
     "description": "A message shown in a non-dismissible dialog to service users of unpaid providers."
   },
   "providerSuspended": {
-    "message": "$PROVIDER$ is suspended",
+    "message": "$PROVIDER$ sağlayıcısı askıya alındı",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -11136,11 +11474,11 @@
     }
   },
   "restoreProviderPortalAccessViaCustomerSupport": {
-    "message": "To restore access to your provider portal, contact Bitwarden Customer Support to renew your subscription.",
+    "message": "Sağlayıcı portalına erişiminizi geri yüklemek için Bitwarden Müşteri Desteği ile iletişime geçerek aboneliğinizi yenileyin.",
     "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": "Aboneliğiniz ödenmemiştir. Size ve müşterilerinize hizmeti geri yüklemek için, $CANCELLATION_DATE$ tarihine kadar bir ödeme yöntemi ekleyin.",
     "placeholders": {
       "cancellation_date": {
         "content": "$1",
@@ -11150,7 +11488,7 @@
     "description": "A message shown in a non-dismissible dialog to admins of unpaid providers."
   },
   "subscribetoEnterprise": {
-    "message": "Subscribe to $PLAN$",
+    "message": "$PLAN$ planına abone ol",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -11159,7 +11497,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": "7 günlük $PLAN$ denemeniz bugün başlıyor. Deneme süreniz sona erdikten sonra bu özellikleri kullanmaya devam etmek için şimdi bir ödeme yöntemi ekleyin: ",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -11168,13 +11506,13 @@
     }
   },
   "unlimitedSecretsAndProjects": {
-    "message": "Unlimited secrets and projects"
+    "message": "Sınırsız sırlar ve projeler"
   },
   "providersubscriptionCanceled": {
     "message": "Abonelik iptal edildi"
   },
   "providersubCanceledmessage": {
-    "message": "To resubscribe, contact Bitwarden Customer Support."
+    "message": "Yeniden abone olmak için Bitwarden Müşteri Desteği ile iletişime geçin."
   },
   "showMore": {
     "message": "Daha fazla göster"
@@ -11183,44 +11521,44 @@
     "message": "Daha az göster"
   },
   "missingTaxId": {
-    "message": "Missing Tax ID"
+    "message": "Vergi Kimliği Eksik"
   },
   "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": "İşlem gerekli: Ödeme ayrıntılarında vergi kimlik numarası eksik. Vergi kimlik numarası eklenmezse, faturalarınızda ek vergi uygulanabilir."
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "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."
   },
   "addTaxId": {
-    "message": "Add a Tax ID"
+    "message": "Vergi Kimliği Ekle"
   },
   "missingTaxIdCalloutTitle": {
-    "message": "Action required: Missing Tax ID"
+    "message": "Bir şey yapılması gerekiyor: Vergi Kimliği Eksik"
   },
   "missingTaxIdCalloutDescription": {
-    "message": "If a Tax ID is not added, your invoices may include additional tax."
+    "message": "Bir Vergi Kimliği eklenmezse, faturalarınız ek vergi içerebilir."
   },
   "unverifiedTaxIdWarning": {
-    "message": "Action required: Your Tax ID number is unverified. If your Tax ID is left unverified, your invoices may include additional tax."
+    "message": "Bir şey yapılması gerekiyor: Vergi Kimlik numaranız doğrulanmamış. Vergi Kimliğiniz doğrulanmamışsa, faturalarınız ek vergi içerebilir."
   },
   "editTaxId": {
-    "message": "Edit your Tax ID"
+    "message": "Vergi Kimliğini düzenle"
   },
   "unverifiedTaxIdCalloutTitle": {
-    "message": "Tax ID unverified"
+    "message": "Vergi Kimliği doğrulanmadı"
   },
   "unverifiedTaxIdCalloutDescription": {
-    "message": "Check your Tax ID to verify the format is correct and there are no typos."
+    "message": "Formatın doğru olduğunu ve yazım hatası olmadığını doğrulamak için Vergi Kimliğinizi kontrol edin."
   },
   "pendingVerification": {
-    "message": "Pending verification"
+    "message": "Doğrulama bekleniyor"
   },
   "checkInputFormat": {
-    "message": "Check input format for typos."
+    "message": "Yazım hataları için giriş formatını kontrol edin."
   },
   "exampleTaxIdFormat": {
-    "message": "Example $CODE$ format: $EXAMPLE$",
+    "message": "Örnek $CODE$ biçimi: $EXAMPLE$",
     "placeholders": {
       "code": {
         "content": "$1",
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Key Connector alan adını doğrulayın"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Banka hesabı ile ödeme yalnızca Amerika Birleşik Devletleri'ndeki müşteriler için geçerlidir. Banka hesabınızı doğrulamanız gerekecektir. Önümüzdeki 1-2 iş günü içinde mikro bir para yatırma işlemi gerçekleştireceğiz. Banka hesabının doğrulanmaması, ödemenin kaçırılmasına ve aboneliğinizin askıya alınmasına neden olacaktır."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Banka hesabınıza mikro bir para yatırımı yaptık. Bu işlem 1-2 iş günü sürebilir. Hesabınızda para yatırımı gördüğünüzde, banka hesabınızı doğrulayabilirsiniz. Banka hesabınızı doğrulamamanız durumunda ödeme yapılmayacak ve aboneliğiniz askıya alınacaktır."
+  },
+  "verifyNow": {
+    "message": "Şimdi doğrulayın."
+  },
+  "additionalStorageGB": {
+    "message": "Ek depolama alanı GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "İlave makine hesapları"
+  },
+  "secretsManagerSeats": {
+    "message": "Sır Yöneticisi yerleri"
+  },
+  "additionalStorage": {
+    "message": "Ek depolama"
+  },
+  "expandPurchaseDetails": {
+    "message": "Satın alma ayrıntılarını genişlet"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Satın alma ayrıntılarını daralt"
+  },
+  "familiesMembership": {
+    "message": "Aile üyeliği"
+  },
+  "planDescPremium": {
+    "message": "Tam çevrimiçi güvenlik"
+  },
+  "planDescFamiliesV2": {
+    "message": "Aileniz için Premium güvenlik"
+  },
+  "planDescFreeV2": {
+    "message": "$COUNT$ diğer kullanıcıyla paylaş",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Herhangi bir kuruluş için gelişmiş yetenekler"
+  },
+  "planNameCustom": {
+    "message": "Özel plan"
+  },
+  "planDescCustom": {
+    "message": "Bitwarden, her büyüklükteki işletmeyle uyumlu olarak parolaları ve hassas bilgileri güvence altına alır. Büyük kurumsal bir işletmenin parçasıysanız, satış ekibiyle iletişime geçerek fiyat teklifi isteyin."
+  },
+  "builtInAuthenticator": {
+    "message": "Dahili kimlik doğrulayıcı"
+  },
+  "breachMonitoring": {
+    "message": "İhlal izleme"
+  },
+  "andMoreFeatures": {
+    "message": "Ve daha fazlası!"
+  },
+  "secureFileStorage": {
+    "message": "Güvenli dosya depolama"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Sınırsız paylaşım - kimin neyi göreceğini seçin"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Sınırsız aile koleksiyonları"
+  },
+  "familiesSharedStorage": {
+    "message": "Önemli aile bilgileri için paylaşılmış depolama"
+  },
+  "limitedUsersV2": {
+    "message": "$COUNT$ üyeye kadar",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "$COUNT$ koleksiyona kadar",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Her zaman ücretsiz"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 sır"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ proje",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Güvenli kayıt paylaşımı"
+  },
+  "scimSupport": {
+    "message": "SCIM desteği"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ makine hesabı",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Kurumsal güvenlik ilkeleri"
+  },
+  "selfHostOption": {
+    "message": "Kendi sunucunuzda barındırma seçeneği"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Tüm kullanıcılar için ücretsiz aile planı"
+  },
+  "strengthenCybersecurity": {
+    "message": "Siber güvenliği güçlendirin"
+  },
+  "boostProductivity": {
+    "message": "Verimliliği artırın"
+  },
+  "seamlessIntegration": {
+    "message": "Sorunsuz entegrasyon"
   }
 }
-
diff --git a/apps/web/src/locales/uk/messages.json b/apps/web/src/locales/uk/messages.json
index cc3c31570a3..db32311e2ae 100644
--- a/apps/web/src/locales/uk/messages.json
+++ b/apps/web/src/locales/uk/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Всі програми"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Логотип Bitwarden"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Створити новий запис"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Сповіщення учасників ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "Коли користувачі зберігатимуть записи, тут з'являтимуться програми з ризикованими паролями. Позначте критичні програми та сповіщайте користувачів про необхідність зміни паролів."
   },
-  "noCriticalAppsTitle": {
-    "message": "Ви не позначили жодної критичної програми"
+  "noCriticalApplicationsTitle": {
+    "message": "Ви не відмітили жодного додатку в якості критичного"
   },
-  "noCriticalAppsDescription": {
-    "message": "Виберіть найбільш критичні програми, для яких виявлятимуться ризиковані паролі, та сповіщайте користувачів про необхідність їх заміни."
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "Позначити критичні програми"
+  "markCriticalApplications": {
+    "message": "Вибрати критичні додатки"
   },
   "markAppAsCritical": {
     "message": "Позначити програму критичною"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Ризиковані учасники"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Учасники з ризиком ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Позначку критичної програми знято"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "Який це тип запису?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Переглянути запис"
   },
-  "newItemHeader": {
-    "message": "Новий $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Редагувати $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Переглянути $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Новий",
@@ -1395,6 +1542,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": "Неправильний пароль файлу. Використайте пароль, який ви вводили під час створення експортованого файлу."
   },
@@ -1404,6 +1560,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": "У вас немає повноважень на перегляд усіх записів у цій збірці."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Виберіть спосіб двоетапної перевірки"
   },
-  "recoveryCodeDesc": {
-    "message": "Втратили доступ до всіх провайдерів двоетапної перевірки? Скористайтеся кодом відновлення, щоб вимкнути двоетапну перевірку для свого облікового запису."
-  },
   "recoveryCodeTitle": {
     "message": "Код відновлення"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Змінити мову інтерфейсу вебсховища."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "Типово"
@@ -4702,6 +4876,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": "До призупинених організацій не можна отримати доступ. Зверніться до власника вашої організації для отримання допомоги."
   },
@@ -4714,9 +4894,6 @@
   "serviceAccountsCannotCreate": {
     "message": "У призупинених організаціях не можна створювати службові облікові записи. Зверніться до власника вашої організації для отримання допомоги."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Записи у призупинених організаціях недоступні. Зверніться до власника вашої організації для отримання допомоги."
-  },
   "licenseIsExpired": {
     "message": "Термін дії ліцензії завершився."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "У зв'язку з політикою компанії, вам не дозволено зберігати записи до особистого сховища. Змініть налаштування власності на організацію та виберіть серед доступних збірок."
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Вилучити відправлення"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO вимкнено"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector увімкнено"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Доступ заборонено. У вас немає дозволу на перегляд цієї сторінки."
   },
@@ -6999,7 +7214,7 @@
     "message": "Адреса е-пошти Catch-all"
   },
   "catchallEmailDesc": {
-    "message": "Використовуйте свою скриньку вхідних Catch-All власного домену."
+    "message": "Використовуйте можливості Catch-All власного домену."
   },
   "useThisEmail": {
     "message": "Використати цю е-пошту"
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Вимк"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "Учасники"
   },
@@ -8287,12 +8508,6 @@
   "groupSlashUser": {
     "message": "Група/Користувач"
   },
-  "lowKdfIterations": {
-    "message": "Низьке значення ітерацій KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Оновіть свої налаштування шифрування згідно з новими рекомендаціями щодо безпеки для вдосконалення захисту облікового запису."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Продовжуючи, ви вийдете з усіх активних сеансів. Необхідно буде повторно виконати вхід і пройти двоетапну перевірку, якщо вона увімкнена. Перед зміною налаштувань шифрування ми рекомендуємо експортувати ваше сховище, щоб запобігти можливій втраті даних."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Призначити"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Призначити до збірок"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Відсутній ID пристрою"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Відкрити посібник із впровадження $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Низьке значення ітерацій KDF. Збільште значення для посилення безпеки свого облікового запису."
-  },
-  "changeKDFSettings": {
-    "message": "Змінити налаштування KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Захистіть свою інфраструктуру"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Докладніше про Bitwarden API"
   },
-  "fileSend": {
-    "message": "Відправлення файлу"
-  },
   "fileSends": {
     "message": "Відправлення файлів"
   },
-  "textSend": {
-    "message": "Відправлення тексту"
-  },
   "textSends": {
     "message": "Відправлення тексту"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Змінити ризикований пароль"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Вилучити розблокування з PIN-кодом"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Безплатні організації можуть мати до 2 збірок. Передплатіть тарифний план, щоб додати більше збірок."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Бізнес-підрозділ"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Розширення Bitwarden встановлено!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Відкрийте розширення, щоб увійти й користуватися автозаповненням."
   },
@@ -11071,6 +11403,12 @@
     "message": "Щоб додати кредит, необхідно ввести платіжну адресу.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Платіжна адреса"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/locales/vi/messages.json b/apps/web/src/locales/vi/messages.json
index 7ff869e5a3b..f5e3ee95bb6 100644
--- a/apps/web/src/locales/vi/messages.json
+++ b/apps/web/src/locales/vi/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "Tất cả các ứng dụng"
   },
+  "activity": {
+    "message": "Hoạt động"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "Tạo mục đăng nhập mới"
   },
+  "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, they will display here."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Once you mark applications critical, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ ứng dụng quan trọng",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ ứng dụng gặp rủi ro",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Các thành viên đã được thông báo ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "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."
   },
-  "noCriticalAppsTitle": {
-    "message": "Bạn chưa đánh dấu bất kỳ ứng dụng nào là Quan trọng"
+  "noCriticalApplicationsTitle": {
+    "message": "Bạn chưa đánh dấu ứng dụng nào là quan trọng"
   },
-  "noCriticalAppsDescription": {
-    "message": "Chọn các ứng dụng quan trọng nhất của bạn để phát hiện các mật khẩu có nguy cơ bị lộ, và thông báo cho người dùng thay đổi các mật khẩu đó."
+  "noCriticalApplicationsDescription": {
+    "message": "Chọn các ứng dụng quan trọng nhất để ưu tiên các hành động bảo mật, giúp người dùng xử lý mật khẩu có nguy cơ bị lộ."
   },
-  "markCriticalApps": {
-    "message": "Đánh dấu các ứng dụng quan trọng"
+  "markCriticalApplications": {
+    "message": "Chọn các ứng dụng quan trọng"
   },
   "markAppAsCritical": {
     "message": "Đánh dấu các ứng dụng quan trọng"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "Các thành viên có rủi ro"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ thành viên gặp rủi ro",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "Các thành viên có rủi ro ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "Bỏ đánh dấu là nghiêm trọng"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Ứng dụng quan trọng đã được gỡ bỏ dấu hiệu thành công"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Đã bỏ đánh dấu ứng dụng là quan trọng thành công"
   },
   "whatTypeOfItem": {
     "message": "Mục này là gì?"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "Xem mục"
   },
-  "newItemHeader": {
-    "message": "$TYPE$ mới",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "Đăng nhập mới",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Chỉnh sửa $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "Thẻ mới",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "Xem $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "Danh tính mới",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "Ghi chú mới",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "Khóa SSH mới",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "Send văn bản mới",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "Send tập tin mới",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Chỉnh sửa đăng nhập",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Chỉnh sửa thẻ",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Chỉnh sửa danh tính",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Chỉnh sửa ghi chú",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Sửa khóa SSH",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Sửa Send văn bản",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Sửa Send tập tin",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "Xem đăng nhập",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "Xem thẻ",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "Xem danh tính",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "Xem ghi chú",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "Xem khóa SSH",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "Mới",
@@ -1395,6 +1542,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."
   },
@@ -1404,6 +1560,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."
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Chọn phương pháp đăng nhập hai bước"
   },
-  "recoveryCodeDesc": {
-    "message": "Bạn bị mất quyền truy cập vào tất cả các dịch vụ xác minh hai bước? Sử dụng mã phục hồi của bạn để tắt chúng trên tài khoản bạn."
-  },
   "recoveryCodeTitle": {
     "message": "Mã phục hồi"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "Thay đổi ngôn ngữ của kho trên web."
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Hiển thị biểu tượng trang web và truy xuất các URL đổi mật khẩu"
   },
   "default": {
     "message": "Mặc định"
@@ -4702,6 +4876,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ợ."
   },
@@ -4714,9 +4894,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."
   },
@@ -5090,9 +5267,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"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "Do chính sách của doanh nghiệp, bạn không thể lưu trữ các mục vào kho cá nhân của mình. Hãy thay đổi tùy chọn Quyền sở hữu thành tổ chức và chọn từ các bộ sưu tập có sẵn."
   },
+  "desktopAutotypePolicy": {
+    "message": "Cài đặt Mặc định Tự động gõ phím trên Máy tính"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Bật Tự động gõ phím trên Máy tính mặc định cho thành viên. Thành viên có thể tắt Tự động gõ phím thủ công trong ứng dụng máy tính để bàn.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "Xóa Send"
   },
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO đã được bật"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ phải đăng nhập bằng Đăng nhập một lần",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector đã được kích hoạt"
   },
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Truy cập bị từ chối. Bạn không có quyền xem trang này."
   },
@@ -7043,6 +7258,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."
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "Tắt"
   },
+  "connected": {
+    "message": "Đã kết nối"
+  },
   "members": {
     "message": "Thành viên"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,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",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -8939,23 +9233,23 @@
     "message": "Quản lý bộ sưu tập"
   },
   "collectionManagementDescription": {
-    "message": "Configure the collection behavior for the organization"
+    "message": "Cấu hình hành vi bộ sưu tập cho tổ chức"
   },
   "allowAdminAccessToAllCollectionItemsDescription": {
-    "message": "Allow owners and admins to manage all collections and items from the Admin Console"
+    "message": "Cho phép chủ sở hữu và quản trị viên quản lý tất cả các bộ sưu tập và mục từ Bảng điều khiển quản trị"
   },
   "restrictCollectionCreationDescription": {
-    "message": "Restrict collection creation to owners and admins"
+    "message": "Hạn chế tạo bộ sưu tập cho chủ sở hữu và quản trị viên"
   },
   "restrictCollectionDeletionDescription": {
-    "message": "Restrict collection deletion to owners and admins"
+    "message": "Hạn chế xóa bộ sưu tập cho chủ sở hữu và quản trị viên"
   },
   "restrictItemDeletionDescriptionStart": {
-    "message": "Restrict item deletion to members with the ",
+    "message": "Hạn chế xóa mục cho thành viên có ",
     "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": " quyền",
     "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": {
@@ -9035,7 +9329,7 @@
     }
   },
   "limitCollectionCreationEnabled": {
-    "message": "Turned on Restrict collection creation setting $ID$.",
+    "message": "Đã bật cài đặt Hạn chế tạo bộ sưu tập $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9044,7 +9338,7 @@
     }
   },
   "limitCollectionCreationDisabled": {
-    "message": "Turned off Restrict collection creation setting $ID$.",
+    "message": "Đã tắt cài đặt Hạn chế tạo bộ sưu tập $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9053,7 +9347,7 @@
     }
   },
   "limitCollectionDeletionEnabled": {
-    "message": "Turned on Restrict collection deletion setting $ID$.",
+    "message": "Đã bật cài đặt Hạn chế xóa bộ sưu tập $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9062,7 +9356,7 @@
     }
   },
   "limitCollectionDeletionDisabled": {
-    "message": "Turned off Restrict collection deletion setting $ID$.",
+    "message": "Đã tắt cài đặt Hạn chế xóa bộ sưu tập $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9071,7 +9365,7 @@
     }
   },
   "limitItemDeletionEnabled": {
-    "message": "Turned on Restrict item deletion setting $ID$.",
+    "message": "Đã bật cài đặt Hạn chế xóa mục $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9080,7 +9374,7 @@
     }
   },
   "limitItemDeletionDisabled": {
-    "message": "Turned off Restrict item deletion setting $ID$.",
+    "message": "Đã tắt cài đặt Hạn chế xóa mục $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9089,7 +9383,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsEnabled": {
-    "message": "Turned on Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Đã bật cài đặt Cho phép chủ sở hữu và quản trị viên quản lý tất cả các bộ sưu tập và mục $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9098,7 +9392,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsDisabled": {
-    "message": "Turned off Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Đã tắt cài đặt Cho phép chủ sở hữu và quản trị viên quản lý tất cả các bộ sưu tập và mục $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "Gán"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Gán vào bộ sưu tập"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Thiếu ID thiết bị"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Cập nhật $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Mở hướng dẫn triển khai $INTEGRATION$.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Tên kho lưu trữ để tiếp nhận vào"
+  },
   "index": {
     "message": "Mục lục"
   },
@@ -9892,12 +10207,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"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "Tìm hiểu thêm về API của Bitwarden"
   },
-  "fileSend": {
-    "message": "Send tập tin"
-  },
   "fileSends": {
     "message": "Send tập tin"
   },
-  "textSend": {
-    "message": "Send văn bản"
-  },
   "textSends": {
     "message": "Gửi văn bản"
   },
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Thay đổi mật khẩu có rủi ro"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "Mục đăng nhập này có nguy cơ bị lộ và thiếu trang web. Thêm trang web và thay đổi mật khẩu để tăng cường bảo mật."
+  },
+  "missingWebsite": {
+    "message": "Thiếu trang web"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Xóa Mở khóa bằng mã PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Các tổ chức miễn phí có thể có tối đa 2 bộ sưu tập. Nâng cấp lên gói trả phí để thêm nhiều bộ sưu tập hơn."
   },
+  "searchArchive": {
+    "message": "Tìm kiếm kho lưu trữ"
+  },
+  "archiveNoun": {
+    "message": "Lưu trữ",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Lưu trữ",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "Không có mục nào trong kho lưu trữ"
+  },
+  "archivedItemsDescription": {
+    "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."
+  },
   "businessUnit": {
     "message": "Bộ phận kinh doanh"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Đã cài đặt tiện ích mở rộng Bitwarden!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Mở tiện ích mở rộng Bitwarden"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "Tiện ích mở rộng Bitwarden đã được cài đặt! Mở tiện ích mở rộng để đăng nhập và bắt đầu tự động điền."
+  },
   "openExtensionToAutofill": {
     "message": "Mở tiện ích mở rộng để đăng nhập và bắt đầu tự động điền."
   },
@@ -11071,6 +11403,12 @@
     "message": "Cần có địa chỉ thanh toán để thêm tín dụng.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "Về cài đặt này"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden sẽ sử dụng URI đăng nhập đã lưu để xác định biểu tượng hoặc URL đổi mật khẩu nào cần dùng nhằm cải thiện trải nghiệm của bạn. Không có thông tin nào được thu thập hay lưu lại khi bạn sử dụng dịch vụ này."
+  },
   "billingAddress": {
     "message": "Địa chỉ thanh toán"
   },
@@ -11233,7 +11571,147 @@
     }
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Xác nhận tên miền Key Connector"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "Thanh toán bằng tài khoản ngân hàng chỉ khả dụng với khách hàng ở Hoa Kỳ. Bạn sẽ phải xác minh tài khoản ngân hàng của mình. Chúng tôi sẽ thực hiện một khoản tiền gửi nhỏ trong vòng 1-2 ngày làm việc tới. Việc không xác minh tài khoản ngân hàng sẽ dẫn đến lỡ kỳ thanh toán và đăng ký của bạn sẽ bị tạm ngưng."
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "Chúng tôi đã thực hiện một khoản tiền gửi nhỏ vào tài khoản ngân hàng của bạn. Việc này có thể mất 1-2 ngày làm việc. Khi bạn thấy khoản tiền gửi trong tài khoản, bạn có thể xác minh tài khoản ngân hàng của mình. Việc không xác minh tài khoản ngân hàng sẽ dẫn đến lỡ kỳ thanh toán và đăng ký của bạn sẽ bị tạm ngưng."
+  },
+  "verifyNow": {
+    "message": "Xác minh ngay."
+  },
+  "additionalStorageGB": {
+    "message": "GB lưu trữ bổ sung"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Tài khoản máy bổ sung"
+  },
+  "secretsManagerSeats": {
+    "message": "chỗ Trình quản lý Bí mật Bitwarden"
+  },
+  "additionalStorage": {
+    "message": "Bộ nhớ Bổ sung"
+  },
+  "expandPurchaseDetails": {
+    "message": "Mở rộng chi tiết mua hàng"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Thu gọn chi tiết mua hàng"
+  },
+  "familiesMembership": {
+    "message": "Gói Bitwarden Gia đình"
+  },
+  "planDescPremium": {
+    "message": "Bảo mật trực tuyến toàn diện"
+  },
+  "planDescFamiliesV2": {
+    "message": "Bảo mật cao cấp cho gia đình bạn"
+  },
+  "planDescFreeV2": {
+    "message": "Chia sẻ với $COUNT$ người dùng khác",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Khả năng nâng cao cho mọi tổ chức"
+  },
+  "planNameCustom": {
+    "message": "Gói tùy chỉnh"
+  },
+  "planDescCustom": {
+    "message": "Bitwarden mở rộng quy mô cùng với các doanh nghiệp thuộc mọi quy mô để bảo mật mật khẩu và thông tin nhạy cảm. Nếu bạn là một phần của doanh nghiệp lớn, hãy liên hệ với bộ phận bán hàng để yêu cầu báo giá."
+  },
+  "builtInAuthenticator": {
+    "message": "Trình xác thực tích hợp"
+  },
+  "breachMonitoring": {
+    "message": "Giám sát vi phạm"
+  },
+  "andMoreFeatures": {
+    "message": "Và nhiều hơn nữa!"
+  },
+  "secureFileStorage": {
+    "message": "Lưu trữ tệp an toàn"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Chia sẻ không giới hạn - chọn người xem nội dung nào"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Bộ sưu tập gia đình không giới hạn"
+  },
+  "familiesSharedStorage": {
+    "message": "Bộ nhớ được chia sẻ cho thông tin gia đình quan trọng"
+  },
+  "limitedUsersV2": {
+    "message": "Tối đa $COUNT$ thành viên",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Tối đa $COUNT$ bộ sưu tập",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Luôn miễn phí"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 bí mật"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ dự án",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Chia sẻ mục an toàn"
+  },
+  "scimSupport": {
+    "message": "Hỗ trợ SCIM"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ tài khoản máy",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Chính sách bảo mật cấp doanh nghiệp"
+  },
+  "selfHostOption": {
+    "message": "Tùy chọn tự lưu trữ"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Gói Bitwarden Gia đình miễn phí cho tất cả người dùng"
+  },
+  "strengthenCybersecurity": {
+    "message": "Tăng cường an ninh mạng"
+  },
+  "boostProductivity": {
+    "message": "Tăng năng suất"
+  },
+  "seamlessIntegration": {
+    "message": "Tích hợp liền mạch"
   }
 }
-
diff --git a/apps/web/src/locales/zh_CN/messages.json b/apps/web/src/locales/zh_CN/messages.json
index 322a60cc2b7..12afbc9a33c 100644
--- a/apps/web/src/locales/zh_CN/messages.json
+++ b/apps/web/src/locales/zh_CN/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "所有应用程序"
   },
+  "activity": {
+    "message": "活动"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -21,7 +24,7 @@
     "message": "密码风险"
   },
   "reviewAtRiskPasswords": {
-    "message": "审查各个应用程序中存在风险的密码（弱、暴露或重复使用）。选择最关键的应用程序，优先为用户采取安全措施，以解决存在风险的密码问题。"
+    "message": "审查各个应用程序中存在风险的密码（弱、暴露或重复使用）。选择最关键的应用程序，优先为您的用户采取安全措施，以处理存在风险的密码。"
   },
   "dataLastUpdated": {
     "message": "数据最后更新于：$DATE$",
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "创建新的登录项目"
   },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ 个关键应用程序",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ 个应用程序存在风险",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ 个密码存在风险",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "已通知的成员 ($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "当用户保存登录信息时，应用程序会出现在这里，显示所有存在风险的密码。标记关键应用程序并通知用户更新密码。"
   },
-  "noCriticalAppsTitle": {
-    "message": "您未将任何应用程序标记为关键"
+  "noCriticalApplicationsTitle": {
+    "message": "您还没有将任何应用程序标记为关键"
   },
-  "noCriticalAppsDescription": {
-    "message": "选择最关键的应用程序来发现存在风险的密码，并通知用户更改这些密码。"
+  "noCriticalApplicationsDescription": {
+    "message": "选择最关键的应用程序，优先为您的用户采取安全措施，以处理存在风险的密码。"
   },
-  "markCriticalApps": {
-    "message": "标记关键应用程序"
+  "markCriticalApplications": {
+    "message": "选择关键应用程序"
   },
   "markAppAsCritical": {
     "message": "标记应用程序为关键"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "存在风险的成员"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "对关键应用程序中存在风险的项目具有访问权限的成员"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ 个成员存在风险",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "存在风险的成员 ($COUNT$)",
     "placeholders": {
@@ -179,8 +277,8 @@
   "unmarkAsCritical": {
     "message": "取消标记为关键"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "关键应用程序已成功取消标记"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "成功将应用程序取消标记为关键"
   },
   "whatTypeOfItem": {
     "message": "这是什么类型的项目？"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "查看项目"
   },
-  "newItemHeader": {
-    "message": "新增 $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "新增登录",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "编辑 $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "新增支付卡",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "查看 $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "新增身份",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "新增笔记",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "新增 SSH 密钥",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "新增文本 Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "新增文件 Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "编辑登录",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "编辑支付卡",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "编辑身份",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "编辑笔记",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "编辑 SSH 密钥",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "编辑文本 Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "编辑文件 Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "查看登录",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "查看支付卡",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "查看身份",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "查看笔记",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "查看 SSH 密钥",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "新增",
@@ -883,7 +1030,7 @@
     "message": "卡号"
   },
   "copyFieldCipherName": {
-    "message": "复制 $CIPHERNAME$ 的 $FIELD$",
+    "message": "复制 $CIPHERNAME$ 中的 $FIELD$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -1356,7 +1503,7 @@
     "message": "账户创建成功。"
   },
   "masterPassSent": {
-    "message": "我们已经为您发送了包含主密码提示的电子邮件。"
+    "message": "我们已经向您发送了一封包含主密码提示的电子邮件。"
   },
   "unexpectedError": {
     "message": "发生意外错误。"
@@ -1395,6 +1542,15 @@
   "invalidMasterPassword": {
     "message": "无效的主密码"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "无效的主密码。请确认您的电子邮箱正确无误，以及您的账户是在 $HOST$ 上创建的。",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "无效的文件密码，请使用您创建导出文件时输入的密码。"
   },
@@ -1404,6 +1560,30 @@
   "noItemsInList": {
     "message": "没有可列出的项目。"
   },
+  "noItemsInTrash": {
+    "message": "回收站中没有项目"
+  },
+  "noItemsInTrashDesc": {
+    "message": "您删除的项目将显示在这里，并在 30 天后永久删除"
+  },
+  "noItemsInVault": {
+    "message": "密码库中没有项目"
+  },
+  "emptyVaultDescription": {
+    "message": "密码库不仅保护您的密码。在这里还可以安全地存储登录、ID、支付卡和笔记。"
+  },
+  "emptyFavorites": {
+    "message": "您没有收藏任何项目"
+  },
+  "emptyFavoritesDesc": {
+    "message": "将常用项目添加到收藏夹以便快速访问。"
+  },
+  "noSearchResults": {
+    "message": "未返回搜索结果"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "清除筛选或尝试其他搜索词"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "您没有查看此集合中的所有项目的权限。"
   },
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "选择两步登录方式"
   },
-  "recoveryCodeDesc": {
-    "message": "无法访问您所有的两步登录提供程序吗？请使用您的恢复代码来停用您账户中所有的两步登录提供程序。"
-  },
   "recoveryCodeTitle": {
     "message": "恢复代码"
   },
@@ -1799,7 +1976,7 @@
     "message": "更改电子邮箱"
   },
   "changeEmailTwoFactorWarning": {
-    "message": "继续操作将更改您的账户电子邮箱地址。这不会更改用于双重身份验证的电子邮箱地址。您可以在两步登录设置中更改它。"
+    "message": "继续操作将更改您的账户电子邮箱地址。但不会更改用于双重身份验证的电子邮箱地址，您可以在两步登录设置中更改它。"
   },
   "newEmail": {
     "message": "新电子邮箱"
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "更改网页密码库的语言。"
   },
-  "enableFavicon": {
-    "message": "显示网站图标"
-  },
-  "faviconDesc": {
-    "message": "在每个登录项目旁边显示一个可识别的图像。"
+  "showIconsChangePasswordUrls": {
+    "message": "显示网站图标并获取更改密码的 URL"
   },
   "default": {
     "message": "默认"
@@ -2509,7 +2683,7 @@
     "message": "未激活两步登录"
   },
   "inactive2faReportDesc": {
-    "message": "两步登录为您的账户增加了一层保护。使用 Bitwarden 验证器或其他方式为这些账户开启两步登录。"
+    "message": "两步登录为您的账户增加了一层保护。使用 Bitwarden Authenticator 或其他方式为这些账户开启两步登录。"
   },
   "inactive2faFound": {
     "message": "发现未启用两步登录的登录项目"
@@ -2701,7 +2875,7 @@
     "message": "计费"
   },
   "billingPlanLabel": {
-    "message": "计费计划"
+    "message": "计费方案"
   },
   "paymentType": {
     "message": "付款类型"
@@ -2785,7 +2959,7 @@
     }
   },
   "bitwardenFamiliesPlan": {
-    "message": "Bitwarden 家庭计划。"
+    "message": "Bitwarden 家庭方案。"
   },
   "addons": {
     "message": "附加项目"
@@ -2813,7 +2987,7 @@
     "message": "# GB 附加存储"
   },
   "additionalStorageIntervalDesc": {
-    "message": "您的计划包含 $SIZE$ 的加密存储空间。您也可以以每 GB $PRICE$ /$INTERVAL$ 购买附加存储。",
+    "message": "您的方案包含 $SIZE$ 加密文件存储空间。您也可以以每 GB $PRICE$ /$INTERVAL$ 购买附加存储。",
     "placeholders": {
       "size": {
         "content": "$1",
@@ -2870,7 +3044,7 @@
     "message": "任何未付费订阅都将通过您的付款方式收取费用。"
   },
   "paymentChargedWithTrial": {
-    "message": "您的计划包含了 7 天的免费试用。在试用期结束前，不会从您的付款方式中扣款。您可以随时取消。"
+    "message": "您的方案包含了 7 天的免费试用。在试用期结束前，不会从您的付款方式中扣款。您可以随时取消。"
   },
   "paymentInformation": {
     "message": "支付信息"
@@ -3092,7 +3266,7 @@
     "message": "公司名称"
   },
   "chooseYourPlan": {
-    "message": "选择您的计划"
+    "message": "选择您的方案"
   },
   "users": {
     "message": "用户"
@@ -3107,7 +3281,7 @@
     "message": "# 用户席位"
   },
   "userSeatsAdditionalDesc": {
-    "message": "您的计划包含 $BASE_SEATS$ 个用户席位。您也可以以每用户 $SEAT_PRICE$ /月购买附加用户。",
+    "message": "您的方案包含 $BASE_SEATS$ 个用户席位。您也可以以每用户 $SEAT_PRICE$ /月购买附加用户。",
     "placeholders": {
       "base_seats": {
         "content": "$1",
@@ -3123,7 +3297,7 @@
     "message": "您需要多少个用户席位？您也可以在以后需要的时候添加附加席位。"
   },
   "planNameFree": {
-    "message": "免费",
+    "message": "免费版",
     "description": "Free as in 'free beer'."
   },
   "planDescFree": {
@@ -3136,7 +3310,7 @@
     }
   },
   "planNameFamilies": {
-    "message": "家庭"
+    "message": "家庭版"
   },
   "planDescFamilies": {
     "message": "适用于个人使用，与家人和朋友共享。"
@@ -3253,7 +3427,7 @@
     }
   },
   "trialThankYou": {
-    "message": "感谢您注册适用于 $PLAN$ 的 Bitwarden！",
+    "message": "感谢您注册 $PLAN$ Bitwarden！",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -3262,7 +3436,7 @@
     }
   },
   "trialSecretsManagerThankYou": {
-    "message": "感谢您注册适用于 $PLAN$ 的 Bitwarden 机密管理器！",
+    "message": "感谢您注册 $PLAN$ Bitwarden 机密管理器！",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -4312,15 +4486,15 @@
     "message": "对于美国境内的客户，需要提供邮政编码以满足销售税要求。对于其他国家，您可以选择提供一个税号 (VAT/GST) 和/或地址来显示在您的账单上。"
   },
   "billingPlan": {
-    "message": "计划",
+    "message": "方案",
     "description": "A billing plan/package. For example: Families, Teams, Enterprise, etc."
   },
   "changeBillingPlan": {
-    "message": "升级计划",
+    "message": "升级方案",
     "description": "A billing plan/package. For example: Families, Teams, Enterprise, etc."
   },
   "changeBillingPlanUpgrade": {
-    "message": "要将您的账户升级到另一个计划，请提供以下信息。同时请确保您账户已添加有一个有效的付款方式。",
+    "message": "要将您的账户升级到另一个方案，请提供以下信息。同时请确保您账户已添加有一个有效的付款方式。",
     "description": "A billing plan/package. For example: Families, Teams, Enterprise, etc."
   },
   "invoiceNumber": {
@@ -4349,7 +4523,7 @@
     "message": "使用银行账户付款仅对美国用户开放。您将被要求验证您的银行账户。我们将在 1-2 个工作日内进行两笔小额转账，请在组织的计费页面输入这些金额以验证银行账户。"
   },
   "verifyBankAccountFailureWarning": {
-    "message": "验证银行账户失败将会错过支付，您的订阅将失效。"
+    "message": "验证银行账户失败将会错过支付，您的订阅将暂停。"
   },
   "verifiedBankAccount": {
     "message": "银行账户已验证"
@@ -4459,7 +4633,7 @@
     }
   },
   "subscriptionUserSeatsWithoutAdditionalSeatsOption": {
-    "message": "您最多可邀请 $COUNT$ 名成员，而无需额外付费。要升级您的计划并邀请更多成员，请联系客户支持。",
+    "message": "您最多可邀请 $COUNT$ 名成员，而无需额外付费。要升级您的方案并邀请更多成员，请联系客户支持。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4468,7 +4642,7 @@
     }
   },
   "subscriptionFreePlan": {
-    "message": "如果不升级您的计划，您最多只能邀请 $COUNT$ 位成员。",
+    "message": "如果不升级您的方案，您最多只能邀请 $COUNT$ 位成员。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4477,7 +4651,7 @@
     }
   },
   "subscriptionUpgrade": {
-    "message": "如果不升级您的计划，您最多只能邀请 $COUNT$ 位成员。",
+    "message": "如果不升级您的方案，您最多只能邀请 $COUNT$ 位成员。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4486,7 +4660,7 @@
     }
   },
   "subscriptionSponsoredFamiliesPlan": {
-    "message": "您的订阅一共允许 $COUNT$ 位成员。您的计划由一个外部组织赞助和支付费用。",
+    "message": "您的订阅一共允许 $COUNT$ 位成员。您的方案由一个外部组织赞助和支付费用。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4607,7 +4781,7 @@
     "message": "升级组织"
   },
   "upgradeOrganizationDesc": {
-    "message": "此功能不适用于免费组织。请切换到付费计划以解锁更多功能。"
+    "message": "此功能不适用于免费组织。请切换到付费方案以解锁更多功能。"
   },
   "createOrganizationStep1": {
     "message": "创建组织：第一步"
@@ -4700,22 +4874,25 @@
     "description": "ex. Date this password was updated"
   },
   "organizationIsDisabled": {
-    "message": "组织已停用"
+    "message": "组织已暂停"
+  },
+  "organizationIsSuspended": {
+    "message": "组织已暂停"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "无法访问已暂停组织中的项目。请联系您的组织所有者寻求帮助。"
   },
   "secretsAccessSuspended": {
-    "message": "无法访问已停用的组织。请联系您的组织所有者寻求帮助。"
+    "message": "无法访问已暂停的组织。请联系您的组织所有者寻求帮助。"
   },
   "secretsCannotCreate": {
-    "message": "无法在已停用的组织中创建机密。请联系您的组织所有者寻求帮助。"
+    "message": "无法在已暂停的组织中创建机密。请联系您的组织所有者寻求帮助。"
   },
   "projectsCannotCreate": {
-    "message": "无法在已停用的组织中创建工程。请联系您的组织所有者寻求帮助。"
+    "message": "无法在已暂停的组织中创建工程。请联系您的组织所有者寻求帮助。"
   },
   "serviceAccountsCannotCreate": {
-    "message": "无法在已停用的组织中创建服务账户。请联系您的组织所有者寻求帮助。"
-  },
-  "disabledOrganizationFilterError": {
-    "message": "无法访问已停用组织中的项目。请联系您的组织所有者寻求帮助。"
+    "message": "无法在已暂停的组织中创建服务账户。请联系您的组织所有者寻求帮助。"
   },
   "licenseIsExpired": {
     "message": "授权已过期"
@@ -5090,9 +5267,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"
@@ -5300,22 +5481,22 @@
     "message": "紧急访问"
   },
   "emergencyAccessDesc": {
-    "message": "授予和管理可信联系人的紧急访问权限。可信联系人可以在紧急情况下请求获取查看或接管您账户的权限。请访问我们的帮助页面，了解更多关于零知识共享的工作原理和细节。"
+    "message": "授予和管理可信任的联系人的紧急访问权限。已信任的联系人可以在紧急情况下请求获取查看或接管您账户的权限。请访问我们的帮助页面，了解更多关于零知识共享的工作原理和细节。"
   },
   "emergencyAccessOwnerWarning": {
     "message": "您是一个或多个组织的拥有者。如果您授予紧急联系人接管权限，他们在接管后可作为拥有者持有您的所有权限。"
   },
   "trustedEmergencyContacts": {
-    "message": "可信的紧急联系人"
+    "message": "已信任的紧急联系人"
   },
   "noTrustedContacts": {
-    "message": "您尚未添加任何紧急联系人，请邀请可信的联系人以开始使用。"
+    "message": "您尚未添加任何紧急联系人，请邀请可信任的联系人以开始使用。"
   },
   "addEmergencyContact": {
     "message": "添加紧急联系人"
   },
   "designatedEmergencyContacts": {
-    "message": "指定为紧急联系人"
+    "message": "被指定为紧急联系人"
   },
   "noGrantedAccess": {
     "message": "您尚未被任何人指定为紧急联系人。"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "由于某个企业策略，您不能将项目保存到您的个人密码库。请将所有权选项更改为组织，然后选择可用的集合。"
   },
+  "desktopAutotypePolicy": {
+    "message": "桌面端自动输入默认设置"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "默认为成员启用桌面端自动输入。成员可以在桌面客户端手动停用自动输入。",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "禁用 Send"
   },
@@ -5530,7 +5718,7 @@
     }
   },
   "planPrice": {
-    "message": "计划价格"
+    "message": "方案价格"
   },
   "estimatedTax": {
     "message": "预估税额"
@@ -5554,7 +5742,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": "要启用自定义权限，该组织必须处于 2020 企业计划中。"
+    "message": "要启用自定义权限，该组织必须处于 2020 企业方案中。"
   },
   "permissions": {
     "message": "权限"
@@ -5666,10 +5854,10 @@
     "message": "使用端到端加密保护机密。而不再需要硬编码机密或通过 .env 文件分享机密。"
   },
   "enhanceDeveloperProductivity": {
-    "message": "提高开发人员的生产力。"
+    "message": "提升开发人员的工作效率。"
   },
   "enhanceDeveloperProductivityDescription": {
-    "message": "程序化地在运行时检索和部署机密，使开发人员可以专注于最重要的事情，例如提高代码质量。"
+    "message": "程序化地在运行时获取和部署机密，使开发人员可以专注于最重要的事情，例如提高代码质量。"
   },
   "strengthenBusinessSecurity": {
     "message": "加强企业安全。"
@@ -6120,7 +6308,7 @@
     }
   },
   "providerIsDisabled": {
-    "message": "提供商已停用"
+    "message": "提供商已暂停"
   },
   "providerUpdated": {
     "message": "提供商已保存"
@@ -6421,7 +6609,7 @@
     "message": "没有赞助的家庭"
   },
   "nosponsoredFamiliesDetails": {
-    "message": "已赞助的非成员家庭计划将显示在这里"
+    "message": "已赞助的非成员家庭方案将显示在这里"
   },
   "sponsorshipFreeBitwardenFamilies": {
     "message": "您的组织成员有资格获得免费的 Bitwarden 家庭计划。您可以为不是您的 Bitwarden 组织成员的员工赞助免费 Bitwarden 家庭。赞助非成员需要您的组织内有可用的席位。"
@@ -6433,16 +6621,16 @@
     "message": "您和您的家人有资格获得免费的 Bitwarden 家庭版计划。使用您的个人电子邮箱兑换，即使您不在工作中，也能确保您的数据安全。"
   },
   "sponsoredFamiliesEligibleCard": {
-    "message": "立即兑换免费的 Bitwarden 家庭计划，即使您不在工作中，也能确保您的数据安全。"
+    "message": "立即兑换免费的 Bitwarden 家庭方案，即使您不在工作中，也能确保您的数据安全。"
   },
   "sponsoredFamiliesIncludeMessage": {
-    "message": "Bitwarden 家庭计划包含"
+    "message": "Bitwarden 家庭方案包含"
   },
   "sponsoredFamiliesPremiumAccess": {
     "message": "最多 6 个用户的高级访问权限"
   },
   "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
-    "message": "适用于家庭成员的共享集合"
+    "message": "为家庭成员提供共享集合"
   },
   "memberFamilies": {
     "message": "成员家庭"
@@ -6451,7 +6639,7 @@
     "message": "没有成员家庭"
   },
   "noMemberFamiliesDescription": {
-    "message": "已兑换家庭计划的成员将在这里显示"
+    "message": "已兑换家庭方案的成员将在这里显示"
   },
   "membersWithSponsoredFamilies": {
     "message": "您的组织成员有资格获得免费的 Bitwarden 家庭计划。在这里，您可以看到已赞助了家庭组织的成员。"
@@ -6469,7 +6657,7 @@
     "message": "链接已失效。请让赞助方重新发送邀请。"
   },
   "reclaimedFreePlan": {
-    "message": "收回了免费计划"
+    "message": "收回了免费方案"
   },
   "redeem": {
     "message": "兑换"
@@ -6490,7 +6678,7 @@
     "message": "接受现有组织的邀请或创建一个新的家庭组织。"
   },
   "setupSponsoredFamiliesLoginDesc": {
-    "message": "您已被邀请加入免费的 Bitwarden 家庭计划组织。要继续，您需要登录到接收邀请的账户。"
+    "message": "您已被邀请加入免费的 Bitwarden 家庭方案组织。要继续，您需要登录到接收邀请的账户。"
   },
   "sponsoredFamiliesAcceptFailed": {
     "message": "无法接受邀请。请通过您的企业账户重新发送邀请邮件，然后重试。"
@@ -6535,7 +6723,7 @@
     }
   },
   "freeFamiliesPlan": {
-    "message": "免费家庭计划"
+    "message": "免费家庭方案"
   },
   "redeemNow": {
     "message": "立即兑换"
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "SSO 已关闭"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ 必须使用单点登录",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "Key Connector 已启用"
   },
@@ -6760,7 +6957,7 @@
     "message": "自托管"
   },
   "selfHostingEnterpriseOrganizationSectionCopy": {
-    "message": "要在您自己的服务器上设置您的组织，您需要上传您的许可证文件。要为您的自托管组织提供免费家庭计划和高级计费功能，您需要设置计费同步。"
+    "message": "要在您自己的服务器上设置您的组织，您需要上传您的许可证文件。要为您的自托管组织提供免费家庭方案和高级计费功能，您需要设置计费同步。"
   },
   "billingSyncApiKeyRotated": {
     "message": "令牌已轮换"
@@ -6889,6 +7086,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "仅会导出与 $ORGANIZATION$ 关联的组织密码库。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "仅会导出与 $ORGANIZATION$ 关联的组织密码库，不包括我的项目集合。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "访问被拒绝。您没有权限查看此页面。"
   },
@@ -7043,6 +7258,9 @@
   "unknownSecret": {
     "message": "未知的机密，您可能需要请求权限才能访问此机密。"
   },
+  "unknownServiceAccount": {
+    "message": "未知的机器账户，您可能需要请求权限才能访问此机器账户。"
+  },
   "unknownProject": {
     "message": "未知的工程，您可能需要请求权限才能访问此工程。"
   },
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "关闭"
   },
+  "connected": {
+    "message": "已连接"
+  },
   "members": {
     "message": "成员"
   },
@@ -8117,7 +8338,7 @@
     "message": "切换产品"
   },
   "freeOrgInvLimitReachedManageBilling": {
-    "message": "免费组织最多拥有 $SEATCOUNT$ 位成员。要邀请更多成员，请升级到付费计划。",
+    "message": "免费组织最多拥有 $SEATCOUNT$ 位成员。要邀请更多成员，请升级到付费方案。",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8135,7 +8356,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedManageBilling": {
-    "message": "团队入门版计划最多拥有 $SEATCOUNT$ 位成员。要邀请更多成员，请升级您的计划。",
+    "message": "团队入门版方案最多拥有 $SEATCOUNT$ 位成员。要邀请更多成员，请升级您的方案。",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8144,7 +8365,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedNoManageBilling": {
-    "message": "团队入门版计划最多拥有 $SEATCOUNT$ 位成员。要升级您的计划并邀请更多成员，请联系您的组织所有者。",
+    "message": "团队入门版方案最多拥有 $SEATCOUNT$ 位成员。要升级您的方案并邀请更多成员，请联系您的组织所有者。",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8153,7 +8374,7 @@
     }
   },
   "freeOrgMaxCollectionReachedManageBilling": {
-    "message": "免费组织最多拥有 $COLLECTIONCOUNT$ 个集合。要添加更多集合，请升级到付费计划。",
+    "message": "免费组织最多拥有 $COLLECTIONCOUNT$ 个集合。要添加更多集合，请升级到付费方案。",
     "placeholders": {
       "COLLECTIONCOUNT": {
         "content": "$1",
@@ -8287,12 +8508,6 @@
   "groupSlashUser": {
     "message": "群组/用户"
   },
-  "lowKdfIterations": {
-    "message": "较低的 KDF 迭代"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "更新您的加密设置以满足新的安全建议以及增强账户保护。"
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "接下来将会注销您所有的活动会话。您需要重新登录并完成两步登录（如果有）。我们建议您在更改加密设置前导出密码库，以防止数据丢失。"
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "访问了 Id 为 $PROJECT_ID$ 的工程。",
+  "accessedProjectWithIdentifier": {
+    "message": "访问了标识符为 $PROJECT_ID$ 的工程。",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8406,7 +8621,7 @@
     }
   },
   "nameUnavailableProjectDeleted": {
-    "message": "删除了 Id 为 $PROJECT_ID$ 的工程",
+    "message": "删除了 ID 为 $PROJECT_ID$ 的工程",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8415,7 +8630,7 @@
     }
   },
   "nameUnavailableSecretDeleted": {
-    "message": "删除了 Id 为 $SECRET_ID$ 的机密",
+    "message": "删除了 ID 为 $SECRET_ID$ 的机密",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8423,6 +8638,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "删除了 ID 为 $SERVICE_ACCOUNT_ID$ 的机器账户",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "编辑了标识符为 $PROJECT_ID$ 的工程",
     "placeholders": {
@@ -8432,6 +8656,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": {
@@ -8671,7 +8965,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",
@@ -8861,7 +9155,7 @@
     "message": "邀请用户"
   },
   "secretsManagerForPlan": {
-    "message": "适用于 $PLAN$ 的机密管理器",
+    "message": "$PLAN$ 机密管理器",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -8912,13 +9206,13 @@
     "message": "订阅机密管理器"
   },
   "addSecretsManagerUpgradeDesc": {
-    "message": "将机密管理器添加到升级后的计划中，以保留对使用之前的计划创建的所有机密的访问权限。"
+    "message": "将机密管理器添加到升级后的方案中，以保留对使用之前的方案创建的所有机密的访问权限。"
   },
   "additionalServiceAccounts": {
     "message": "附加服务账户"
   },
   "includedServiceAccounts": {
-    "message": "您的计划包含 $COUNT$ 个服务账户。",
+    "message": "您的方案包含 $COUNT$ 个服务账户。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -8945,13 +9239,13 @@
     "message": "允许所有者和管理员从管理控制台管理所有集合和项目"
   },
   "restrictCollectionCreationDescription": {
-    "message": "仅限所有者和管理员可以创建集合"
+    "message": "限制为所有者和管理员可以创建集合"
   },
   "restrictCollectionDeletionDescription": {
-    "message": "仅限所有者和管理员可以删除集合"
+    "message": "限制为所有者和管理员可以删除集合"
   },
   "restrictItemDeletionDescriptionStart": {
-    "message": "仅限具有以下权限的成员可以删除项目：",
+    "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": {
@@ -8962,10 +9256,10 @@
     "message": "更新了集合管理设置"
   },
   "passwordManagerPlanPrice": {
-    "message": "密码管理器计划价格"
+    "message": "密码管理器方案价格"
   },
   "secretsManagerPlanPrice": {
-    "message": "机密管理器计划价格"
+    "message": "机密管理器方案价格"
   },
   "passwordManager": {
     "message": "密码管理器"
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "分配"
   },
+  "assignTasks": {
+    "message": "分配任务"
+  },
   "assignToCollections": {
     "message": "分配到集合"
   },
@@ -9397,7 +9694,7 @@
     "description": "The date header used when a subscription is cancelled."
   },
   "machineAccountsCannotCreate": {
-    "message": "无法在已停用的组织中创建机器账户。请联系您的组织所有者寻求帮助。"
+    "message": "无法在已暂停的组织中创建机器账户。请联系您的组织所有者寻求帮助。"
   },
   "machineAccount": {
     "message": "机器账户",
@@ -9527,7 +9824,7 @@
     "message": "附加机器账户"
   },
   "includedMachineAccounts": {
-    "message": "您的计划包含 $COUNT$ 个机器账户。",
+    "message": "您的方案包含 $COUNT$ 个机器账户。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9666,6 +9963,12 @@
   "failedToSaveIntegration": {
     "message": "保存集成失败。请稍后再试。"
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "您必须是组织所有者才能执行此操作。"
+  },
+  "failedToDeleteIntegration": {
+    "message": "删除集成失败。请稍后再试。"
+  },
   "deviceIdMissing": {
     "message": "缺少设备 ID"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "更新 $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "打开 $INTEGRATION$ 实施指南。",
     "placeholders": {
@@ -9753,11 +10065,14 @@
   "bearerToken": {
     "message": "Bearer 令牌"
   },
+  "repositoryNameHint": {
+    "message": "要摄取的存储库的名称"
+  },
   "index": {
     "message": "索引"
   },
   "selectAPlan": {
-    "message": "选择一个计划"
+    "message": "选择一个方案"
   },
   "thirtyFivePercentDiscount": {
     "message": "35% 折扣"
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "KDF 迭代低。请增加迭代次数以提高您账户的安全性。"
-  },
-  "changeKDFSettings": {
-    "message": "更改 KDF 设置"
-  },
   "secureYourInfrastructure": {
     "message": "保护您的基础设施"
   },
@@ -9905,10 +10214,10 @@
     "message": "保护您的家庭或企业"
   },
   "upgradeOrganizationCloseSecurityGaps": {
-    "message": "通过监控报告弥补安全漏洞"
+    "message": "通过监测报告弥补安全漏洞"
   },
   "upgradeOrganizationCloseSecurityGapsDesc": {
-    "message": "升级到付费计划以加强监控，从而提前发现安全漏洞。"
+    "message": "升级到付费方案以加强监测，从而提前发现安全漏洞。"
   },
   "approveAllRequests": {
     "message": "批准所有请求"
@@ -9957,7 +10266,7 @@
     "message": "通过审计成员访问权限来识别安全风险"
   },
   "onlyAvailableForEnterpriseOrganization": {
-    "message": "通过升级为企业版计划，快速查看整个组织的成员访问权限。"
+    "message": "通过升级为企业版方案，快速查看整个组织的成员访问权限。"
   },
   "date": {
     "message": "日期"
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "进一步了解 Bitwarden API"
   },
-  "fileSend": {
-    "message": "文件 Send"
-  },
   "fileSends": {
     "message": "文件 Send"
   },
-  "textSend": {
-    "message": "文本 Send"
-  },
   "textSends": {
     "message": "文本 Send"
   },
@@ -10247,7 +10550,7 @@
     "message": "SSO 身份验证"
   },
   "familiesPlanInvLimitReachedManageBilling": {
-    "message": "家庭组织最多拥有 $SEATCOUNT$ 位成员。要邀请更多成员，请升级到付费计划。",
+    "message": "家庭组织最多拥有 $SEATCOUNT$ 位成员。要邀请更多成员，请升级到付费方案。",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -10265,7 +10568,7 @@
     }
   },
   "upgradePlans": {
-    "message": "升级您的计划以邀请成员并体验强大的安全功能。"
+    "message": "升级您的方案以邀请成员并体验强大的安全功能。"
   },
   "upgradeDiscount": {
     "message": "节省 $AMOUNT$%",
@@ -10277,7 +10580,7 @@
     }
   },
   "enterprisePlanUpgradeMessage": {
-    "message": "适用于大型组织的高级功能"
+    "message": "为大型组织提供高级功能"
   },
   "teamsPlanUpgradeMessage": {
     "message": "为成长中的团队提供弹性保护"
@@ -10337,7 +10640,7 @@
     "message": "6 个高级账户"
   },
   "unlimitedSharing": {
-    "message": "无限制的共享"
+    "message": "不限数量的共享"
   },
   "unlimitedCollections": {
     "message": "不限数量的集合"
@@ -10361,7 +10664,7 @@
     "message": "自定义角色"
   },
   "unlimitedSecretsStorage": {
-    "message": "无限制的机密存储"
+    "message": "不限数量的机密存储"
   },
   "unlimitedUsers": {
     "message": "不限数量的用户"
@@ -10376,13 +10679,13 @@
     "message": "当前"
   },
   "secretsManagerSubscriptionInfo": {
-    "message": "您的机密管理器订阅将基于选择的计划升级"
+    "message": "您的机密管理器订阅将基于选择的方案升级"
   },
   "bitwardenPasswordManager": {
     "message": "Bitwarden 密码管理器"
   },
   "secretsManagerComplimentaryPasswordManager": {
-    "message": "您的一年免费密码管理器订阅将升级到所选计划。在免费期结束前，我们不会向您收取费用。"
+    "message": "您的一年免费密码管理器订阅将升级到所选方案。在免费期结束前，我们不会向您收取费用。"
   },
   "fileSavedToDevice": {
     "message": "文件已保存到设备。可以在设备下载中进行管理。"
@@ -10457,7 +10760,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": "自托管"
@@ -10523,7 +10826,7 @@
     }
   },
   "suspendedOrganizationTitle": {
-    "message": "$ORGANIZATION$ 已停用",
+    "message": "$ORGANIZATION$ 已暂停",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -10550,13 +10853,13 @@
     "message": "禁用免费 Bitwarden 家庭赞助"
   },
   "freeFamiliesSponsorshipPolicyDesc": {
-    "message": "不允许成员通过此组织兑换家庭计划。"
+    "message": "不允许成员通过此组织兑换家庭版方案。"
   },
   "verifyBankAccountWithStatementDescriptorWarning": {
-    "message": "使用银行账户付款仅对美国用户开放。您将被要求验证您的银行账户。我们将在 1-2 个工作日内进行一笔小额转账，请在组织的计费页面输入该转账的对账单描述符代码以验证银行账户。验证银行账户失败将会错过支付，您的订阅将失效。"
+    "message": "使用银行账户付款仅对美国用户开放。您将被要求验证您的银行账户。我们将在 1-2 个工作日内进行一笔小额转账，请在组织的计费页面输入该转账的对账单描述符代码以验证银行账户。验证银行账户失败将会错过支付，您的订阅将暂停。"
   },
   "verifyBankAccountWithStatementDescriptorInstructions": {
-    "message": "我们已向您的银行账户存入了一笔小额转账（可能需要 1-2 个工作日到账）。请输入转账描述中以「SM」开头的六位数代码。验证银行账户失败将会错过支付，您的订阅将失效。"
+    "message": "我们已向您的银行账户存入了一笔小额转账（可能需要 1-2 个工作日到账）。请输入转账描述中以「SM」开头的六位数代码。验证银行账户失败将会错过支付，您的订阅将暂停。"
   },
   "descriptorCode": {
     "message": "描述符代码"
@@ -10640,7 +10943,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForSentSponsorship": {
-    "message": "如果您移除 $EMAIL$，将无法兑换此家庭计划赞助。确定要继续吗？",
+    "message": "如果您移除 $EMAIL$，将无法兑换此家庭版方案赞助。确定要继续吗？",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10649,7 +10952,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForAcceptedSponsorship": {
-    "message": "如果您移除 $EMAIL$，此家庭计划赞助将终止，并且将于 $DATE$ 向已保存的付款方式收取 $40 + 相关税费。在 $DATE$ 之前您将无法兑换新的赞助。确定要继续吗？",
+    "message": "如果您移除 $EMAIL$，此家庭版方案赞助将终止，并且将于 $DATE$ 向已保存的付款方式收取 $40 + 相关税费。在 $DATE$ 之前您将无法兑换新的赞助。确定要继续吗？",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "更改有风险的密码"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "此登录存在风险且缺少网站。请添加网站并更改密码以增强安全性。"
+  },
+  "missingWebsite": {
+    "message": "缺少网站"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "禁用 PIN 码解锁"
   },
@@ -10903,7 +11212,7 @@
     "message": "不允许成员使用 PIN 码解锁他们的账户。"
   },
   "upgradeForFullEventsMessage": {
-    "message": "不会为您的组织存储事件日志。升级到团队计划或企业计划以获取组织事件日志的完整访问权限。"
+    "message": "不会为您的组织存储事件日志。升级到团队版或企业版方案以获取组织事件日志的完整访问权限。"
   },
   "upgradeEventLogTitleMessage": {
     "message": "升级以查看您组织中的事件日志。"
@@ -10915,7 +11224,24 @@
     "message": "查看事件"
   },
   "cannotCreateCollection": {
-    "message": "免费组织最多拥有 2 个集合。要添加更多集合，请升级到付费计划。"
+    "message": "免费组织最多拥有 2 个集合。要添加更多集合，请升级到付费方案。"
+  },
+  "searchArchive": {
+    "message": "搜索归档"
+  },
+  "archiveNoun": {
+    "message": "归档",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "归档",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "归档中没有项目"
+  },
+  "archivedItemsDescription": {
+    "message": "已归档的项目将显示在此处，并将被排除在一般搜索结果和自动填充建议之外。"
   },
   "businessUnit": {
     "message": "业务单元"
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden 扩展已安装！"
   },
+  "openTheBitwardenExtension": {
+    "message": "打开 Bitwarden 扩展"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "Bitwarden 扩展已安装！打开扩展以登录并开始自动填充。"
+  },
   "openExtensionToAutofill": {
     "message": "打开扩展以登录并开始自动填充。"
   },
@@ -11049,13 +11381,13 @@
     "message": "重启"
   },
   "verifyProviderBankAccountWithStatementDescriptorWarning": {
-    "message": "使用银行账户付款仅对美国用户开放。您将被要求验证您的银行账户。我们将在 1-2 个工作日内进行一笔小额转账，请在提供商的订阅页面输入该转账的对账单描述符代码以验证银行账户。验证银行账户失败将会错过支付，您的订阅将失效。"
+    "message": "使用银行账户付款仅对美国用户开放。您将被要求验证您的银行账户。我们将在 1-2 个工作日内进行一笔小额转账，请在提供商的订阅页面输入该转账的对账单描述符代码以验证银行账户。验证银行账户失败将会错过支付，您的订阅将暂停。"
   },
   "clickPayWithPayPal": {
     "message": "请点击「使用 PayPal 付款」按钮以添加您的付款方式。"
   },
   "revokeActiveSponsorshipConfirmation": {
-    "message": "如果您移除 $EMAIL$，此家庭计划的赞助将结束。在被赞助组织的续费日期 $DATE$ 之后，您的组织中将释放一个可用席位，可供成员或赞助使用。",
+    "message": "如果您移除 $EMAIL$，此家庭版方案赞助将终止。在被赞助组织的续费日期 $DATE$ 之后，您的组织中将释放一个可用席位，可供成员或赞助使用。",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -11071,6 +11403,12 @@
     "message": "添加信用额度需要计费地址。",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "关于此设置"
+  },
+  "permitCipherDetailsDescription": {
+    "message": "Bitwarden 将使用已保存的登录 URI 来识别应使用哪个图标或更改密码的 URL 来改善您的体验。当您使用此服务时，不会收集或保存任何信息。"
+  },
   "billingAddress": {
     "message": "计费地址"
   },
@@ -11108,7 +11446,7 @@
     "message": "卡安全码，又称 CVV 或 CVC，通常是印在信用卡背面的 3 位数字，或是印在信用卡正面卡号上方的 4 位数字。"
   },
   "verifyBankAccountWarning": {
-    "message": "使用银行账户付款仅对美国用户开放。您将被要求验证您的银行账户。我们将在 1-2 个工作日内进行一笔小额转账，请在付款详细信息页面输入该转账的对账单描述符代码以验证银行账户。验证银行账户失败将会错过支付，您的订阅将失效。"
+    "message": "使用银行账户付款仅对美国用户开放。您将被要求验证您的银行账户。我们将在 1-2 个工作日内进行一笔小额转账，请在付款详细信息页面输入该转账的对账单描述符代码以验证银行账户。验证银行账户失败将会错过支付，您的订阅将暂停。"
   },
   "taxId": {
     "message": "税务 ID：$TAX_ID$",
@@ -11127,7 +11465,7 @@
     "description": "A message shown in a non-dismissible dialog to service users of unpaid providers."
   },
   "providerSuspended": {
-    "message": "$PROVIDER$ 已停用",
+    "message": "$PROVIDER$ 已暂停",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "确认 Key Connector 域名"
+  },
+  "requiredToVerifyBankAccountWithStripe": {
+    "message": "使用银行账户付款仅对美国用户开放。您将被要求验证您的银行账户。我们将在 1-2 个工作日内进行一笔小额转账。验证银行账户失败将会错过支付，您的订阅将暂停。"
+  },
+  "verifyBankAccountWithStripe": {
+    "message": "我们已向您的银行账户做了一笔小额转账，可能需要 1-2 个工作日到账。请在到账后验证您的银行账户。验证银行账户失败将会错过支付，您的订阅将暂停。"
+  },
+  "verifyNow": {
+    "message": "立即验证。"
+  },
+  "additionalStorageGB": {
+    "message": "附加存储 GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "附加机器账户"
+  },
+  "secretsManagerSeats": {
+    "message": "机密管理器席位"
+  },
+  "additionalStorage": {
+    "message": "附加存储"
+  },
+  "expandPurchaseDetails": {
+    "message": "展开购买详细信息"
+  },
+  "collapsePurchaseDetails": {
+    "message": "折叠购买详细信息"
+  },
+  "familiesMembership": {
+    "message": "家庭成员"
+  },
+  "planDescPremium": {
+    "message": "全面的在线安全防护"
+  },
+  "planDescFamiliesV2": {
+    "message": "为您的家庭提供高级安全防护"
+  },
+  "planDescFreeV2": {
+    "message": "与 $COUNT$ 位其他用户共享",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "为任何组织提供高级功能"
+  },
+  "planNameCustom": {
+    "message": "自定义方案"
+  },
+  "planDescCustom": {
+    "message": "Bitwarden 适用于各种规模的企业，为密码和敏感信息提供安全保障。若您属于大型企业，请联系销售人员获取报价。"
+  },
+  "builtInAuthenticator": {
+    "message": "内置身份验证器"
+  },
+  "breachMonitoring": {
+    "message": "数据泄露监测"
+  },
+  "andMoreFeatures": {
+    "message": "以及更多！"
+  },
+  "secureFileStorage": {
+    "message": "安全文件存储"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "不限数量的共享 - 自主掌控可见范围"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "不限数量的家庭集合"
+  },
+  "familiesSharedStorage": {
+    "message": "为重要的家庭信息提供共享存储"
+  },
+  "limitedUsersV2": {
+    "message": "最多 $COUNT$ 位成员",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "最多 $COUNT$ 个集合",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "永远免费"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 个机密"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ 个工程",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "安全项目共享"
+  },
+  "scimSupport": {
+    "message": "SCIM 支持"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ 个机器账户",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "企业安全策略"
+  },
+  "selfHostOption": {
+    "message": "自托管选项"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "为所有用户提供免费家庭版方案"
+  },
+  "strengthenCybersecurity": {
+    "message": "加强网络安全"
+  },
+  "boostProductivity": {
+    "message": "提高工作效率"
+  },
+  "seamlessIntegration": {
+    "message": "无缝集成"
   }
 }
-
diff --git a/apps/web/src/locales/zh_TW/messages.json b/apps/web/src/locales/zh_TW/messages.json
index 4438d49f757..15c05a9598c 100644
--- a/apps/web/src/locales/zh_TW/messages.json
+++ b/apps/web/src/locales/zh_TW/messages.json
@@ -2,6 +2,9 @@
   "allApplications": {
     "message": "所有應用程式"
   },
+  "activity": {
+    "message": "Activity"
+  },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
@@ -56,6 +59,62 @@
   "createNewLoginItem": {
     "message": "新增登入項目"
   },
+  "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, they will display here."
+  },
+  "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": {
@@ -65,6 +124,33 @@
       }
     }
   },
+  "countOfCriticalApplications": {
+    "message": "$COUNT$ critical applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "已被通知的成員($COUNT$)",
     "placeholders": {
@@ -86,14 +172,14 @@
   "noAppsInOrgDescription": {
     "message": "在使用者儲存登入後，應用程式將會顯示在這裡，並同時顯示具有風險的密碼。標註重要應用程式並通知使用者以更新密碼。"
   },
-  "noCriticalAppsTitle": {
-    "message": "你並未將任何應用程式標註為重要"
+  "noCriticalApplicationsTitle": {
+    "message": "You haven’t marked any applications as critical"
   },
-  "noCriticalAppsDescription": {
-    "message": "選擇你最重要的應用程式以查找具有風險的密碼，並通知使用者以更改這些密碼。"
+  "noCriticalApplicationsDescription": {
+    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
-  "markCriticalApps": {
-    "message": "標註重要應用程式"
+  "markCriticalApplications": {
+    "message": "Select critical applications"
   },
   "markAppAsCritical": {
     "message": "標註應用程式為重要"
@@ -102,7 +188,7 @@
     "message": "Applications marked as critical"
   },
   "application": {
-    "message": "Application"
+    "message": "應用程式"
   },
   "atRiskPasswords": {
     "message": "具有風險的密碼"
@@ -119,6 +205,18 @@
   "atRiskMembers": {
     "message": "具有風險的成員"
   },
+  "membersWithAccessToAtRiskItemsForCriticalApps": {
+    "message": "Members with access to at-risk items for critical applications"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersWithCount": {
     "message": "At-risk members ($COUNT$)",
     "placeholders": {
@@ -168,19 +266,19 @@
     }
   },
   "totalMembers": {
-    "message": "Total members"
+    "message": "成員總數"
   },
   "atRiskApplications": {
     "message": "具有風險的應用程式"
   },
   "totalApplications": {
-    "message": "Total applications"
+    "message": "應用程式總數"
   },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
-  "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+  "criticalApplicationUnmarkedSuccessfully": {
+    "message": "Successfully unmarked application as critical"
   },
   "whatTypeOfItem": {
     "message": "這是什麼類型的項目？"
@@ -220,7 +318,7 @@
     "message": "備註"
   },
   "privateNote": {
-    "message": "Private note"
+    "message": "私人備註"
   },
   "note": {
     "message": "備註"
@@ -235,16 +333,16 @@
     "message": "登入憑證"
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "個人詳細資訊"
   },
   "identification": {
-    "message": "Identification"
+    "message": "身分"
   },
   "contactInfo": {
-    "message": "Contact info"
+    "message": "聯繫資訊"
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "支付卡詳細資料"
   },
   "cardBrandDetails": {
     "message": "$BRAND$ details",
@@ -256,7 +354,7 @@
     }
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "項目歷史記錄"
   },
   "authenticatorKey": {
     "message": "Authenticator key"
@@ -287,7 +385,7 @@
     "message": "刪除網站"
   },
   "defaultLabel": {
-    "message": "Default ($VALUE$)",
+    "message": "預設 （$VALUE$）",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -450,17 +548,17 @@
     "message": "布林值"
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "核取方塊"
   },
   "cfTypeLinked": {
     "message": "連結型",
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "欄位類別"
   },
   "fieldLabel": {
-    "message": "Field label"
+    "message": "欄位標籤"
   },
   "remove": {
     "message": "移除"
@@ -496,10 +594,10 @@
     }
   },
   "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"
@@ -734,32 +832,81 @@
   "viewItem": {
     "message": "檢視項目"
   },
-  "newItemHeader": {
-    "message": "New $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderLogin": {
+    "message": "New Login",
+    "description": "Header for new login item type"
   },
-  "editItemHeader": {
-    "message": "Edit $TYPE$",
-    "placeholders": {
-      "type": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderCard": {
+    "message": "New Card",
+    "description": "Header for new card item type"
   },
-  "viewItemType": {
-    "message": "檢視 $ITEMTYPE$",
-    "placeholders": {
-      "itemtype": {
-        "content": "$1",
-        "example": "login"
-      }
-    }
+  "newItemHeaderIdentity": {
+    "message": "New Identity",
+    "description": "Header for new identity item type"
+  },
+  "newItemHeaderNote": {
+    "message": "New Note",
+    "description": "Header for new note item type"
+  },
+  "newItemHeaderSshKey": {
+    "message": "New SSH key",
+    "description": "Header for new SSH key item type"
+  },
+  "newItemHeaderTextSend": {
+    "message": "New Text Send",
+    "description": "Header for new text send"
+  },
+  "newItemHeaderFileSend": {
+    "message": "New File Send",
+    "description": "Header for new file send"
+  },
+  "editItemHeaderLogin": {
+    "message": "Edit Login",
+    "description": "Header for edit login item type"
+  },
+  "editItemHeaderCard": {
+    "message": "Edit Card",
+    "description": "Header for edit card item type"
+  },
+  "editItemHeaderIdentity": {
+    "message": "Edit Identity",
+    "description": "Header for edit identity item type"
+  },
+  "editItemHeaderNote": {
+    "message": "Edit Note",
+    "description": "Header for edit note item type"
+  },
+  "editItemHeaderSshKey": {
+    "message": "Edit SSH key",
+    "description": "Header for edit SSH key item type"
+  },
+  "editItemHeaderTextSend": {
+    "message": "Edit Text Send",
+    "description": "Header for edit text send"
+  },
+  "editItemHeaderFileSend": {
+    "message": "Edit File Send",
+    "description": "Header for edit file send"
+  },
+  "viewItemHeaderLogin": {
+    "message": "View Login",
+    "description": "Header for view login item type"
+  },
+  "viewItemHeaderCard": {
+    "message": "View Card",
+    "description": "Header for view card item type"
+  },
+  "viewItemHeaderIdentity": {
+    "message": "View Identity",
+    "description": "Header for view identity item type"
+  },
+  "viewItemHeaderNote": {
+    "message": "View Note",
+    "description": "Header for view note item type"
+  },
+  "viewItemHeaderSshKey": {
+    "message": "View SSH key",
+    "description": "Header for view SSH key item type"
   },
   "new": {
     "message": "新增",
@@ -1078,7 +1225,7 @@
     "message": "否"
   },
   "location": {
-    "message": "Location"
+    "message": "位置"
   },
   "loginOrCreateNewAccount": {
     "message": "登入或建立帳戶以存取您的安全密碼庫。"
@@ -1380,7 +1527,7 @@
     "message": "解鎖"
   },
   "loggedInAsEmailOn": {
-    "message": "已在 $HOSTNAME$ 上以 $EMAIL$ 身份登入。",
+    "message": "已在 $HOSTNAME$ 上以 $EMAIL$ 身分登入。",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1395,6 +1542,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": "檔案密碼無效，請使用您當初匯出檔案時輸入的密碼。"
   },
@@ -1404,6 +1560,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": "您沒有檢視此集合中所有項目的權限。"
   },
@@ -1453,7 +1633,7 @@
     "message": "Deny access"
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "網頁應用程式"
   },
   "notificationSentDevicePart2": {
     "message": "Make sure the Fingerprint phrase matches the one below before approving."
@@ -1490,7 +1670,7 @@
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "使用您的復原碼"
   },
   "insertU2f": {
     "message": "將您的安全鑰匙插入電腦的 USB 連接埠，然後觸摸其按鈕（如有的話）。"
@@ -1510,9 +1690,6 @@
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
   },
-  "recoveryCodeDesc": {
-    "message": "無法使用任何兩步驟登入方式嗎？請使用您的復原碼停用所有兩步驟登入方式。"
-  },
   "recoveryCodeTitle": {
     "message": "復原碼"
   },
@@ -2114,11 +2291,8 @@
   "languageDesc": {
     "message": "變更網頁版密碼庫使用的語言。"
   },
-  "enableFavicon": {
-    "message": "Show website icons"
-  },
-  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+  "showIconsChangePasswordUrls": {
+    "message": "Show website icons and retrieve change password URLs"
   },
   "default": {
     "message": "預設"
@@ -2185,7 +2359,7 @@
     "message": "要以 Duo 進行兩步驟登入，請使用以下的選項。"
   },
   "twoStepLoginOrganizationSsoDesc": {
-    "message": "如果您已經設定好或計畫要使用 SSO 登入，兩步驟登入可能已經由您的身份提供機關開啟。"
+    "message": "如果您已經設定好或計畫要使用 SSO 登入，兩步驟登入可能已經由您的身分提供機關開啟。"
   },
   "twoStepLoginRecoveryWarning": {
     "message": "啟用兩步驟登入可能會將您永久鎖定在您的 Bitwarden 帳戶外。如果您無法正常使用兩步驟登入方式（例如，您遺失了裝置），則可以使用復原碼存取您的帳戶。 如果您失去帳戶的存取權限，Bitwarden 也無法幫助您。所以我們建議您記下或列印復原碼，並將其妥善保存。"
@@ -2253,7 +2427,7 @@
     "message": "View items, hidden passwords"
   },
   "editItems": {
-    "message": "Edit items"
+    "message": "編輯項目"
   },
   "editItemsHidePass": {
     "message": "Edit items, hidden passwords"
@@ -2627,7 +2801,7 @@
     "message": "您的密碼庫中沒有重複使用密碼的登入資料。"
   },
   "timesReused": {
-    "message": "Times reused"
+    "message": "重複使用次數"
   },
   "reusedXTimes": {
     "message": "已重複使用 $COUNT$ 次",
@@ -3370,7 +3544,7 @@
     "message": "成員被移除後，他們將不再擁有對組織資料的存取權限，並且此動作無法恢復。要將此成員添加回組織，必須重新邀請他們並加入。"
   },
   "revokeUserConfirmation": {
-    "message": "成員被撤銷后，他們將不再擁有對組織資料的存取權限。要快速還原此成員的存取權限，請轉到「已撤銷」分頁。"
+    "message": "成員被撤銷後，他們將不再擁有對組織資料的存取權限。要快速還原此成員的存取權限，請前往「已撤銷」分頁。"
   },
   "removeUserConfirmationKeyConnector": {
     "message": "警告！這位使用者需要 Key Connector 管理他們的加密方式。從您的組織中移除這位使用者，會永久停用他們的帳戶。此操作無法復原，是否繼續？"
@@ -3559,7 +3733,7 @@
     "message": "PIN 碼不正確"
   },
   "pin": {
-    "message": "PIN",
+    "message": "PIN 碼",
     "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
   },
   "exportedVault": {
@@ -3947,10 +4121,10 @@
     "message": "裝置"
   },
   "loginStatus": {
-    "message": "Login status"
+    "message": "登入狀態"
   },
   "firstLogin": {
-    "message": "First login"
+    "message": "首次登入"
   },
   "trusted": {
     "message": "Trusted"
@@ -4625,7 +4799,7 @@
     "message": "Get advice, announcements, and research opportunities from Bitwarden in your inbox."
   },
   "subscribe": {
-    "message": "Subscribe"
+    "message": "訂閱"
   },
   "unsubscribe": {
     "message": "取消訂閱"
@@ -4658,7 +4832,7 @@
     "message": "密碼庫逾時時間"
   },
   "vaultTimeout1": {
-    "message": "Timeout"
+    "message": "逾時"
   },
   "vaultTimeoutDesc": {
     "message": "選擇密碼庫何時執行密碼庫逾時動作。"
@@ -4702,6 +4876,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": "無法存取已停用的組織。請聯絡您組織的擁有者以獲取協助。"
   },
@@ -4714,9 +4894,6 @@
   "serviceAccountsCannotCreate": {
     "message": "無法在已停用組織中新增服務帳戶。請聯絡您組織的擁有者以獲取協助。"
   },
-  "disabledOrganizationFilterError": {
-    "message": "無法存取已停用組織中的項目。請聯絡您組織的擁有者以獲取協助。"
-  },
   "licenseIsExpired": {
     "message": "授權已逾期。"
   },
@@ -4920,7 +5097,7 @@
     "message": "最少單字個數"
   },
   "overridePasswordTypePolicy": {
-    "message": "Password Type",
+    "message": "密碼類型",
     "description": "Name of the password generator policy that overrides the user's password/passphrase selection."
   },
   "userPreference": {
@@ -5090,9 +5267,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"
@@ -5154,11 +5335,11 @@
     }
   },
   "sendDetails": {
-    "message": "Send details",
+    "message": "Send 詳細資訊",
     "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": "要分享的文字"
   },
   "sendTypeFile": {
     "message": "檔案"
@@ -5381,7 +5562,7 @@
     }
   },
   "emergencyInviteAcceptedDesc": {
-    "message": "確認您的身份後，您便可以存取此使用者的緊急選項。到時我們會向您傳送電子郵件通知。"
+    "message": "確認您的身分後，您便可以存取此使用者的緊急選項。到時我們會向您傳送電子郵件通知。"
   },
   "requestAccess": {
     "message": "要求存取權限"
@@ -5487,6 +5668,13 @@
   "personalOwnershipSubmitError": {
     "message": "由於某個企業原則，您被限制為儲存項目至您的個人密碼庫。將擁有權變更為組織，並從可用的集合中選擇。"
   },
+  "desktopAutotypePolicy": {
+    "message": "Desktop Autotype Default Setting"
+  },
+  "desktopAutotypePolicyDesc": {
+    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "description": "This policy will enable Desktop Autotype by default for members on Unlock."
+  },
   "disableSend": {
     "message": "停用 Send"
   },
@@ -5684,7 +5872,7 @@
     "message": "Send request"
   },
   "addANote": {
-    "message": "Add a note"
+    "message": "新增備註"
   },
   "bitwardenSecretsManager": {
     "message": "Bitwarden Secrets Manager"
@@ -5930,7 +6118,7 @@
     "message": "確認主密碼"
   },
   "passwordConfirmationDesc": {
-    "message": "此動作受到保護。若要繼續，請重新輸入您的主密碼以驗證您的身份。"
+    "message": "此動作受到保護。若要繼續，請重新輸入您的主密碼以驗證您的身分。"
   },
   "reinviteSelected": {
     "message": "重新傳送邀請"
@@ -6631,7 +6819,7 @@
     "message": "Key Connector"
   },
   "memberDecryptionKeyConnectorDescStart": {
-    "message": "將 SSO 登入連接到您的自我裝載解密金鑰伺服器。使用此選項，成員無需使用其主密碼來解密密碼庫資料。需要",
+    "message": "將 SSO 登入連結至您的自架解密金鑰伺服器。使用此選項，成員無需使用其主密碼來解密密碼庫資料。需要",
     "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": {
@@ -6639,7 +6827,7 @@
     "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": "以用於設定 Key Connector 解密。聯絡 Bitwarden 支援以獲取設定協助。",
+    "message": "以用於設定 Key Connector 解密。聯絡 Bitwarden 支援以取得設定協助。",
     "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": {
@@ -6651,6 +6839,15 @@
   "disabledSso": {
     "message": "已停用 SSO"
   },
+  "emailMustLoginWithSso": {
+    "message": "$EMAIL$ must login with Single Sign-on",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "enabledKeyConnector": {
     "message": "已啟用 Key Connector"
   },
@@ -6700,7 +6897,7 @@
     "message": "Generate billing token"
   },
   "copyPasteBillingSync": {
-    "message": "請將本權杖複製後，貼至您自我裝載組織的「計費同步」設定當中。"
+    "message": "請將本權杖複製後，貼至您自架組織的「計費同步」設定當中。"
   },
   "billingSyncCanAccess": {
     "message": "您的計費同步權杖可以讀取及編輯此組織的訂閱設定。"
@@ -6718,25 +6915,25 @@
     "message": "輪換權杖"
   },
   "rotateBillingSyncTokenWarning": {
-    "message": "如果繼續，您需要重新在自我裝載伺服器上設定計費同步。"
+    "message": "如果繼續，您需要重新在自架伺服器上設定計費同步。"
   },
   "rotateBillingSyncTokenTitle": {
     "message": "輪換「計費同步權杖」會導致之前的權杖失效。"
   },
   "selfHostedServer": {
-    "message": "自建"
+    "message": "自架"
   },
   "customEnvironment": {
     "message": "自訂環境"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com"
+    "message": "指定您自架的 Bitwarden 伺服器的網域 URL。例如：https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
-    "message": "For advanced configuration, you can specify the base URL of each service independently."
+    "message": "適用於進階設定。您可以單獨指定各個服務的網域 URL。"
   },
   "selfHostedEnvFormInvalid": {
-    "message": "You must add either the base Server URL or at least one custom environment."
+    "message": "您必須新增伺服器網域 URL 或至少一個自訂環境。"
   },
   "apiUrl": {
     "message": "API 伺服器網址"
@@ -6745,7 +6942,7 @@
     "message": "網頁版密碼庫伺服器網址"
   },
   "identityUrl": {
-    "message": "身份伺服器網址"
+    "message": "身分伺服器 URL"
   },
   "notificationsUrl": {
     "message": "通知伺服器網址"
@@ -6757,10 +6954,10 @@
     "message": "環境網址已儲存"
   },
   "selfHostingTitle": {
-    "message": "自我裝載"
+    "message": "自架"
   },
   "selfHostingEnterpriseOrganizationSectionCopy": {
-    "message": "若要在您自己的伺服器上設定組織，您需要上傳授權檔案。若要使您的自我裝載組織支援「免費家庭」方案及進階計費功能，您需要設定計費同步。"
+    "message": "若要在您自己的伺服器上設定組織，您需要上傳授權檔案。若要使您的自架組織支援「免費家庭」方案及進階計費功能，您需要設定計費同步。"
   },
   "billingSyncApiKeyRotated": {
     "message": "權杖已輪換"
@@ -6889,6 +7086,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"
+      }
+    }
+  },
   "accessDenied": {
     "message": "拒絕存取。您沒有檢視此頁面的權限。"
   },
@@ -6949,7 +7164,7 @@
     "message": "Passphrase generated"
   },
   "usernameGenerated": {
-    "message": "Username generated"
+    "message": "已產生使用者名稱"
   },
   "emailGenerated": {
     "message": "Email generated"
@@ -7027,7 +7242,7 @@
     "message": "Secure password generated! Don't forget to also update your password on the website."
   },
   "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": {
@@ -7043,6 +7258,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."
   },
@@ -7059,7 +7277,7 @@
     }
   },
   "awaitingSyncSingular": {
-    "message": "權杖已在 $DAYS$ 天前輪換。請在您的自我裝載組織設定中，更新計費同步權杖。",
+    "message": "權杖已在 $DAYS$ 天前輪換。請在您的自架組織設定中，更新計費同步權杖。",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -7068,7 +7286,7 @@
     }
   },
   "awaitingSyncPlural": {
-    "message": "權杖已在 $DAYS$ 天前輪換。請在您的自我裝載組織設定中，更新計費同步權杖。",
+    "message": "權杖已在 $DAYS$ 天前輪換。請在您的自架組織設定中，更新計費同步權杖。",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -7081,7 +7299,7 @@
     "description": "Used as a prefix to indicate the last time a sync occurred. Example \"Last sync 1968-11-16 00:00:00\""
   },
   "sponsorshipsSynced": {
-    "message": "已同步自我裝載贊助。"
+    "message": "已同步自架贊助。"
   },
   "billingManagedByProvider": {
     "message": "由 $PROVIDER$ 管理",
@@ -7433,6 +7651,9 @@
   "off": {
     "message": "關閉"
   },
+  "connected": {
+    "message": "Connected"
+  },
   "members": {
     "message": "成員"
   },
@@ -8287,12 +8508,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."
   },
@@ -8396,8 +8611,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8423,6 +8638,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": {
@@ -8432,6 +8656,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": {
@@ -8643,15 +8937,15 @@
     "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": "policy,",
+    "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.'"
   },
   "memberDecryptionOptionTdeDescLink2": {
-    "message": "SSO required",
+    "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.'"
   },
   "memberDecryptionOptionTdeDescPart3": {
-    "message": "policy, and",
+    "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.'"
   },
   "memberDecryptionOptionTdeDescLink3": {
@@ -9001,7 +9295,7 @@
     "message": "伺服器網址"
   },
   "selfHostBaseUrl": {
-    "message": "Self-host server URL",
+    "message": "自架伺服器 URL",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "alreadyHaveAccount": {
@@ -9268,6 +9562,9 @@
   "assign": {
     "message": "指派"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9666,6 +9963,12 @@
   "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."
+  },
   "deviceIdMissing": {
     "message": "Device ID is missing"
   },
@@ -9690,6 +9993,15 @@
       }
     }
   },
+  "updateIntegrationButtonDesc": {
+    "message": "Update $INTEGRATION$",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Crowdstrike"
+      }
+    }
+  },
   "integrationCardTooltip": {
     "message": "Launch $INTEGRATION$ implementation guide.",
     "placeholders": {
@@ -9753,6 +10065,9 @@
   "bearerToken": {
     "message": "Bearer Token"
   },
+  "repositoryNameHint": {
+    "message": "Name of the repository to ingest into"
+  },
   "index": {
     "message": "Index"
   },
@@ -9892,12 +10207,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "低 KDF 迭代。增加迭代次數以提高帳號的安全性。"
-  },
-  "changeKDFSettings": {
-    "message": "變更 KDF 設定"
-  },
   "secureYourInfrastructure": {
     "message": "保護你的基礎設施"
   },
@@ -10201,15 +10510,9 @@
   "learnMoreAboutApi": {
     "message": "瞭解更多關於 Bitwarden API 的資訊"
   },
-  "fileSend": {
-    "message": "File Send"
-  },
   "fileSends": {
     "message": "File Sends"
   },
-  "textSend": {
-    "message": "Text Send"
-  },
   "textSends": {
     "message": "Text Sends"
   },
@@ -10460,7 +10763,7 @@
     "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."
   },
   "selfHostingTitleProper": {
-    "message": "Self-Hosting"
+    "message": "自架"
   },
   "claim-domain-single-org-warning": {
     "message": "Claiming a domain will turn on the single organization policy."
@@ -10896,6 +11199,12 @@
   "changeAtRiskPassword": {
     "message": "Change at-risk password"
   },
+  "changeAtRiskPasswordAndAddWebsite": {
+    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+  },
+  "missingWebsite": {
+    "message": "Missing website"
+  },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Remove Unlock with PIN"
   },
@@ -10917,6 +11226,23 @@
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
+  "searchArchive": {
+    "message": "Search archive"
+  },
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "noItemsInArchive": {
+    "message": "No items in archive"
+  },
+  "archivedItemsDescription": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11024,6 +11350,12 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "openTheBitwardenExtension": {
+    "message": "Open the Bitwarden extension"
+  },
+  "bitwardenExtensionInstalledOpenExtension": {
+    "message": "The Bitwarden extension is installed! Open the extension to log in and start autofilling."
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11071,6 +11403,12 @@
     "message": "Billing address required to add credit.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
+  "aboutThisSetting": {
+    "message": "About this setting"
+  },
+  "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."
+  },
   "billingAddress": {
     "message": "Billing address"
   },
@@ -11234,6 +11572,146 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "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."
+  },
+  "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."
+  },
+  "verifyNow": {
+    "message": "Verify now."
+  },
+  "additionalStorageGB": {
+    "message": "Additional storage GB"
+  },
+  "additionalServiceAccountsV2": {
+    "message": "Additional machine accounts"
+  },
+  "secretsManagerSeats": {
+    "message": "Secrets Manager seats"
+  },
+  "additionalStorage": {
+    "message": "Additional Storage"
+  },
+  "expandPurchaseDetails": {
+    "message": "Expand purchase details"
+  },
+  "collapsePurchaseDetails": {
+    "message": "Collapse purchase details"
+  },
+  "familiesMembership": {
+    "message": "Families membership"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "planDescFamiliesV2": {
+    "message": "Premium security for your family"
+  },
+  "planDescFreeV2": {
+    "message": "Share with $COUNT$ other user",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "planDescEnterpriseV2": {
+    "message": "Advanced capabilities for any organization"
+  },
+  "planNameCustom": {
+    "message": "Custom 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."
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "familiesUnlimitedSharing": {
+    "message": "Unlimited sharing - choose who sees what"
+  },
+  "familiesUnlimitedCollections": {
+    "message": "Unlimited family collections"
+  },
+  "familiesSharedStorage": {
+    "message": "Shared storage for important family info"
+  },
+  "limitedUsersV2": {
+    "message": "Up to $COUNT$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "limitedCollectionsV2": {
+    "message": "Up to $COUNT$ collections",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "alwaysFree": {
+    "message": "Always free"
+  },
+  "twoSecretsIncluded": {
+    "message": "2 secrets"
+  },
+  "projectsIncludedV2": {
+    "message": "$COUNT$ project(s)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "secureItemSharing": {
+    "message": "Secure item sharing"
+  },
+  "scimSupport": {
+    "message": "SCIM support"
+  },
+  "includedMachineAccountsV2": {
+    "message": "$COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "enterpriseSecurityPolicies": {
+    "message": "Enterprise security policies"
+  },
+  "selfHostOption": {
+    "message": "Self-host option"
+  },
+  "complimentaryFamiliesPlan": {
+    "message": "Complimentary families plan for all users"
+  },
+  "strengthenCybersecurity": {
+    "message": "Strengthen cybersecurity"
+  },
+  "boostProductivity": {
+    "message": "Boost productivity"
+  },
+  "seamlessIntegration": {
+    "message": "Seamless integration"
   }
 }
-
diff --git a/apps/web/src/videos/browser-extension-easy-access-dark.mp4 b/apps/web/src/videos/browser-extension-easy-access-dark.mp4
new file mode 100644
index 00000000000..dc9de8fbd44
Binary files /dev/null and b/apps/web/src/videos/browser-extension-easy-access-dark.mp4 differ
diff --git a/apps/web/src/videos/browser-extension-easy-access.mp4 b/apps/web/src/videos/browser-extension-easy-access.mp4
new file mode 100644
index 00000000000..2d149fec219
Binary files /dev/null and b/apps/web/src/videos/browser-extension-easy-access.mp4 differ
diff --git a/apps/web/src/videos/new-login-item-dark.mp4 b/apps/web/src/videos/new-login-item-dark.mp4
new file mode 100644
index 00000000000..0620ee985d9
Binary files /dev/null and b/apps/web/src/videos/new-login-item-dark.mp4 differ
diff --git a/apps/web/src/videos/new-login-item.mp4 b/apps/web/src/videos/new-login-item.mp4
new file mode 100644
index 00000000000..a168dbc5148
Binary files /dev/null and b/apps/web/src/videos/new-login-item.mp4 differ
diff --git a/apps/web/src/videos/onboarding-autofill-dark.mp4 b/apps/web/src/videos/onboarding-autofill-dark.mp4
new file mode 100644
index 00000000000..e09302f2ca2
Binary files /dev/null and b/apps/web/src/videos/onboarding-autofill-dark.mp4 differ
diff --git a/apps/web/src/videos/onboarding-autofill.mp4 b/apps/web/src/videos/onboarding-autofill.mp4
new file mode 100644
index 00000000000..1be09c49e20
Binary files /dev/null and b/apps/web/src/videos/onboarding-autofill.mp4 differ
diff --git a/apps/web/webpack.config.js b/apps/web/webpack.config.js
index 77403914e9a..b311499dd55 100644
--- a/apps/web/webpack.config.js
+++ b/apps/web/webpack.config.js
@@ -144,6 +144,7 @@ const plugins = [
       { 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" },
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-common/src/dirt/integrations/index.ts b/bitwarden_license/bit-common/src/dirt/integrations/index.ts
deleted file mode 100644
index d2c1d173e3c..00000000000
--- a/bitwarden_license/bit-common/src/dirt/integrations/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from "./services";
-export * from "./models/organization-integration-type";
-export * from "./models/organization-integration-request";
-export * from "./models/organization-integration-response";
-export * from "./models/organization-integration-configuration-request";
-export * from "./models/organization-integration-configuration-response";
diff --git a/bitwarden_license/bit-common/src/dirt/integrations/services/index.ts b/bitwarden_license/bit-common/src/dirt/integrations/services/index.ts
deleted file mode 100644
index 68a673854ae..00000000000
--- a/bitwarden_license/bit-common/src/dirt/integrations/services/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./organization-integration-api.service";
-export * from "./organization-integration-configuration-api.service";
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/configuration/hec-configuration.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/configuration/hec-configuration.ts
new file mode 100644
index 00000000000..cdb7a5f265a
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/configuration/hec-configuration.ts
@@ -0,0 +1,18 @@
+import { OrganizationIntegrationServiceType } from "../organization-integration-service-type";
+
+export class HecConfiguration {
+  uri: string;
+  scheme = "Bearer";
+  token: string;
+  service: OrganizationIntegrationServiceType;
+
+  constructor(uri: string, token: string, service: string) {
+    this.uri = uri;
+    this.token = token;
+    this.service = service as OrganizationIntegrationServiceType;
+  }
+
+  toString(): string {
+    return JSON.stringify(this);
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/configuration/webhook-configuration.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/configuration/webhook-configuration.ts
new file mode 100644
index 00000000000..a4dca7378ba
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/configuration/webhook-configuration.ts
@@ -0,0 +1,14 @@
+// Added to reflect how future webhook integrations could be structured within the OrganizationIntegration
+export class WebhookConfiguration {
+  propA: string;
+  propB: string;
+
+  constructor(propA: string, propB: string) {
+    this.propA = propA;
+    this.propB = propB;
+  }
+
+  toString(): string {
+    return JSON.stringify(this);
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration-configuration-config/configuration-template/hec-template.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration-configuration-config/configuration-template/hec-template.ts
new file mode 100644
index 00000000000..7a841697fde
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration-configuration-config/configuration-template/hec-template.ts
@@ -0,0 +1,17 @@
+import { OrganizationIntegrationServiceType } from "../../organization-integration-service-type";
+
+export class HecTemplate {
+  event = "#EventMessage#";
+  source = "Bitwarden";
+  index: string;
+  service: OrganizationIntegrationServiceType;
+
+  constructor(index: string, service: string) {
+    this.index = index;
+    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/webhook-template.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration-configuration-config/configuration-template/webhook-template.ts
new file mode 100644
index 00000000000..7c51e98282b
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration-configuration-config/configuration-template/webhook-template.ts
@@ -0,0 +1,14 @@
+// Added to reflect how future webhook integrations could be structured within the OrganizationIntegration
+export class WebhookTemplate {
+  propA: string;
+  propB: string;
+
+  constructor(propA: string, propB: string) {
+    this.propA = propA;
+    this.propB = propB;
+  }
+
+  toString(): string {
+    return JSON.stringify(this);
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration-configuration-config/webhook-integration-configuration-config.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration-configuration-config/webhook-integration-configuration-config.ts
new file mode 100644
index 00000000000..9ee72bfaa8b
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration-configuration-config/webhook-integration-configuration-config.ts
@@ -0,0 +1,13 @@
+export class WebhookIntegrationConfigurationConfig {
+  propA: string;
+  propB: string;
+
+  constructor(propA: string, propB: string) {
+    this.propA = propA;
+    this.propB = propB;
+  }
+
+  toString(): string {
+    return JSON.stringify(this);
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/models.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration.ts
similarity index 63%
rename from apps/web/src/app/admin-console/organizations/shared/components/integrations/models.ts
rename to bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration.ts
index b3d24ffb3b0..abd1861caa9 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/models.ts
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration.ts
@@ -1,4 +1,6 @@
-import { IntegrationType } from "@bitwarden/common/enums";
+import { IntegrationType } from "@bitwarden/common/enums/integration-type.enum";
+
+import { OrganizationIntegration } from "./organization-integration";
 
 /** Integration or SDK */
 export type Integration = {
@@ -18,7 +20,10 @@ export type Integration = {
    */
   newBadgeExpiration?: string;
   description?: string;
-  isConnected?: boolean;
   canSetupConnection?: boolean;
   configuration?: string;
+  template?: string;
+
+  // OrganizationIntegration
+  organizationIntegration?: OrganizationIntegration | null;
 };
diff --git a/bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-configuration-request.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-configuration-request.ts
similarity index 100%
rename from bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-configuration-request.ts
rename to bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-configuration-request.ts
diff --git a/bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-configuration-response.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-configuration-response.ts
similarity index 55%
rename from bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-configuration-response.ts
rename to bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-configuration-response.ts
index 47baf3276ad..600edc8c7c9 100644
--- a/bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-configuration-response.ts
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-configuration-response.ts
@@ -1,6 +1,9 @@
 import { EventType } from "@bitwarden/common/enums";
 import { BaseResponse } from "@bitwarden/common/models/response/base.response";
-import { OrganizationIntegrationConfigurationId } from "@bitwarden/common/types/guid";
+import {
+  OrganizationIntegrationConfigurationId,
+  OrganizationIntegrationId,
+} from "@bitwarden/common/types/guid";
 
 export class OrganizationIntegrationConfigurationResponse extends BaseResponse {
   id: OrganizationIntegrationConfigurationId;
@@ -18,3 +21,16 @@ export class OrganizationIntegrationConfigurationResponse extends BaseResponse {
     this.template = this.getResponseProperty("Template");
   }
 }
+
+export class OrganizationIntegrationConfigurationResponseWithIntegrationId {
+  integrationId: OrganizationIntegrationId;
+  configurationResponses: OrganizationIntegrationConfigurationResponse[];
+
+  constructor(
+    integrationId: OrganizationIntegrationId,
+    configurationResponses: OrganizationIntegrationConfigurationResponse[],
+  ) {
+    this.integrationId = integrationId;
+    this.configurationResponses = configurationResponses;
+  }
+}
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
new file mode 100644
index 00000000000..d4bbd30055f
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-configuration.ts
@@ -0,0 +1,41 @@
+import { EventType } from "@bitwarden/common/enums";
+import {
+  OrganizationIntegrationConfigurationId,
+  OrganizationIntegrationId,
+} from "@bitwarden/common/types/guid";
+
+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";
+
+export class OrganizationIntegrationConfiguration {
+  id: OrganizationIntegrationConfigurationId;
+  integrationId: OrganizationIntegrationId;
+  eventType?: EventType | null;
+  configuration?: WebhookIntegrationConfigurationConfig | null;
+  filters?: string;
+  template?: HecTemplate | WebhookTemplate | null;
+
+  constructor(
+    id: OrganizationIntegrationConfigurationId,
+    integrationId: OrganizationIntegrationId,
+    eventType?: EventType | null,
+    configuration?: WebhookIntegrationConfigurationConfig | null,
+    filters?: string,
+    template?: HecTemplate | WebhookTemplate | null,
+  ) {
+    this.id = id;
+    this.integrationId = integrationId;
+    this.eventType = eventType;
+    this.configuration = configuration;
+    this.filters = filters;
+    this.template = template;
+  }
+
+  getTemplate<T>(): T | null {
+    if (this.template && typeof this.template === "object") {
+      return this.template as T;
+    }
+    return null;
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-request.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-request.ts
similarity index 100%
rename from bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-request.ts
rename to bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-request.ts
diff --git a/bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-response.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-response.ts
similarity index 100%
rename from bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-response.ts
rename to bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-response.ts
diff --git a/bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-service-type.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-service-type.ts
similarity index 100%
rename from bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-service-type.ts
rename to bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-service-type.ts
diff --git a/bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-type.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-type.ts
similarity index 100%
rename from bitwarden_license/bit-common/src/dirt/integrations/models/organization-integration-type.ts
rename to bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-type.ts
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
new file mode 100644
index 00000000000..abbe2271b30
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration.ts
@@ -0,0 +1,36 @@
+import { OrganizationIntegrationId } from "@bitwarden/common/types/guid";
+
+import { HecConfiguration } from "./configuration/hec-configuration";
+import { WebhookConfiguration } from "./configuration/webhook-configuration";
+import { OrganizationIntegrationConfiguration } from "./organization-integration-configuration";
+import { OrganizationIntegrationServiceType } from "./organization-integration-service-type";
+import { OrganizationIntegrationType } from "./organization-integration-type";
+
+export class OrganizationIntegration {
+  id: OrganizationIntegrationId;
+  type: OrganizationIntegrationType;
+  serviceType: OrganizationIntegrationServiceType;
+  configuration: HecConfiguration | WebhookConfiguration | null;
+  integrationConfiguration: OrganizationIntegrationConfiguration[] = [];
+
+  constructor(
+    id: OrganizationIntegrationId,
+    type: OrganizationIntegrationType,
+    serviceType: OrganizationIntegrationServiceType,
+    configuration: HecConfiguration | WebhookConfiguration | null,
+    integrationConfiguration: OrganizationIntegrationConfiguration[] = [],
+  ) {
+    this.id = id;
+    this.type = type;
+    this.serviceType = serviceType;
+    this.configuration = configuration;
+    this.integrationConfiguration = integrationConfiguration;
+  }
+
+  getConfiguration<T>(): T | null {
+    if (this.configuration && typeof this.configuration === "object") {
+      return this.configuration as T;
+    }
+    return null;
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/services/hec-organization-integration-service.spec.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/hec-organization-integration-service.spec.ts
new file mode 100644
index 00000000000..556078ea862
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/hec-organization-integration-service.spec.ts
@@ -0,0 +1,201 @@
+import { mock } from "jest-mock-extended";
+import { firstValueFrom } from "rxjs";
+
+import {
+  OrganizationId,
+  OrganizationIntegrationConfigurationId,
+  OrganizationIntegrationId,
+} from "@bitwarden/common/types/guid";
+
+import { HecConfiguration } from "../models/configuration/hec-configuration";
+import { HecTemplate } from "../models/integration-configuration-config/configuration-template/hec-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 { HecOrganizationIntegrationService } from "./hec-organization-integration-service";
+import { OrganizationIntegrationApiService } from "./organization-integration-api.service";
+import { OrganizationIntegrationConfigurationApiService } from "./organization-integration-configuration-api.service";
+
+describe("HecOrganizationIntegrationService", () => {
+  let service: HecOrganizationIntegrationService;
+  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 bearerToken = "token";
+  const index = "main";
+
+  beforeEach(() => {
+    service = new HecOrganizationIntegrationService(
+      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 Hec integration", async () => {
+    service.setOrganizationIntegrations(organizationId);
+
+    const integrationResponse = {
+      id: integrationId,
+      type: OrganizationIntegrationType.Hec,
+      configuration: JSON.stringify({ url, bearerToken, service: serviceType }),
+    } as OrganizationIntegrationResponse;
+
+    const configResponse = {
+      id: configId,
+      template: JSON.stringify({ index, service: serviceType }),
+    } as OrganizationIntegrationConfigurationResponse;
+
+    mockIntegrationApiService.createOrganizationIntegration.mockResolvedValue(integrationResponse);
+    mockIntegrationConfigurationApiService.createOrganizationIntegrationConfiguration.mockResolvedValue(
+      configResponse,
+    );
+
+    await service.saveHec(organizationId, serviceType, url, bearerToken, index);
+
+    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 saveHec", async () => {
+    service.setOrganizationIntegrations("other-org" as OrganizationId);
+    await expect(
+      service.saveHec(organizationId, serviceType, url, bearerToken, index),
+    ).rejects.toThrow(Error("Organization ID mismatch"));
+  });
+
+  it("should update an existing Hec integration", async () => {
+    service.setOrganizationIntegrations(organizationId);
+
+    const integrationResponse = {
+      id: integrationId,
+      type: OrganizationIntegrationType.Hec,
+      configuration: JSON.stringify({ url, bearerToken, service: serviceType }),
+    } as OrganizationIntegrationResponse;
+
+    const configResponse = {
+      id: configId,
+      template: JSON.stringify({ index, service: serviceType }),
+    } as OrganizationIntegrationConfigurationResponse;
+
+    mockIntegrationApiService.updateOrganizationIntegration.mockResolvedValue(integrationResponse);
+    mockIntegrationConfigurationApiService.updateOrganizationIntegrationConfiguration.mockResolvedValue(
+      configResponse,
+    );
+
+    await service.updateHec(
+      organizationId,
+      integrationId,
+      configId,
+      serviceType,
+      url,
+      bearerToken,
+      index,
+    );
+
+    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 updateHec", async () => {
+    service.setOrganizationIntegrations("other-org" as OrganizationId);
+    await expect(
+      service.updateHec(
+        organizationId,
+        integrationId,
+        configId,
+        serviceType,
+        url,
+        bearerToken,
+        index,
+      ),
+    ).rejects.toThrow(Error("Organization ID mismatch"));
+  });
+
+  it("should get integration by id", async () => {
+    service["_integrations$"].next([
+      new OrganizationIntegration(
+        integrationId,
+        OrganizationIntegrationType.Hec,
+        serviceType,
+        {} as HecConfiguration,
+        [],
+      ),
+    ]);
+    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.Hec,
+        serviceType,
+        {} as HecConfiguration,
+        [],
+      ),
+    ]);
+    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 HecTemplate,
+    );
+
+    service["_integrations$"].next([
+      new OrganizationIntegration(
+        integrationId,
+        OrganizationIntegrationType.Hec,
+        serviceType,
+        {} as HecConfiguration,
+        [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/hec-organization-integration-service.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/hec-organization-integration-service.ts
new file mode 100644
index 00000000000..6c6a086e0f5
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/hec-organization-integration-service.ts
@@ -0,0 +1,348 @@
+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 { HecConfiguration } from "../models/configuration/hec-configuration";
+import { HecTemplate } from "../models/integration-configuration-config/configuration-template/hec-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 HecModificationFailureReason = {
+  mustBeOwner: boolean;
+  success: boolean;
+};
+
+export class HecOrganizationIntegrationService {
+  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 [] as OrganizationIntegration[];
+        }
+      }),
+      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) {
+    if (orgId == this.organizationId$.getValue()) {
+      return;
+    }
+    this._integrations$.next([]);
+    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 bearerToken api token
+   * @param index index in service
+   */
+  async saveHec(
+    organizationId: OrganizationId,
+    service: OrganizationIntegrationServiceType,
+    url: string,
+    bearerToken: string,
+    index: string,
+  ): Promise<HecModificationFailureReason> {
+    if (organizationId != this.organizationId$.getValue()) {
+      throw new Error("Organization ID mismatch");
+    }
+
+    try {
+      const hecConfig = new HecConfiguration(url, bearerToken, service);
+      const newIntegrationResponse = await this.integrationApiService.createOrganizationIntegration(
+        organizationId,
+        new OrganizationIntegrationRequest(OrganizationIntegrationType.Hec, hecConfig.toString()),
+      );
+
+      const newTemplate = new HecTemplate(index, 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 bearerToken api token
+   * @param index index in service
+   */
+  async updateHec(
+    organizationId: OrganizationId,
+    OrganizationIntegrationId: OrganizationIntegrationId,
+    OrganizationIntegrationConfigurationId: OrganizationIntegrationConfigurationId,
+    service: OrganizationIntegrationServiceType,
+    url: string,
+    bearerToken: string,
+    index: string,
+  ): Promise<HecModificationFailureReason> {
+    if (organizationId != this.organizationId$.getValue()) {
+      throw new Error("Organization ID mismatch");
+    }
+
+    try {
+      const hecConfig = new HecConfiguration(url, bearerToken, service);
+      const updatedIntegrationResponse =
+        await this.integrationApiService.updateOrganizationIntegration(
+          organizationId,
+          OrganizationIntegrationId,
+          new OrganizationIntegrationRequest(OrganizationIntegrationType.Hec, hecConfig.toString()),
+        );
+
+      const updatedTemplate = new HecTemplate(index, 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 deleteHec(
+    organizationId: OrganizationId,
+    OrganizationIntegrationId: OrganizationIntegrationId,
+    OrganizationIntegrationConfigurationId: OrganizationIntegrationConfigurationId,
+  ): Promise<HecModificationFailureReason> {
+    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 hecConfig = this.convertToJson<HecConfiguration>(integrationResponse.configuration);
+    const template = this.convertToJson<HecTemplate>(configurationResponse.template);
+
+    if (!hecConfig || !template) {
+      return null;
+    }
+
+    const integrationConfig = new OrganizationIntegrationConfiguration(
+      configurationResponse.id,
+      integrationResponse.id,
+      null,
+      null,
+      "",
+      template,
+    );
+
+    return new OrganizationIntegration(
+      integrationResponse.id,
+      integrationResponse.type,
+      hecConfig.service,
+      hecConfig,
+      [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 hec 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) => {
+          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,
+              );
+
+              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/integrations/services/organization-integration-api.service.spec.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/organization-integration-api.service.spec.ts
similarity index 100%
rename from bitwarden_license/bit-common/src/dirt/integrations/services/organization-integration-api.service.spec.ts
rename to bitwarden_license/bit-common/src/dirt/organization-integrations/services/organization-integration-api.service.spec.ts
diff --git a/bitwarden_license/bit-common/src/dirt/integrations/services/organization-integration-api.service.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/organization-integration-api.service.ts
similarity index 87%
rename from bitwarden_license/bit-common/src/dirt/integrations/services/organization-integration-api.service.ts
rename to bitwarden_license/bit-common/src/dirt/organization-integrations/services/organization-integration-api.service.ts
index 2c2266940e0..b6d2540d9d7 100644
--- a/bitwarden_license/bit-common/src/dirt/integrations/services/organization-integration-api.service.ts
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/organization-integration-api.service.ts
@@ -1,26 +1,27 @@
-import { Injectable } from "@angular/core";
-
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationId, OrganizationIntegrationId } from "@bitwarden/common/types/guid";
 
 import { OrganizationIntegrationRequest } from "../models/organization-integration-request";
 import { OrganizationIntegrationResponse } from "../models/organization-integration-response";
 
-@Injectable()
 export class OrganizationIntegrationApiService {
   constructor(private apiService: ApiService) {}
 
   async getOrganizationIntegrations(
     orgId: OrganizationId,
   ): Promise<OrganizationIntegrationResponse[]> {
-    const response = await this.apiService.send(
-      "GET",
-      `/organizations/${orgId}/integrations`,
-      null,
-      true,
-      true,
-    );
-    return response;
+    try {
+      const response = await this.apiService.send(
+        "GET",
+        `/organizations/${orgId}/integrations`,
+        null,
+        true,
+        true,
+      );
+      return response;
+    } catch {
+      return [];
+    }
   }
 
   async createOrganizationIntegration(
diff --git a/bitwarden_license/bit-common/src/dirt/integrations/services/organization-integration-configuration-api.service.spec.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/organization-integration-configuration-api.service.spec.ts
similarity index 92%
rename from bitwarden_license/bit-common/src/dirt/integrations/services/organization-integration-configuration-api.service.spec.ts
rename to bitwarden_license/bit-common/src/dirt/organization-integrations/services/organization-integration-configuration-api.service.spec.ts
index 48612efdd13..49a560add76 100644
--- a/bitwarden_license/bit-common/src/dirt/integrations/services/organization-integration-configuration-api.service.spec.ts
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/organization-integration-configuration-api.service.spec.ts
@@ -49,7 +49,7 @@ describe("OrganizationIntegrationConfigurationApiService", () => {
     expect(result).toEqual(mockConfigurationResponses);
     expect(apiService.send).toHaveBeenCalledWith(
       "GET",
-      `organizations/${orgId}/integrations/${integrationId}/configurations`,
+      `/organizations/${orgId}/integrations/${integrationId}/configurations`,
       null,
       true,
       true,
@@ -77,7 +77,7 @@ describe("OrganizationIntegrationConfigurationApiService", () => {
     expect(result.template).toEqual(mockConfigurationResponse.template);
     expect(apiService.send).toHaveBeenCalledWith(
       "POST",
-      `organizations/${orgId}/integrations/${integrationId}/configurations`,
+      `/organizations/${orgId}/integrations/${integrationId}/configurations`,
       request,
       true,
       true,
@@ -107,7 +107,7 @@ describe("OrganizationIntegrationConfigurationApiService", () => {
     expect(result.template).toEqual(mockConfigurationResponse.template);
     expect(apiService.send).toHaveBeenCalledWith(
       "PUT",
-      `organizations/${orgId}/integrations/${integrationId}/configurations/${configurationId}`,
+      `/organizations/${orgId}/integrations/${integrationId}/configurations/${configurationId}`,
       request,
       true,
       true,
@@ -123,7 +123,7 @@ describe("OrganizationIntegrationConfigurationApiService", () => {
 
     expect(apiService.send).toHaveBeenCalledWith(
       "DELETE",
-      `organizations/${orgId}/integrations/${integrationId}/configurations/${configurationId}`,
+      `/organizations/${orgId}/integrations/${integrationId}/configurations/${configurationId}`,
       null,
       true,
       false,
diff --git a/bitwarden_license/bit-common/src/dirt/integrations/services/organization-integration-configuration-api.service.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/organization-integration-configuration-api.service.ts
similarity index 83%
rename from bitwarden_license/bit-common/src/dirt/integrations/services/organization-integration-configuration-api.service.ts
rename to bitwarden_license/bit-common/src/dirt/organization-integrations/services/organization-integration-configuration-api.service.ts
index b5bac73b280..46d2e6bcde2 100644
--- a/bitwarden_license/bit-common/src/dirt/integrations/services/organization-integration-configuration-api.service.ts
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/organization-integration-configuration-api.service.ts
@@ -1,5 +1,3 @@
-import { Injectable } from "@angular/core";
-
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import {
   OrganizationId,
@@ -10,7 +8,6 @@ import {
 import { OrganizationIntegrationConfigurationRequest } from "../models/organization-integration-configuration-request";
 import { OrganizationIntegrationConfigurationResponse } from "../models/organization-integration-configuration-response";
 
-@Injectable()
 export class OrganizationIntegrationConfigurationApiService {
   constructor(private apiService: ApiService) {}
 
@@ -20,7 +17,7 @@ export class OrganizationIntegrationConfigurationApiService {
   ): Promise<OrganizationIntegrationConfigurationResponse[]> {
     const responses = await this.apiService.send(
       "GET",
-      `organizations/${orgId}/integrations/${integrationId}/configurations`,
+      `/organizations/${orgId}/integrations/${integrationId}/configurations`,
       null,
       true,
       true,
@@ -35,7 +32,7 @@ export class OrganizationIntegrationConfigurationApiService {
   ): Promise<OrganizationIntegrationConfigurationResponse> {
     const response = await this.apiService.send(
       "POST",
-      `organizations/${orgId}/integrations/${integrationId}/configurations`,
+      `/organizations/${orgId}/integrations/${integrationId}/configurations`,
       request,
       true,
       true,
@@ -51,7 +48,7 @@ export class OrganizationIntegrationConfigurationApiService {
   ): Promise<OrganizationIntegrationConfigurationResponse> {
     const response = await this.apiService.send(
       "PUT",
-      `organizations/${orgId}/integrations/${integrationId}/configurations/${configurationId}`,
+      `/organizations/${orgId}/integrations/${integrationId}/configurations/${configurationId}`,
       request,
       true,
       true,
@@ -66,7 +63,7 @@ export class OrganizationIntegrationConfigurationApiService {
   ): Promise<any> {
     await this.apiService.send(
       "DELETE",
-      `organizations/${orgId}/integrations/${integrationId}/configurations/${configurationId}`,
+      `/organizations/${orgId}/integrations/${integrationId}/configurations/${configurationId}`,
       null,
       true,
       false,
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/index.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/index.ts
new file mode 100644
index 00000000000..5508eba65e5
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/index.ts
@@ -0,0 +1 @@
+export * from "./risk-insights-data-mappers";
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
new file mode 100644
index 00000000000..3f679924df9
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/risk-insights-data-mappers.ts
@@ -0,0 +1,181 @@
+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,
+  OrganizationReportSummary,
+  RiskInsightsReportData,
+} from "../models/report-models";
+import { MemberCipherDetailsResponse } from "../response/member-cipher-details.response";
+
+export function flattenMemberDetails(
+  memberCiphers: MemberCipherDetailsResponse[],
+): LEGACY_MemberDetailsFlat[] {
+  return memberCiphers.flatMap((member) =>
+    member.cipherIds.map((cipherId) => ({
+      userGuid: member.userGuid,
+      userName: member.userName,
+      email: member.email,
+      cipherId,
+    })),
+  );
+}
+/**
+ * Trim the cipher uris down to get the password health application.
+ * The uri should only exist once after being trimmed. No duplication.
+ * Example:
+ *   - Untrimmed Uris: https://gmail.com, gmail.com/login
+ *   - Both would trim to gmail.com
+ *   - The cipher trimmed uri list should only return on instance in the list
+ * @param cipher
+ * @returns distinct list of trimmed cipher uris
+ */
+export function getTrimmedCipherUris(cipher: CipherView): string[] {
+  const uris = cipher.login?.uris ?? [];
+
+  const uniqueDomains = new Set<string>();
+
+  uris.forEach((u: { uri: string }) => {
+    const domain = Utils.getDomain(u.uri) ?? u.uri;
+    uniqueDomains.add(domain);
+  });
+  return Array.from(uniqueDomains);
+}
+
+// Returns a deduplicated array of members by email
+export function getUniqueMembers(
+  orgMembers: LEGACY_MemberDetailsFlat[],
+): LEGACY_MemberDetailsFlat[] {
+  const existingEmails = new Set<string>();
+  return orgMembers.filter((member) => {
+    if (existingEmails.has(member.email)) {
+      return false;
+    }
+    existingEmails.add(member.email);
+    return true;
+  });
+}
+
+/**
+ * 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
+ */
+export function getMemberDetailsFlat(
+  userGuid: string,
+  userName: string,
+  email: string,
+  cipherId: string,
+): LEGACY_MemberDetailsFlat {
+  return {
+    userGuid: userGuid,
+    userName: userName,
+    email: email,
+    cipherId: cipherId,
+  };
+}
+
+/**
+ * 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
+ */
+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;
+}
+
+/**
+ * Create a new Risk Insights Report
+ *
+ * @returns An empty report
+ */
+export function createNewReportData(): RiskInsightsReportData {
+  return {
+    data: [],
+    summary: createNewSummaryData(),
+  };
+}
+
+/**
+ * Create a new Risk Insights Report Summary
+ *
+ * @returns An empty report summary
+ */
+export function createNewSummaryData(): OrganizationReportSummary {
+  return {
+    totalMemberCount: 0,
+    totalAtRiskMemberCount: 0,
+    totalApplicationCount: 0,
+    totalAtRiskApplicationCount: 0,
+    totalCriticalMemberCount: 0,
+    totalCriticalAtRiskMemberCount: 0,
+    totalCriticalApplicationCount: 0,
+    totalCriticalAtRiskApplicationCount: 0,
+    newApplications: [],
+  };
+}
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
new file mode 100644
index 00000000000..89293651a23
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/api-models.types.ts
@@ -0,0 +1,110 @@
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+
+import { createNewSummaryData } from "../helpers";
+
+import { OrganizationReportSummary, PasswordHealthReportApplicationId } from "./report-models";
+
+// -------------------- Password Health Report Models --------------------
+/**
+ * Request to drop a password health report application
+ * Model is expected by the API endpoint
+ */
+export interface PasswordHealthReportApplicationDropRequest {
+  organizationId: OrganizationId;
+  passwordHealthReportApplicationIds: string[];
+}
+
+/**
+ * Response from the API after marking an app as critical
+ */
+export interface PasswordHealthReportApplicationsResponse {
+  id: PasswordHealthReportApplicationId;
+  organizationId: OrganizationId;
+  uri: string;
+}
+/*
+ * Request to save a password health report application
+ * Model is expected by the API endpoint
+ */
+export interface PasswordHealthReportApplicationsRequest {
+  organizationId: OrganizationId;
+  url: string;
+}
+
+// -------------------- Risk Insights Report Models --------------------
+export interface SaveRiskInsightsReportRequest {
+  data: {
+    organizationId: OrganizationId;
+    date: string;
+    reportData: string;
+    contentEncryptionKey: string;
+  };
+}
+
+export class SaveRiskInsightsReportResponse extends BaseResponse {
+  id: string;
+
+  constructor(response: any) {
+    super(response);
+    this.id = this.getResponseProperty("organizationId");
+  }
+}
+export function isSaveRiskInsightsReportResponse(obj: any): obj is SaveRiskInsightsReportResponse {
+  return obj && typeof obj.id === "string" && obj.id !== "";
+}
+
+export class GetRiskInsightsReportResponse extends BaseResponse {
+  id: string;
+  organizationId: OrganizationId;
+  // TODO Update to use creationDate from server
+  date: string;
+  reportData: EncString;
+  contentEncryptionKey: EncString;
+
+  constructor(response: any) {
+    super(response);
+
+    this.id = this.getResponseProperty("organizationId");
+    this.organizationId = this.getResponseProperty("organizationId");
+    this.date = this.getResponseProperty("date");
+    this.reportData = new EncString(this.getResponseProperty("reportData"));
+    this.contentEncryptionKey = new EncString(this.getResponseProperty("contentEncryptionKey"));
+  }
+}
+
+export class GetRiskInsightsSummaryResponse extends BaseResponse {
+  id: string;
+  organizationId: OrganizationId;
+  encryptedData: 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.encryptedData = 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");
+  }
+}
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..b8fcfe251ff
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/index.ts
@@ -0,0 +1,3 @@
+export * from "./api-models.types";
+export * from "./password-health";
+export * from "./report-models";
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 6be24d60b89..e026a4475b7 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,75 +1,11 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-
-import { Opaque } from "type-fest";
-
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { BadgeVariant } from "@bitwarden/components";
 
-/**
- * All applications report summary. The total members,
- * total at risk members, application, and at risk application
- * counts. Aggregated from all calculated applications
- */
-export type ApplicationHealthReportSummary = {
-  totalMemberCount: number;
-  totalAtRiskMemberCount: number;
-  totalApplicationCount: number;
-  totalAtRiskApplicationCount: number;
-};
-
-/**
- * All applications report detail. Application is the cipher
- * uri. Has the at risk, password, and member information
- */
-export type ApplicationHealthReportDetail = {
-  applicationName: string;
-  passwordCount: number;
-  atRiskPasswordCount: number;
-  atRiskCipherIds: string[];
-  memberCount: number;
-  atRiskMemberCount: number;
-  memberDetails: MemberDetailsFlat[];
-  atRiskMemberDetails: MemberDetailsFlat[];
-  cipherIds: string[];
-};
-
-export type ApplicationHealthReportDetailWithCriticalFlag = ApplicationHealthReportDetail & {
-  isMarkedAsCritical: boolean;
-};
-
-export type ApplicationHealthReportDetailWithCriticalFlagAndCipher =
-  ApplicationHealthReportDetailWithCriticalFlag & {
-    ciphers: CipherView[];
-  };
-
-/**
- * Breaks the cipher health info out by uri and passes
- * along the password health and member info
- */
-export type CipherHealthReportUriDetail = {
-  cipherId: string;
-  reusedPasswordCount: number;
-  weakPasswordDetail: WeakPasswordDetail;
-  exposedPasswordDetail: ExposedPasswordDetail;
-  cipherMembers: MemberDetailsFlat[];
-  trimmedUri: string;
-  cipher: CipherView;
-};
-
-/**
- * Associates a cipher with it's essential information.
- * Gets the password health details, cipher members, and
- * the trimmed uris for the cipher
- */
-export type CipherHealthReportDetail = CipherView & {
-  reusedPasswordCount: number;
-  weakPasswordDetail: WeakPasswordDetail;
-  exposedPasswordDetail: ExposedPasswordDetail;
-  cipherMembers: MemberDetailsFlat[];
-  trimmedUris: string[];
-};
+import { ApplicationHealthReportDetail } from "./report-models";
 
 /**
  * Weak password details containing the score
@@ -97,81 +33,46 @@ export type ExposedPasswordDetail = {
   exposedXTimes: number;
 } | null;
 
-/**
- * Flattened member details that associates an
- * organization member to a cipher
+/*
+ * After data is encrypted, it is returned with the
+ * encryption key used to encrypt the data.
  */
-export type MemberDetailsFlat = {
+export interface EncryptedDataWithKey {
+  organizationId: OrganizationId;
+  encryptedData: EncString;
+  contentEncryptionKey: EncString;
+}
+
+export type LEGACY_MemberDetailsFlat = {
   userGuid: string;
   userName: string;
   email: string;
   cipherId: 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;
+export type LEGACY_ApplicationHealthReportDetailWithCriticalFlag = ApplicationHealthReportDetail & {
+  isMarkedAsCritical: boolean;
 };
 
-/*
- * A list of applications and the count of
- * at risk passwords for each application
- */
-export type AtRiskApplicationDetail = {
-  applicationName: string;
-  atRiskPasswordCount: number;
+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 AppAtRiskMembersDialogParams = {
-  members: MemberDetailsFlat[];
-  applicationName: string;
+export type LEGACY_CipherHealthReportUriDetail = {
+  cipherId: string;
+  reusedPasswordCount: number;
+  weakPasswordDetail: WeakPasswordDetail;
+  exposedPasswordDetail: ExposedPasswordDetail;
+  cipherMembers: LEGACY_MemberDetailsFlat[];
+  trimmedUri: string;
+  cipher: CipherView;
 };
-
-/**
- * Request to drop a password health report application
- * Model is expected by the API endpoint
- */
-export interface PasswordHealthReportApplicationDropRequest {
-  organizationId: OrganizationId;
-  passwordHealthReportApplicationIds: string[];
-}
-
-/**
- * Response from the API after marking an app as critical
- */
-export interface PasswordHealthReportApplicationsResponse {
-  id: PasswordHealthReportApplicationId;
-  organizationId: OrganizationId;
-  uri: string;
-}
-/*
- * Request to save a password health report application
- * Model is expected by the API endpoint
- */
-export interface PasswordHealthReportApplicationsRequest {
-  organizationId: OrganizationId;
-  url: string;
-}
-
-export interface EncryptedDataModel {
-  organizationId: OrganizationId;
-  encryptedData: string;
-  encryptionKey: string;
-  date: Date;
-}
-
-// 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 PasswordHealthReportApplicationId = Opaque<string, "PasswordHealthReportApplicationId">;
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
new file mode 100644
index 00000000000..1758bb41b1b
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-models.ts
@@ -0,0 +1,169 @@
+import { Opaque } from "type-fest";
+
+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
+ * organization member to a cipher
+ */
+export type MemberDetails = {
+  userGuid: string;
+  userName: string;
+  email: string;
+  cipherId: string;
+};
+
+// -------------------- Cipher Models --------------------
+
+export type PasswordHealthData = {
+  reusedPasswordCount: number;
+  weakPasswordDetail: WeakPasswordDetail;
+  exposedPasswordDetail: ExposedPasswordDetail;
+};
+
+/**
+ * Associates a cipher with it's essential information.
+ * Gets the password health details, cipher members, and
+ * the trimmed uris for the cipher
+ */
+export type CipherHealthReport = {
+  applications: string[];
+  cipherMembers: MemberDetails[];
+  healthData: PasswordHealthData;
+  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,
+ * total at risk members, application, and at risk application
+ * counts. Aggregated from all calculated applications
+ */
+export type OrganizationReportSummary = {
+  totalMemberCount: number;
+  totalCriticalMemberCount: number;
+  totalAtRiskMemberCount: number;
+  totalCriticalAtRiskMemberCount: number;
+  totalApplicationCount: number;
+  totalCriticalApplicationCount: number;
+  totalAtRiskApplicationCount: number;
+  totalCriticalAtRiskApplicationCount: number;
+  newApplications: string[];
+};
+
+export type CriticalSummaryDetails = {
+  totalCriticalMembersCount: number;
+  totalCriticalApplicationsCount: number;
+};
+
+/**
+ * An entry for an organization application and if it is
+ * marked as critical
+ */
+export type OrganizationReportApplication = {
+  applicationName: string;
+  isCritical: boolean;
+};
+
+/**
+ * Report details for an application
+ * uri. Has the at risk, password, and member information
+ */
+export type ApplicationHealthReportDetail = {
+  applicationName: string;
+  passwordCount: number;
+  atRiskPasswordCount: number;
+  atRiskCipherIds: string[];
+  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;
+};
+
+// -------------------- Password Health Report Models --------------------
+export type PasswordHealthReportApplicationId = Opaque<string, "PasswordHealthReportApplicationId">;
+
+// -------------------- Risk Insights Report Models --------------------
+export interface RiskInsightsReportData {
+  data: ApplicationHealthReportDetailEnriched[];
+  summary: OrganizationReportSummary;
+}
+
+export type ReportScore = { label: string; badgeVariant: BadgeVariant; sortOrder: number };
+
+export type ReportResult = CipherView & {
+  score: number;
+  reportValue: ReportScore;
+  scoreKey: number;
+};
+
+export type ReportDetailsAndSummary = {
+  data: ApplicationHealthReportDetailEnriched[];
+  summary: OrganizationReportSummary;
+  dateCreated: Date;
+};
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/all-activities.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/all-activities.service.ts
new file mode 100644
index 00000000000..3ea67d8f7c9
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/all-activities.service.ts
@@ -0,0 +1,73 @@
+import { BehaviorSubject } from "rxjs";
+
+import { LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher } from "../models";
+import { OrganizationReportSummary } from "../models/report-models";
+
+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,
+    newApplications: [],
+  });
+
+  reportSummary$ = this.reportSummarySubject$.asObservable();
+
+  private allApplicationsDetailsSubject$: BehaviorSubject<
+    LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher[]
+  > = new BehaviorSubject<LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher[]>([]);
+  allApplicationsDetails$ = this.allApplicationsDetailsSubject$.asObservable();
+
+  private atRiskPasswordsCountSubject$ = new BehaviorSubject<number>(0);
+  atRiskPasswordsCount$ = this.atRiskPasswordsCountSubject$.asObservable();
+
+  private passwordChangeProgressMetricHasProgressBarSubject$ = new BehaviorSubject<boolean>(false);
+  passwordChangeProgressMetricHasProgressBar$ =
+    this.passwordChangeProgressMetricHasProgressBarSubject$.asObservable();
+
+  setCriticalAppsReportSummary(summary: OrganizationReportSummary) {
+    this.reportSummarySubject$.next({
+      ...this.reportSummarySubject$.getValue(),
+      totalCriticalApplicationCount: summary.totalApplicationCount,
+      totalCriticalAtRiskApplicationCount: summary.totalAtRiskApplicationCount,
+      totalCriticalMemberCount: summary.totalMemberCount,
+      totalCriticalAtRiskMemberCount: summary.totalAtRiskMemberCount,
+    });
+  }
+
+  setAllAppsReportSummary(summary: OrganizationReportSummary) {
+    this.reportSummarySubject$.next({
+      ...this.reportSummarySubject$.getValue(),
+      totalMemberCount: summary.totalMemberCount,
+      totalAtRiskMemberCount: summary.totalAtRiskMemberCount,
+      totalApplicationCount: summary.totalApplicationCount,
+      totalAtRiskApplicationCount: summary.totalAtRiskApplicationCount,
+    });
+  }
+
+  setAllAppsReportDetails(
+    applications: LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher[],
+  ) {
+    const totalAtRiskPasswords = applications.reduce(
+      (sum, app) => sum + app.atRiskPasswordCount,
+      0,
+    );
+    this.atRiskPasswordsCountSubject$.next(totalAtRiskPasswords);
+
+    this.allApplicationsDetailsSubject$.next(applications);
+  }
+
+  setPasswordChangeProgressMetricHasProgressBar(hasProgressBar: boolean) {
+    this.passwordChangeProgressMetricHasProgressBarSubject$.next(hasProgressBar);
+  }
+}
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/critical-apps-api.service.spec.ts
index 5ed88c4cac9..f53bf92c47f 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/critical-apps-api.service.spec.ts
@@ -5,10 +5,10 @@ import { OrganizationId } from "@bitwarden/common/types/guid";
 
 import {
   PasswordHealthReportApplicationDropRequest,
-  PasswordHealthReportApplicationId,
   PasswordHealthReportApplicationsRequest,
   PasswordHealthReportApplicationsResponse,
-} from "../models/password-health";
+} 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/critical-apps-api.service.ts
index c02a3686dfd..29d2364f302 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/critical-apps-api.service.ts
@@ -7,7 +7,7 @@ import {
   PasswordHealthReportApplicationDropRequest,
   PasswordHealthReportApplicationsRequest,
   PasswordHealthReportApplicationsResponse,
-} from "../models/password-health";
+} 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/critical-apps.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps.service.spec.ts
index 5b40f16ec9e..72d7e88fcab 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/critical-apps.service.spec.ts
@@ -12,10 +12,10 @@ import { OrgKey } from "@bitwarden/common/types/key";
 import { KeyService } from "@bitwarden/key-management";
 
 import {
-  PasswordHealthReportApplicationId,
   PasswordHealthReportApplicationsRequest,
   PasswordHealthReportApplicationsResponse,
-} from "../models/password-health";
+} from "../models/api-models.types";
+import { PasswordHealthReportApplicationId } from "../models/report-models";
 
 import { CriticalAppsApiService } from "./critical-apps-api.service";
 import { CriticalAppsService } from "./critical-apps.service";
@@ -70,7 +70,7 @@ describe("CriticalAppsService", () => {
     const orgKey$ = new BehaviorSubject(OrgRecords);
     keyService.orgKeys$.mockReturnValue(orgKey$);
 
-    service.setOrganizationId(SomeOrganization, SomeUser);
+    service.loadOrganizationContext(SomeOrganization, SomeUser);
 
     // act
     await service.setCriticalApps(SomeOrganization, criticalApps);
@@ -112,7 +112,7 @@ describe("CriticalAppsService", () => {
     const orgKey$ = new BehaviorSubject(OrgRecords);
     keyService.orgKeys$.mockReturnValue(orgKey$);
 
-    service.setOrganizationId(SomeOrganization, SomeUser);
+    service.loadOrganizationContext(SomeOrganization, SomeUser);
 
     // act
     await service.setCriticalApps(SomeOrganization, selectedUrls);
@@ -136,7 +136,7 @@ describe("CriticalAppsService", () => {
     const orgKey$ = new BehaviorSubject(OrgRecords);
     keyService.orgKeys$.mockReturnValue(orgKey$);
 
-    service.setOrganizationId(SomeOrganization, SomeUser);
+    service.loadOrganizationContext(SomeOrganization, SomeUser);
 
     expect(keyService.orgKeys$).toHaveBeenCalledWith(SomeUser);
     expect(encryptService.decryptString).toHaveBeenCalledTimes(2);
@@ -154,7 +154,7 @@ describe("CriticalAppsService", () => {
 
     const orgKey$ = new BehaviorSubject(OrgRecords);
     keyService.orgKeys$.mockReturnValue(orgKey$);
-    service.setOrganizationId(SomeOrganization, SomeUser);
+    service.loadOrganizationContext(SomeOrganization, SomeUser);
     service.setAppsInListForOrg(response);
     service.getAppsListForOrg(orgId as OrganizationId).subscribe((res) => {
       expect(res).toHaveLength(2);
@@ -173,7 +173,7 @@ describe("CriticalAppsService", () => {
     const orgKey$ = new BehaviorSubject(OrgRecords);
     keyService.orgKeys$.mockReturnValue(orgKey$);
 
-    service.setOrganizationId(SomeOrganization, SomeUser);
+    service.loadOrganizationContext(SomeOrganization, SomeUser);
 
     service.setAppsInListForOrg(initialList);
 
@@ -204,7 +204,7 @@ describe("CriticalAppsService", () => {
     const orgKey$ = new BehaviorSubject(OrgRecords);
     keyService.orgKeys$.mockReturnValue(orgKey$);
 
-    service.setOrganizationId(SomeOrganization, SomeUser);
+    service.loadOrganizationContext(SomeOrganization, SomeUser);
 
     service.setAppsInListForOrg(initialList);
 
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/critical-apps.service.ts
index bdf28624733..82001387bbd 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/critical-apps.service.ts
@@ -7,9 +7,7 @@ import {
   map,
   Observable,
   of,
-  Subject,
   switchMap,
-  takeUntil,
   zip,
 } from "rxjs";
 
@@ -22,7 +20,7 @@ import { KeyService } from "@bitwarden/key-management";
 import {
   PasswordHealthReportApplicationsRequest,
   PasswordHealthReportApplicationsResponse,
-} from "../models/password-health";
+} from "../models/api-models.types";
 
 import { CriticalAppsApiService } from "./critical-apps-api.service";
 
@@ -30,17 +28,16 @@ import { CriticalAppsApiService } from "./critical-apps-api.service";
  *  Encrypts and saves data for a given organization
  */
 export class CriticalAppsService {
-  private orgId = new BehaviorSubject<OrganizationId | null>(null);
+  // -------------------------- Context state --------------------------
+  // The organization ID of the organization the user is currently viewing
+  private organizationId = new BehaviorSubject<OrganizationId | null>(null);
   private orgKey$ = new Observable<OrgKey>();
-  private criticalAppsList = new BehaviorSubject<PasswordHealthReportApplicationsResponse[]>([]);
-  private teardown = new Subject<void>();
 
-  private fetchOrg$ = this.orgId
-    .pipe(
-      switchMap((orgId) => this.retrieveCriticalApps(orgId)),
-      takeUntil(this.teardown),
-    )
-    .subscribe((apps) => this.criticalAppsList.next(apps));
+  // -------------------------- Data ------------------------------------
+  private criticalAppsListSubject$ = new BehaviorSubject<
+    PasswordHealthReportApplicationsResponse[]
+  >([]);
+  criticalAppsList$ = this.criticalAppsListSubject$.asObservable();
 
   constructor(
     private keyService: KeyService,
@@ -48,25 +45,52 @@ export class CriticalAppsService {
     private criticalAppsApiService: CriticalAppsApiService,
   ) {}
 
+  // Set context for the service for a specific organization
+  loadOrganizationContext(orgId: OrganizationId, userId: UserId) {
+    // Fetch the organization key for the user
+    this.orgKey$ = this.keyService.orgKeys$(userId).pipe(
+      filter((OrgKeys) => !!OrgKeys),
+      map((organizationKeysById) => organizationKeysById[orgId as OrganizationId]),
+    );
+
+    // Store organization id for service context
+    this.organizationId.next(orgId);
+
+    // Setup the critical apps fetching for the organization
+    if (orgId) {
+      this.retrieveCriticalApps(orgId).subscribe({
+        next: (result) => {
+          this.criticalAppsListSubject$.next(result);
+        },
+        error: (error: unknown) => {
+          throw error;
+        },
+      });
+    }
+  }
+
   // Get a list of critical apps for a given organization
   getAppsListForOrg(orgId: OrganizationId): Observable<PasswordHealthReportApplicationsResponse[]> {
-    if (orgId != this.orgId.value) {
-      throw new Error("Organization ID mismatch");
+    // [FIXME] Get organization id from context for all functions in this file
+    if (orgId != this.organizationId.value) {
+      throw new Error(
+        `Organization ID mismatch: expected ${this.organizationId.value}, got ${orgId}`,
+      );
     }
 
-    return this.criticalAppsList
+    return this.criticalAppsListSubject$
       .asObservable()
       .pipe(map((apps) => apps.filter((app) => app.organizationId === orgId)));
   }
 
   // Reset the critical apps list
   setAppsInListForOrg(apps: PasswordHealthReportApplicationsResponse[]) {
-    this.criticalAppsList.next(apps);
+    this.criticalAppsListSubject$.next(apps);
   }
 
   // Save the selected critical apps for a given organization
   async setCriticalApps(orgId: OrganizationId, selectedUrls: string[]) {
-    if (orgId != this.orgId.value) {
+    if (orgId != this.organizationId.value) {
       throw new Error("Organization ID mismatch");
     }
 
@@ -79,7 +103,7 @@ export class CriticalAppsService {
     // only save records that are not already in the database
     const newEntries = await this.filterNewEntries(orgId as OrganizationId, selectedUrls);
     const criticalAppsRequests = await this.encryptNewEntries(
-      this.orgId.value as OrganizationId,
+      this.organizationId.value as OrganizationId,
       orgKey,
       newEntries,
     );
@@ -89,7 +113,7 @@ export class CriticalAppsService {
     );
 
     // add the new entries to the criticalAppsList
-    const updatedList = [...this.criticalAppsList.value];
+    const updatedList = [...this.criticalAppsListSubject$.value];
     for (const responseItem of dbResponse) {
       const decryptedUrl = await this.encryptService.decryptString(
         new EncString(responseItem.uri),
@@ -103,26 +127,17 @@ export class CriticalAppsService {
         } as PasswordHealthReportApplicationsResponse);
       }
     }
-    this.criticalAppsList.next(updatedList);
-  }
-
-  // Get the critical apps for a given organization
-  setOrganizationId(orgId: OrganizationId, userId: UserId) {
-    this.orgKey$ = this.keyService.orgKeys$(userId).pipe(
-      filter((OrgKeys) => !!OrgKeys),
-      map((organizationKeysById) => organizationKeysById[orgId as OrganizationId]),
-    );
-    this.orgId.next(orgId);
+    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) {
-    if (orgId != this.orgId.value) {
+    if (orgId != this.organizationId.value) {
       throw new Error("Organization ID mismatch");
     }
 
-    const app = this.criticalAppsList.value.find(
+    const app = this.criticalAppsListSubject$.value.find(
       (f) => f.organizationId === orgId && f.uri === selectedUrl,
     );
 
@@ -135,7 +150,9 @@ export class CriticalAppsService {
       passwordHealthReportApplicationIds: [app.id],
     });
 
-    this.criticalAppsList.next(this.criticalAppsList.value.filter((f) => f.uri !== selectedUrl));
+    this.criticalAppsListSubject$.next(
+      this.criticalAppsListSubject$.value.filter((f) => f.uri !== selectedUrl),
+    );
   }
 
   private retrieveCriticalApps(
@@ -170,7 +187,7 @@ export class CriticalAppsService {
   }
 
   private async filterNewEntries(orgId: OrganizationId, selectedUrls: string[]): Promise<string[]> {
-    return await firstValueFrom(this.criticalAppsList).then((criticalApps) => {
+    return await firstValueFrom(this.criticalAppsListSubject$).then((criticalApps) => {
       const criticalAppsUri = criticalApps
         .filter((f) => f.organizationId === orgId)
         .map((f) => f.uri);
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 f547df31f41..53ee3ffa892 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
@@ -2,5 +2,8 @@ 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 "./all-activities.service";
+export * from "./security-tasks-api.service";
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/password-health.service.spec.ts
index b81acb09bed..65ee2c8bb74 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/password-health.service.spec.ts
@@ -1,65 +1,106 @@
-import { TestBed } from "@angular/core/testing";
+import { mock } from "jest-mock-extended";
+import { ZXCVBNResult } from "zxcvbn";
 
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
-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 { 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";
 
-// FIXME: Remove password-health report service after PR-15498 completion
 describe("PasswordHealthService", () => {
   let service: PasswordHealthService;
+
+  // Mock services
+  const passwordStrengthService = mock<PasswordStrengthServiceAbstraction>();
+  const auditService = mock<AuditService>();
+
+  // Mock data
+  let mockValidCipher: CipherView;
+  let mockInvalidCipher: CipherView;
+  let mockExposedCiphers: CipherView[];
+
   beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [
-        PasswordHealthService,
-        {
-          provide: PasswordStrengthServiceAbstraction,
-          useValue: {
-            getPasswordStrength: (password: string) => {
-              const score = password.length < 4 ? 1 : 4;
-              return { score };
-            },
-          },
-        },
-        {
-          provide: AuditService,
-          useValue: {
-            passwordLeaked: (password: string) => Promise.resolve(password === "123" ? 100 : 0),
-          },
-        },
-        {
-          provide: CipherService,
-          useValue: {
-            getAllFromApiForOrganization: jest.fn().mockResolvedValue(mockCiphers),
-          },
-        },
-        {
-          provide: MemberCipherDetailsApiService,
-          useValue: {
-            getMemberCipherDetails: jest.fn().mockResolvedValue(mockMemberCipherDetails),
-          },
-        },
-        { provide: "organizationId", useValue: "org1" },
-      ],
+    // Setup mock service implementations
+    passwordStrengthService.getPasswordStrength.mockImplementation((password: string) => {
+      return { score: password === "weak" ? 1 : 4 } as ZXCVBNResult;
     });
+    auditService.passwordLeaked.mockImplementation((password: string) =>
+      Promise.resolve(password === "leaked" ? 2 : 0),
+    );
+    service = new PasswordHealthService(passwordStrengthService, auditService);
 
-    service = TestBed.inject(PasswordHealthService);
+    // Setup mock data
+    mockValidCipher = mock<CipherView>({
+      type: CipherType.Login,
+      login: { password: "weak", username: "user" },
+      isDeleted: false,
+      viewPassword: true,
+    });
+    mockInvalidCipher = mock<CipherView>({
+      type: CipherType.Card,
+      login: { password: "" },
+      isDeleted: true,
+      viewPassword: false,
+    });
+    mockExposedCiphers = [
+      mock<CipherView>({
+        id: "cipher-id-1",
+        type: CipherType.Login,
+        login: { password: "leaked", username: "user" },
+        isDeleted: false,
+        viewPassword: true,
+      }),
+      mock<CipherView>({
+        id: "cipher-id-2",
+        type: CipherType.Login,
+        login: { password: "safe", username: "user" },
+        isDeleted: false,
+        viewPassword: true,
+      }),
+    ];
   });
 
-  it("should be created", () => {
-    expect(service).toBeTruthy();
+  it("should extract username parts", () => {
+    expect(service.extractUsernameParts("john.doe@example.com")).toEqual(["john", "doe"]);
+    expect(service.extractUsernameParts("a@b.com")).toEqual(["a"]);
+    expect(service.extractUsernameParts("user_name")).toEqual(["user", "name"]);
   });
 
-  it("should initialize properties", () => {
-    expect(service.reportCiphers).toEqual([]);
-    expect(service.reportCipherIds).toEqual([]);
-    expect(service.passwordStrengthMap.size).toBe(0);
-    expect(service.passwordUseMap.size).toBe(0);
-    expect(service.exposedPasswordMap.size).toBe(0);
-    expect(service.totalMembersMap.size).toBe(0);
+  it("should identify weak passwords", () => {
+    const result = service.findWeakPasswordDetails(mockValidCipher);
+    expect(result).toEqual({
+      score: 1,
+      detailValue: { label: "veryWeak", badgeVariant: "danger" },
+    });
+  });
+
+  it("should return null for invalid cipher in findWeakPasswordDetails", () => {
+    const cipher = { type: CipherType.Card } as any;
+    expect(service.findWeakPasswordDetails(cipher)).toBeNull();
+  });
+
+  it("should get password score info", () => {
+    expect(service.getPasswordScoreInfo(4)).toEqual({ label: "strong", badgeVariant: "success" });
+    expect(service.getPasswordScoreInfo(2)).toEqual({ label: "weak", badgeVariant: "warning" });
+    expect(service.getPasswordScoreInfo(0)).toEqual({ label: "veryWeak", badgeVariant: "danger" });
+  });
+
+  it("should check if username is not empty", () => {
+    expect(service.isUserNameNotEmpty({ login: { username: "user" } } as any)).toBe(true);
+    expect(service.isUserNameNotEmpty({ login: { username: "" } } as any)).toBe(false);
+  });
+
+  it("should validate cipher correctly", () => {
+    expect(service.isValidCipher(mockValidCipher)).toBe(true);
+
+    expect(service.isValidCipher(mockInvalidCipher)).toBe(false);
+  });
+
+  it("should audit password leaks", (done) => {
+    service.auditPasswordLeaks$(mockExposedCiphers).subscribe((result) => {
+      expect(result).toEqual([{ exposedXTimes: 2, cipherId: "cipher-id-1" }]);
+      done();
+    });
   });
 });
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/password-health.service.ts
index f2f9a9868f7..3904c4c3865 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/password-health.service.ts
@@ -1,186 +1,137 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Inject, Injectable } from "@angular/core";
+import { filter, from, map, mergeMap, Observable, toArray } from "rxjs";
 
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
-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 { BadgeVariant } from "@bitwarden/components";
 
-import { MemberCipherDetailsApiService } from "./member-cipher-details-api.service";
+import {
+  ExposedPasswordDetail,
+  WeakPasswordDetail,
+  WeakPasswordScore,
+} from "../models/password-health";
 
-@Injectable()
 export class PasswordHealthService {
-  reportCiphers: CipherView[] = [];
-
-  reportCipherIds: string[] = [];
-
-  passwordStrengthMap = new Map<string, [string, BadgeVariant]>();
-
-  passwordUseMap = new Map<string, number>();
-
-  exposedPasswordMap = new Map<string, number>();
-
-  totalMembersMap = new Map<string, number>();
-
   constructor(
     private passwordStrengthService: PasswordStrengthServiceAbstraction,
     private auditService: AuditService,
-    private cipherService: CipherService,
-    private memberCipherDetailsApiService: MemberCipherDetailsApiService,
-    @Inject("organizationId") private organizationId: string,
   ) {}
 
-  async generateReport() {
-    const allCiphers = await this.cipherService.getAllFromApiForOrganization(this.organizationId);
-    allCiphers.forEach(async (cipher) => {
-      this.findWeakPassword(cipher);
-      this.findReusedPassword(cipher);
-      await this.findExposedPassword(cipher);
-    });
-
-    const memberCipherDetails = await this.memberCipherDetailsApiService.getMemberCipherDetails(
-      this.organizationId,
+  /**
+   * Finds exposed passwords in a list of ciphers.
+   *
+   * @param ciphers The list of ciphers to check.
+   * @returns An observable that emits an array of ExposedPasswordDetail.
+   */
+  auditPasswordLeaks$(ciphers: CipherView[]): Observable<ExposedPasswordDetail[]> {
+    return from(ciphers).pipe(
+      filter((cipher) => this.isValidCipher(cipher)),
+      mergeMap((cipher) =>
+        this.auditService
+          .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,
+        cipherId: cipher.id,
+      })),
+      toArray(),
     );
-
-    memberCipherDetails.forEach((user) => {
-      user.cipherIds.forEach((cipherId: string) => {
-        if (this.totalMembersMap.has(cipherId)) {
-          this.totalMembersMap.set(cipherId, (this.totalMembersMap.get(cipherId) || 0) + 1);
-        } else {
-          this.totalMembersMap.set(cipherId, 1);
-        }
-      });
-    });
   }
 
-  async findExposedPassword(cipher: CipherView) {
-    const { type, login, isDeleted, viewPassword, id } = cipher;
-    if (
-      type !== CipherType.Login ||
-      login.password == null ||
-      login.password === "" ||
-      isDeleted ||
-      !viewPassword
-    ) {
-      return;
-    }
+  /**
+   * Extracts username parts from the cipher's username.
+   * This is used to help determine password strength.
+   *
+   * @param cipherUsername The username from the cipher.
+   * @returns An array of username parts.
+   */
+  extractUsernameParts(cipherUsername: string) {
+    const atPosition = cipherUsername.indexOf("@");
+    const userNameToProcess =
+      atPosition > -1 ? cipherUsername.substring(0, atPosition) : cipherUsername;
 
-    const exposedCount = await this.auditService.passwordLeaked(login.password);
-    if (exposedCount > 0) {
-      this.exposedPasswordMap.set(id, exposedCount);
-      this.checkForExistingCipher(cipher);
-    }
+    return userNameToProcess
+      .trim()
+      .toLowerCase()
+      .split(/[^A-Za-z0-9]/);
   }
 
-  findReusedPassword(cipher: CipherView) {
-    const { type, login, isDeleted, viewPassword } = cipher;
-    if (
-      type !== CipherType.Login ||
-      login.password == null ||
-      login.password === "" ||
-      isDeleted ||
-      !viewPassword
-    ) {
-      return;
+  /**
+   * Checks if the cipher has a weak password based on the password strength score.
+   *
+   * @param cipher
+   * @returns
+   */
+  findWeakPasswordDetails(cipher: CipherView): WeakPasswordDetail | null {
+    // Validate the cipher
+    if (!this.isValidCipher(cipher)) {
+      return null;
     }
 
-    if (this.passwordUseMap.has(login.password)) {
-      this.passwordUseMap.set(login.password, (this.passwordUseMap.get(login.password) || 0) + 1);
-    } else {
-      this.passwordUseMap.set(login.password, 1);
-    }
+    // Check the username
+    const userInput = this.isUserNameNotEmpty(cipher)
+      ? this.extractUsernameParts(cipher.login.username)
+      : undefined;
 
-    this.checkForExistingCipher(cipher);
-  }
-
-  findWeakPassword(cipher: CipherView): void {
-    const { type, login, isDeleted, viewPassword } = cipher;
-    if (
-      type !== CipherType.Login ||
-      login.password == null ||
-      login.password === "" ||
-      isDeleted ||
-      !viewPassword
-    ) {
-      return;
-    }
-
-    const hasUserName = this.isUserNameNotEmpty(cipher);
-    let userInput: string[] = [];
-    if (hasUserName) {
-      const atPosition = login.username.indexOf("@");
-      if (atPosition > -1) {
-        userInput = userInput
-          .concat(
-            login.username
-              .substring(0, atPosition)
-              .trim()
-              .toLowerCase()
-              .split(/[^A-Za-z0-9]/),
-          )
-          .filter((i) => i.length >= 3);
-      } else {
-        userInput = login.username
-          .trim()
-          .toLowerCase()
-          .split(/[^A-Za-z0-9]/)
-          .filter((i) => i.length >= 3);
-      }
-    }
     const { score } = this.passwordStrengthService.getPasswordStrength(
-      login.password,
-      null,
-      userInput.length > 0 ? userInput : null,
+      cipher.login.password,
+      undefined, // No email available in this context
+      userInput,
     );
 
+    // If a score is not found or a score is less than 3, it's weak
     if (score != null && score <= 2) {
-      this.passwordStrengthMap.set(cipher.id, this.scoreKey(score));
-      this.checkForExistingCipher(cipher);
+      return { score: score, detailValue: this.getPasswordScoreInfo(score) };
+    }
+    return null;
+  }
+
+  /**
+   * Gets the password score information based on the score.
+   *
+   * @param score
+   * @returns An object containing the label and badge variant for the password score.
+   */
+  getPasswordScoreInfo(score: number): WeakPasswordScore {
+    switch (score) {
+      case 4:
+        return { label: "strong", badgeVariant: "success" };
+      case 3:
+        return { label: "good", badgeVariant: "primary" };
+      case 2:
+        return { label: "weak", badgeVariant: "warning" };
+      default:
+        return { label: "veryWeak", badgeVariant: "danger" };
     }
   }
 
-  private isUserNameNotEmpty(c: CipherView): boolean {
+  /**
+   * Checks if the username on the cipher is not empty.
+   */
+  isUserNameNotEmpty(c: CipherView): boolean {
     return !Utils.isNullOrWhitespace(c.login.username);
   }
 
-  private scoreKey(score: number): [string, BadgeVariant] {
-    switch (score) {
-      case 4:
-        return ["strong", "success"];
-      case 3:
-        return ["good", "primary"];
-      case 2:
-        return ["weak", "warning"];
-      default:
-        return ["veryWeak", "danger"];
+  /**
+   * Validates that the cipher is a login item, has a password
+   * is not deleted, and the user can view the password
+   * @param c the input cipher
+   */
+  isValidCipher(c: CipherView): boolean {
+    const { type, login, isDeleted, viewPassword } = c;
+    if (
+      type !== CipherType.Login ||
+      login.password == null ||
+      login.password === "" ||
+      isDeleted ||
+      !viewPassword
+    ) {
+      return false;
     }
-  }
-
-  checkForExistingCipher(ciph: CipherView) {
-    if (!this.reportCipherIds.includes(ciph.id)) {
-      this.reportCipherIds.push(ciph.id);
-      this.reportCiphers.push(ciph);
-    }
-  }
-
-  groupCiphersByLoginUri(): CipherView[] {
-    const cipherViews: CipherView[] = [];
-    const cipherUris: string[] = [];
-    const ciphers = this.reportCiphers;
-
-    ciphers.forEach((ciph) => {
-      const uris = ciph.login?.uris ?? [];
-      uris.map((u: { uri: string }) => {
-        const uri = Utils.getHostname(u.uri).replace("www.", "");
-        cipherUris.push(uri);
-        cipherViews.push({ ...ciph, hostURI: uri } as CipherView & { hostURI: string });
-      });
-    });
-
-    return cipherViews;
+    return true;
   }
 }
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
index ef9fc768944..4eda92f0eb3 100644
--- 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
@@ -1,8 +1,20 @@
 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 { EncryptedDataModel } from "../models/password-health";
+import {
+  GetRiskInsightsApplicationDataResponse,
+  GetRiskInsightsReportResponse,
+  GetRiskInsightsSummaryResponse,
+  SaveRiskInsightsReportRequest,
+  SaveRiskInsightsReportResponse,
+} from "../models/api-models.types";
+import { EncryptedDataWithKey } from "../models/password-health";
 
 import { RiskInsightsApiService } from "./risk-insights-api.service";
 
@@ -10,6 +22,24 @@ 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 mockData = "encrypted-data";
+
+  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,
+      contentEncryptionKey: reportKey,
+    },
+  };
+
   beforeEach(() => {
     service = new RiskInsightsApiService(mockApiService);
   });
@@ -18,66 +48,193 @@ describe("RiskInsightsApiService", () => {
     expect(service).toBeTruthy();
   });
 
-  describe("getRiskInsightsSummary", () => {
-    it("should call apiService.send with correct parameters and return an Observable", (done) => {
-      const orgId = "org123";
-      const minDate = new Date("2024-01-01");
-      const maxDate = new Date("2024-01-31");
-      const mockResponse: EncryptedDataModel[] = [{ encryptedData: "abc" } as EncryptedDataModel];
+  it("getRiskInsightsReport$ should call apiService.send with correct parameters and return the response", () => {
+    const getRiskInsightsReportResponse = {
+      id: mockId,
+      organizationId: orgId,
+      date: new Date().toISOString(),
+      reportData: mockData,
+      contentEncryptionKey: mockKey,
+    };
 
-      mockApiService.send.mockResolvedValueOnce(mockResponse);
+    mockApiService.send.mockReturnValue(Promise.resolve(getRiskInsightsReportResponse));
 
-      service.getRiskInsightsSummary(orgId, minDate, maxDate).subscribe((result) => {
-        expect(mockApiService.send).toHaveBeenCalledWith(
-          "GET",
-          `organization-report-summary/org123?from=2024-01-01&to=2024-01-31`,
-          null,
-          true,
-          true,
-        );
-        expect(result).toEqual(mockResponse);
-        done();
-      });
+    service.getRiskInsightsReport$(orgId).subscribe((result) => {
+      expect(result).toEqual(new GetRiskInsightsReportResponse(getRiskInsightsReportResponse));
+      expect(mockApiService.send).toHaveBeenCalledWith(
+        "GET",
+        `/reports/organizations/${orgId.toString()}/latest`,
+        null,
+        true,
+        true,
+      );
     });
   });
 
-  describe("saveRiskInsightsSummary", () => {
-    it("should call apiService.send with correct parameters and return an Observable", (done) => {
-      const data: EncryptedDataModel = { encryptedData: "xyz" } as EncryptedDataModel;
+  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));
 
-      mockApiService.send.mockResolvedValueOnce(undefined);
+    const result = await firstValueFrom(service.getRiskInsightsReport$(orgId));
 
-      service.saveRiskInsightsSummary(data).subscribe((result) => {
-        expect(mockApiService.send).toHaveBeenCalledWith(
-          "POST",
-          "organization-report-summary",
-          data,
-          true,
-          true,
-        );
-        expect(result).toBeUndefined();
-        done();
-      });
-    });
+    expect(result).toBeNull();
   });
 
-  describe("updateRiskInsightsSummary", () => {
-    it("should call apiService.send with correct parameters and return an Observable", (done) => {
-      const data: EncryptedDataModel = { encryptedData: "xyz" } as EncryptedDataModel;
+  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));
 
-      mockApiService.send.mockResolvedValueOnce(undefined);
+    await expect(firstValueFrom(service.getRiskInsightsReport$(orgId))).rejects.toEqual(error);
 
-      service.updateRiskInsightsSummary(data).subscribe((result) => {
-        expect(mockApiService.send).toHaveBeenCalledWith(
-          "PUT",
-          "organization-report-summary",
-          data,
-          true,
-          true,
-        );
-        expect(result).toBeUndefined();
-        done();
-      });
-    });
+    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(saveRiskInsightsReportRequest));
+
+    const result = await firstValueFrom(
+      service.saveRiskInsightsReport$(saveRiskInsightsReportRequest, orgId),
+    );
+
+    expect(result).toEqual(new SaveRiskInsightsReportResponse(saveRiskInsightsReportRequest));
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "POST",
+      `/reports/organizations/${orgId.toString()}`,
+      saveRiskInsightsReportRequest.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$(saveRiskInsightsReportRequest, orgId)),
+    ).rejects.toEqual(error);
+
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "POST",
+      `/reports/organizations/${orgId.toString()}`,
+      saveRiskInsightsReportRequest.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$(saveRiskInsightsReportRequest, orgId)),
+    ).rejects.toEqual(error);
+
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "POST",
+      `/reports/organizations/${orgId.toString()}`,
+      saveRiskInsightsReportRequest.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: mockData,
+        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,
+      encryptedData: new EncString(mockData),
+      contentEncryptionKey: new EncString(mockKey),
+    };
+
+    const reportId = "report123" as OrganizationReportId;
+
+    mockApiService.send.mockResolvedValueOnce(undefined);
+
+    const result = await firstValueFrom(service.updateRiskInsightsSummary$(data, orgId, reportId));
+
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "PATCH",
+      `/reports/organizations/${orgId.toString()}/data/summary/${reportId.toString()}`,
+      data,
+      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,
+      encryptedData: new EncString(mockData),
+      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 applicationData: EncryptedDataWithKey = {
+      organizationId: orgId,
+      encryptedData: new EncString(mockData),
+      contentEncryptionKey: new EncString(mockKey),
+    };
+    const reportId = "report123" as OrganizationReportId;
+
+    mockApiService.send.mockResolvedValueOnce(undefined);
+    const result = await firstValueFrom(
+      service.updateRiskInsightsApplicationData$(applicationData, orgId, reportId),
+    );
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "PATCH",
+      `/reports/organizations/${orgId.toString()}/data/application/${reportId.toString()}`,
+      applicationData,
+      true,
+      true,
+    );
+    expect(result).toBeUndefined();
   });
 });
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/risk-insights-api.service.ts
index 0d69947b826..8f40ae91b47 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/risk-insights-api.service.ts
@@ -1,35 +1,82 @@
-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 { EncryptedDataModel } from "../models/password-health";
+import {
+  GetRiskInsightsApplicationDataResponse,
+  GetRiskInsightsReportResponse,
+  GetRiskInsightsSummaryResponse,
+  SaveRiskInsightsReportRequest,
+  SaveRiskInsightsReportResponse,
+} from "../models/api-models.types";
+import { EncryptedDataWithKey } from "../models/password-health";
 
 export class RiskInsightsApiService {
   constructor(private apiService: ApiService) {}
 
-  getRiskInsightsSummary(
+  getRiskInsightsReport$(orgId: OrganizationId): Observable<GetRiskInsightsReportResponse | null> {
+    const dbResponse = this.apiService.send(
+      "GET",
+      `/reports/organizations/${orgId.toString()}/latest`,
+      null,
+      true,
+      true,
+    );
+    return from(dbResponse).pipe(
+      map((response) => new GetRiskInsightsReportResponse(response)),
+      catchError((error: unknown) => {
+        if (error instanceof ErrorResponse && error.statusCode === 404) {
+          return of(null); // Handle 404 by returning null or an appropriate default value
+        }
+        return throwError(() => error); // Re-throw other errors
+      }),
+    );
+  }
+
+  saveRiskInsightsReport$(
+    request: SaveRiskInsightsReportRequest,
+    organizationId: OrganizationId,
+  ): Observable<SaveRiskInsightsReportResponse> {
+    const dbResponse = this.apiService.send(
+      "POST",
+      `/reports/organizations/${organizationId.toString()}`,
+      request.data,
+      true,
+      true,
+    );
+
+    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(
       "GET",
-      `organization-report-summary/${orgId.toString()}?from=${minDateStr}&to=${maxDateStr}`,
+      `/reports/organizations/${orgId.toString()}/data/summary?startDate=${minDateStr}&endDate=${maxDateStr}`,
       null,
       true,
       true,
     );
 
-    return from(dbResponse as Promise<EncryptedDataModel[]>);
+    return from(dbResponse).pipe(map((response) => new GetRiskInsightsSummaryResponse(response)));
   }
 
-  saveRiskInsightsSummary(data: EncryptedDataModel): Observable<void> {
+  updateRiskInsightsSummary$(
+    summaryData: EncryptedDataWithKey,
+    organizationId: OrganizationId,
+    reportId: OrganizationReportId,
+  ): Observable<void> {
     const dbResponse = this.apiService.send(
-      "POST",
-      "organization-report-summary",
-      data,
+      "PATCH",
+      `/reports/organizations/${organizationId.toString()}/data/summary/${reportId.toString()}`,
+      summaryData,
       true,
       true,
     );
@@ -37,8 +84,35 @@ export class RiskInsightsApiService {
     return from(dbResponse as Promise<void>);
   }
 
-  updateRiskInsightsSummary(data: EncryptedDataModel): Observable<void> {
-    const dbResponse = this.apiService.send("PUT", "organization-report-summary", data, true, true);
+  getRiskInsightsApplicationData$(
+    orgId: OrganizationId,
+    reportId: OrganizationReportId,
+  ): Observable<GetRiskInsightsApplicationDataResponse> {
+    const dbResponse = this.apiService.send(
+      "GET",
+      `/reports/organizations/${orgId.toString()}/data/application/${reportId.toString()}`,
+      null,
+      true,
+      true,
+    );
+
+    return from(dbResponse).pipe(
+      map((response) => new GetRiskInsightsApplicationDataResponse(response)),
+    );
+  }
+
+  updateRiskInsightsApplicationData$(
+    applicationData: EncryptedDataWithKey,
+    orgId: OrganizationId,
+    reportId: OrganizationReportId,
+  ): Observable<void> {
+    const dbResponse = this.apiService.send(
+      "PATCH",
+      `/reports/organizations/${orgId.toString()}/data/application/${reportId.toString()}`,
+      applicationData,
+      true,
+      true,
+    );
 
     return from(dbResponse as Promise<void>);
   }
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
index 386c6fd6865..7038844998d 100644
--- 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
@@ -1,20 +1,60 @@
-import { BehaviorSubject } from "rxjs";
-import { finalize } from "rxjs/operators";
+import { BehaviorSubject, EMPTY, firstValueFrom, Observable, of } from "rxjs";
+import {
+  distinctUntilChanged,
+  exhaustMap,
+  filter,
+  finalize,
+  map,
+  switchMap,
+  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 { OrganizationId, UserId } from "@bitwarden/common/types/guid";
 
 import {
   AppAtRiskMembersDialogParams,
-  ApplicationHealthReportDetail,
   AtRiskApplicationDetail,
   AtRiskMemberDetail,
   DrawerType,
-} from "../models/password-health";
+  DrawerDetails,
+  ApplicationHealthReportDetail,
+  ApplicationHealthReportDetailEnriched,
+  ReportDetailsAndSummary,
+} from "../models/report-models";
 
+import { CriticalAppsService } from "./critical-apps.service";
 import { RiskInsightsReportService } from "./risk-insights-report.service";
 export class RiskInsightsDataService {
-  private applicationsSubject = new BehaviorSubject<ApplicationHealthReportDetail[] | null>(null);
+  // -------------------------- 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();
 
@@ -24,30 +64,83 @@ export class RiskInsightsDataService {
   private errorSubject = new BehaviorSubject<string | null>(null);
   error$ = this.errorSubject.asObservable();
 
-  private dataLastUpdatedSubject = new BehaviorSubject<Date | null>(null);
-  dataLastUpdated$ = this.dataLastUpdatedSubject.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();
 
-  openDrawer = false;
-  drawerInvokerId: string = "";
-  activeDrawerType: DrawerType = DrawerType.None;
-  atRiskMemberDetails: AtRiskMemberDetail[] = [];
-  appAtRiskMembers: AppAtRiskMembersDialogParams | null = null;
-  atRiskAppDetails: AtRiskApplicationDetail[] | null = null;
+  // ------------------------- Report Variables ----------------
+  // The last run report details
+  private reportResultsSubject = new BehaviorSubject<ReportDetailsAndSummary | null>(null);
+  reportResults$ = this.reportResultsSubject.asObservable();
+  // Is a report being generated
+  private isRunningReportSubject = new BehaviorSubject<boolean>(false);
+  isRunningReport$ = this.isRunningReportSubject.asObservable();
+  // The error from report generation if there was an error
 
-  constructor(private reportService: RiskInsightsReportService) {}
+  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 - replace with appropriate method
+    // 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);
+
+    // 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: string, isRefresh?: boolean): void {
+  fetchApplicationsReport(organizationId: OrganizationId, isRefresh?: boolean): void {
     if (isRefresh) {
       this.isRefreshingSubject.next(true);
     } else {
       this.isLoadingSubject.next(true);
     }
     this.reportService
-      .generateApplicationsReport$(organizationId)
+      .LEGACY_generateApplicationsReport$(organizationId)
       .pipe(
         finalize(() => {
           this.isLoadingSubject.next(false);
@@ -66,60 +159,222 @@ export class RiskInsightsDataService {
       });
   }
 
-  refreshApplicationsReport(organizationId: string): void {
+  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.activeDrawerType === drawerType;
+    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 => {
-    this.resetDrawer(DrawerType.OrgAtRiskMembers);
-    this.activeDrawerType = DrawerType.OrgAtRiskMembers;
-    this.drawerInvokerId = invokerId;
-    this.atRiskMemberDetails = atRiskMemberDetails;
-    this.openDrawer = !this.openDrawer;
+    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 => {
-    this.resetDrawer(DrawerType.None);
-    this.activeDrawerType = DrawerType.AppAtRiskMembers;
-    this.drawerInvokerId = invokerId;
-    this.appAtRiskMembers = atRiskMembersDialogParams;
-    this.openDrawer = !this.openDrawer;
+    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 => {
-    this.resetDrawer(DrawerType.OrgAtRiskApps);
-    this.activeDrawerType = DrawerType.OrgAtRiskApps;
-    this.drawerInvokerId = invokerId;
-    this.atRiskAppDetails = atRiskApps;
-    this.openDrawer = !this.openDrawer;
-  };
+    const { open, activeDrawerType, invokerId: currentInvokerId } = this.drawerDetailsSubject.value;
+    const shouldClose =
+      open && activeDrawerType === DrawerType.OrgAtRiskApps && currentInvokerId === invokerId;
 
-  closeDrawer = (): void => {
-    this.resetDrawer(DrawerType.None);
-  };
-
-  private resetDrawer = (drawerType: DrawerType): void => {
-    if (this.activeDrawerType !== drawerType) {
-      this.openDrawer = false;
+    if (shouldClose) {
+      this.closeDrawer();
+    } else {
+      this.drawerDetailsSubject.next({
+        open: true,
+        invokerId,
+        activeDrawerType: DrawerType.OrgAtRiskApps,
+        atRiskMemberDetails: [],
+        appAtRiskMembers: null,
+        atRiskAppDetails: atRiskApps,
+      });
     }
-
-    this.activeDrawerType = DrawerType.None;
-    this.atRiskMemberDetails = [];
-    this.appAtRiskMembers = null;
-    this.atRiskAppDetails = null;
-    this.drawerInvokerId = "";
   };
+
+  // ------------------- Trigger Report Generation -------------------
+  /** Trigger generating a report based on the current applications */
+  triggerReport(): void {
+    this.isRunningReportSubject.next(true);
+  }
+
+  /**
+   * Fetches the applications report and updates the applicationsSubject.
+   * @param organizationId The ID of the organization.
+   */
+  fetchLastReport(organizationId: OrganizationId, userId: UserId): void {
+    this.isLoadingSubject.next(true);
+
+    this.reportService
+      .getRiskInsightsReport$(organizationId, userId)
+      .pipe(
+        switchMap((report) => {
+          return this.enrichReportData$(report.data).pipe(
+            map((enrichedReport) => ({
+              data: enrichedReport,
+              summary: report.summary,
+            })),
+          );
+        }),
+        finalize(() => {
+          this.isLoadingSubject.next(false);
+        }),
+      )
+      .subscribe({
+        next: ({ data, summary }) => {
+          this.reportResultsSubject.next({
+            data,
+            summary,
+            dateCreated: new Date(),
+          });
+          this.errorSubject.next(null);
+          this.isLoadingSubject.next(false);
+        },
+        error: () => {
+          this.errorSubject.next("Failed to fetch report");
+          this.reportResultsSubject.next(null);
+          this.isLoadingSubject.next(false);
+        },
+      });
+  }
+
+  private _runApplicationsReport() {
+    return this.isRunningReport$.pipe(
+      distinctUntilChanged(),
+      filter((isRunning) => isRunning),
+      withLatestFrom(this.organizationDetails$, this.userId$),
+      exhaustMap(([_, organizationDetails, userId]) => {
+        const organizationId = organizationDetails?.organizationId;
+        if (!organizationId || !userId) {
+          return EMPTY;
+        }
+
+        // Generate the report
+        return this.reportService.generateApplicationsReport$(organizationId).pipe(
+          map((data) => ({
+            data,
+            summary: this.reportService.generateApplicationsSummary(data),
+          })),
+          switchMap(({ data, summary }) =>
+            this.enrichReportData$(data).pipe(
+              map((enrichedData) => ({ data: enrichedData, summary })),
+            ),
+          ),
+          tap(({ data, summary }) => {
+            this.reportResultsSubject.next({ data, summary, dateCreated: new Date() });
+            this.errorSubject.next(null);
+          }),
+          switchMap(({ data, summary }) => {
+            // Just returns ID
+            return this.reportService.saveRiskInsightsReport$(data, summary, {
+              organizationId,
+              userId,
+            });
+          }),
+        );
+      }),
+    );
+  }
 }
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
new file mode 100644
index 00000000000..9b7bb3b7258
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-encryption.service.spec.ts
@@ -0,0 +1,220 @@
+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: 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(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
new file mode 100644
index 00000000000..7bf01b04a63
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-encryption.service.ts
@@ -0,0 +1,105 @@
+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;
+    const contentEncryptionKeyString = wrappedEncryptionKey;
+
+    const encryptedDataPacket: EncryptedDataWithKey = {
+      organizationId,
+      encryptedData,
+      contentEncryptionKey: contentEncryptionKeyString,
+    };
+
+    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
index 3aa624f1e59..18836fb1319 100644
--- 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
@@ -1,47 +1,185 @@
 import { mock } from "jest-mock-extended";
-import { firstValueFrom } from "rxjs";
-import { ZXCVBNResult } from "zxcvbn";
+import { firstValueFrom, of } from "rxjs";
 
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
+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 { createNewSummaryData } from "../helpers";
+import {
+  GetRiskInsightsReportResponse,
+  SaveRiskInsightsReportResponse,
+} from "../models/api-models.types";
+import { EncryptedDataWithKey } from "../models/password-health";
+import {
+  ApplicationHealthReportDetail,
+  OrganizationReportSummary,
+  RiskInsightsReportData,
+} from "../models/report-models";
+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;
-  const pwdStrengthService = mock<PasswordStrengthServiceAbstraction>();
-  const auditService = mock<AuditService>();
+
+  // 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 ENCRYPTED_TEXT = "This data has been encrypted";
+  const ENCRYPTED_KEY = "Re-encrypted Cipher Key";
+  const mockEncryptedText = new EncString(ENCRYPTED_TEXT);
+  const mockEncryptedKey = new EncString(ENCRYPTED_KEY);
+
+  // Changing mock data
+  let mockCipherViews: CipherView[];
+  let mockMemberDetails: MemberCipherDetailsResponse[];
+  let mockReport: ApplicationHealthReportDetail[];
+  let mockSummary: OrganizationReportSummary;
+  let mockEncryptedReport: EncryptedDataWithKey;
 
   beforeEach(() => {
-    pwdStrengthService.getPasswordStrength.mockImplementation((password: string) => {
-      const score = password.length < 4 ? 1 : 4;
-      return { score } as ZXCVBNResult;
-    });
-
-    auditService.passwordLeaked.mockImplementation((password: string) =>
-      Promise.resolve(password === "123" ? 100 : 0),
-    );
-
     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(
-      pwdStrengthService,
-      auditService,
       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",
+      }),
+    ];
+
+    mockReport = [
+      {
+        applicationName: "app1",
+        passwordCount: 0,
+        atRiskPasswordCount: 0,
+        atRiskCipherIds: [],
+        memberCount: 0,
+        atRiskMemberCount: 0,
+        memberDetails: [],
+        atRiskMemberDetails: [],
+        cipherIds: [],
+      },
+    ];
+    mockSummary = createNewSummaryData();
+
+    mockEncryptedReport = {
+      organizationId: mockOrganizationId,
+      encryptedData: mockEncryptedText,
+      contentEncryptionKey: mockEncryptedKey,
+    };
+  });
+
+  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.generateRawDataReport$("orgId"));
+    const result = await firstValueFrom(service.LEGACY_generateRawDataReport$(mockOrganizationId));
 
     expect(result).toHaveLength(6);
 
@@ -67,7 +205,7 @@ describe("RiskInsightsReportService", () => {
   });
 
   it("should generate the raw data + uri report correctly", async () => {
-    const result = await firstValueFrom(service.generateRawDataUriReport$("orgId"));
+    const result = await firstValueFrom(service.generateRawDataUriReport$(mockOrganizationId));
 
     expect(result).toHaveLength(11);
 
@@ -90,7 +228,9 @@ describe("RiskInsightsReportService", () => {
   });
 
   it("should generate applications health report data correctly", async () => {
-    const result = await firstValueFrom(service.generateApplicationsReport$("orgId"));
+    const result = await firstValueFrom(
+      service.LEGACY_generateApplicationsReport$(mockOrganizationId),
+    );
 
     expect(result).toHaveLength(8);
 
@@ -131,7 +271,9 @@ describe("RiskInsightsReportService", () => {
   });
 
   it("should generate applications summary data correctly", async () => {
-    const reportResult = await firstValueFrom(service.generateApplicationsReport$("orgId"));
+    const reportResult = await firstValueFrom(
+      service.LEGACY_generateApplicationsReport$(mockOrganizationId),
+    );
     const reportSummary = service.generateApplicationsSummary(reportResult);
 
     expect(reportSummary.totalMemberCount).toEqual(7);
@@ -139,4 +281,126 @@ describe("RiskInsightsReportService", () => {
     expect(reportSummary.totalApplicationCount).toEqual(8);
     expect(reportSummary.totalAtRiskApplicationCount).toEqual(7);
   });
+
+  describe("saveRiskInsightsReport$", () => {
+    it("should not update subjects if save response does not have id", (done) => {
+      mockRiskInsightsEncryptionService.encryptRiskInsightsReport.mockResolvedValue(
+        mockEncryptedReport,
+      );
+
+      const saveResponse = new SaveRiskInsightsReportResponse({ id: "" }); // Simulating no ID in response
+      mockRiskInsightsApiService.saveRiskInsightsReport$.mockReturnValue(of(saveResponse));
+
+      service
+        .saveRiskInsightsReport$(mockReport, mockSummary, {
+          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();
+          },
+        });
+    });
+
+    it("should encrypt and save report, then update subjects", async () => {});
+  });
+
+  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 = {
+        id: "reportId",
+        date: new Date().toISOString(),
+        organizationId: mockOrganizationId,
+        reportData: mockEncryptedReport.encryptedData,
+        contentEncryptionKey: mockEncryptedReport.contentEncryptionKey,
+      } as GetRiskInsightsReportResponse;
+
+      const decryptedResponse: RiskInsightsReportData = {
+        data: [],
+        summary: {
+          totalMemberCount: 1,
+          totalAtRiskMemberCount: 1,
+          totalApplicationCount: 1,
+          totalAtRiskApplicationCount: 1,
+          totalCriticalMemberCount: 1,
+          totalCriticalAtRiskMemberCount: 1,
+          totalCriticalApplicationCount: 1,
+          totalCriticalAtRiskApplicationCount: 1,
+          newApplications: [],
+        },
+      };
+
+      const organizationId = "orgId" as OrganizationId;
+      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$(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: mockEncryptedReport.encryptedData,
+        contentEncryptionKey: mockEncryptedReport.contentEncryptionKey,
+      } as GetRiskInsightsReportResponse;
+
+      const decryptedReport = {
+        data: [{ foo: "bar" }],
+      };
+      mockRiskInsightsApiService.getRiskInsightsReport$.mockReturnValue(of(mockResponse));
+      mockRiskInsightsEncryptionService.decryptRiskInsightsReport.mockResolvedValue(
+        decryptedReport,
+      );
+
+      const result = await firstValueFrom(service.getRiskInsightsReport$(organizationId, userId));
+
+      expect(mockRiskInsightsEncryptionService.decryptRiskInsightsReport).toHaveBeenCalledWith(
+        organizationId,
+        userId,
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function),
+      );
+      expect(result).toEqual(decryptedReport);
+    });
+  });
 });
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
index 182e8aa6882..d82366c0154 100644
--- 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
@@ -1,38 +1,87 @@
-// FIXME: Update this file to be type safe
-// @ts-strict-ignore
-import { concatMap, first, from, map, Observable, zip } from "rxjs";
+import {
+  BehaviorSubject,
+  concatMap,
+  first,
+  firstValueFrom,
+  forkJoin,
+  from,
+  map,
+  Observable,
+  of,
+  switchMap,
+  throwError,
+  zip,
+} from "rxjs";
 
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
+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 {
-  ApplicationHealthReportDetail,
-  ApplicationHealthReportSummary,
-  AtRiskMemberDetail,
-  AtRiskApplicationDetail,
-  CipherHealthReportDetail,
-  CipherHealthReportUriDetail,
-  ExposedPasswordDetail,
-  MemberDetailsFlat,
-  WeakPasswordDetail,
-  WeakPasswordScore,
-  ApplicationHealthReportDetailWithCriticalFlagAndCipher,
+  createNewReportData,
+  createNewSummaryData,
+  flattenMemberDetails,
+  getApplicationReportDetail,
+  getFlattenedCipherDetails,
+  getMemberDetailsFlat,
+  getTrimmedCipherUris,
+  getUniqueMembers,
+} from "../helpers/risk-insights-data-mappers";
+import {
+  isSaveRiskInsightsReportResponse,
+  SaveRiskInsightsReportResponse,
+} from "../models/api-models.types";
+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>(
+    createNewSummaryData(),
+  );
+  riskInsightsSummary$ = this.riskInsightsSummarySubject.asObservable();
+
+  // [FIXME] CipherData
+  // Cipher data
+  // private _ciphersSubject = new BehaviorSubject<CipherView[] | null>(null);
+  // _ciphers$ = this._ciphersSubject.asObservable();
+
   constructor(
-    private passwordStrengthService: PasswordStrengthServiceAbstraction,
-    private auditService: AuditService,
     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)
@@ -40,7 +89,9 @@ export class RiskInsightsReportService {
    * @param organizationId
    * @returns Cipher health report data with members and trimmed uris
    */
-  generateRawDataReport$(organizationId: string): Observable<CipherHealthReportDetail[]> {
+  LEGACY_generateRawDataReport$(
+    organizationId: OrganizationId,
+  ): Observable<LEGACY_CipherHealthReportDetail[]> {
     const allCiphers$ = from(this.cipherService.getAllFromApiForOrganization(organizationId));
     const memberCiphers$ = from(
       this.memberCipherDetailsApiService.getMemberCipherDetails(organizationId),
@@ -48,14 +99,14 @@ export class RiskInsightsReportService {
 
     const results$ = zip(allCiphers$, memberCiphers$).pipe(
       map(([allCiphers, memberCiphers]) => {
-        const details: MemberDetailsFlat[] = memberCiphers.flatMap((dtl) =>
-          dtl.cipherIds.map((c) =>
-            this.getMemberDetailsFlat(dtl.userGuid, dtl.userName, dtl.email, c),
-          ),
+        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.getCipherDetails(ciphers, flattenedDetails)),
+      concatMap(([ciphers, flattenedDetails]) =>
+        this.LEGACY_getCipherDetails(ciphers, flattenedDetails),
+      ),
       first(),
     );
 
@@ -68,8 +119,10 @@ export class RiskInsightsReportService {
    * @param organizationId Id of the organization
    * @returns Cipher health report data flattened to the uris
    */
-  generateRawDataUriReport$(organizationId: string): Observable<CipherHealthReportUriDetail[]> {
-    const cipherHealthDetails$ = this.generateRawDataReport$(organizationId);
+  generateRawDataUriReport$(
+    organizationId: OrganizationId,
+  ): Observable<LEGACY_CipherHealthReportUriDetail[]> {
+    const cipherHealthDetails$ = this.LEGACY_generateRawDataReport$(organizationId);
     const results$ = cipherHealthDetails$.pipe(
       map((healthDetails) => this.getCipherUriDetails(healthDetails)),
       first(),
@@ -84,16 +137,44 @@ export class RiskInsightsReportService {
    * @param organizationId Id of the organization
    * @returns The all applications health report data
    */
-  generateApplicationsReport$(organizationId: string): Observable<ApplicationHealthReportDetail[]> {
+  LEGACY_generateApplicationsReport$(
+    organizationId: OrganizationId,
+  ): Observable<ApplicationHealthReportDetail[]> {
     const cipherHealthUriReport$ = this.generateRawDataUriReport$(organizationId);
     const results$ = cipherHealthUriReport$.pipe(
-      map((uriDetails) => this.getApplicationHealthReport(uriDetails)),
+      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.
    */
@@ -104,11 +185,8 @@ export class RiskInsightsReportService {
 
     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);
-        }
+        const currentCount = memberRiskMap.get(member.email) ?? 0;
+        memberRiskMap.set(member.email, currentCount + 1);
       });
     });
 
@@ -121,25 +199,24 @@ export class RiskInsightsReportService {
   generateAtRiskApplicationList(
     cipherHealthReportDetails: ApplicationHealthReportDetail[],
   ): AtRiskApplicationDetail[] {
-    const appsRiskMap = new Map<string, number>();
+    const applicationPasswordRiskMap = 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);
-        }
+        const atRiskPasswordCount = applicationPasswordRiskMap.get(app.applicationName) ?? 0;
+        applicationPasswordRiskMap.set(
+          app.applicationName,
+          atRiskPasswordCount + app.atRiskPasswordCount,
+        );
       });
 
-    return Array.from(appsRiskMap.entries()).map(([applicationName, atRiskPasswordCount]) => ({
-      applicationName,
-      atRiskPasswordCount,
-    }));
+    return Array.from(applicationPasswordRiskMap.entries()).map(
+      ([applicationName, atRiskPasswordCount]) => ({
+        applicationName,
+        atRiskPasswordCount,
+      }),
+    );
   }
 
   /**
@@ -148,27 +225,31 @@ export class RiskInsightsReportService {
    * @param reports The previously calculated application health report data
    * @returns A summary object containing report totals
    */
-  generateApplicationsSummary(
-    reports: ApplicationHealthReportDetail[],
-  ): ApplicationHealthReportSummary {
+  generateApplicationsSummary(reports: ApplicationHealthReportDetail[]): OrganizationReportSummary {
     const totalMembers = reports.flatMap((x) => x.memberDetails);
-    const uniqueMembers = this.getUniqueMembers(totalMembers);
+    const uniqueMembers = getUniqueMembers(totalMembers);
 
     const atRiskMembers = reports.flatMap((x) => x.atRiskMemberDetails);
-    const uniqueAtRiskMembers = this.getUniqueMembers(atRiskMembers);
+    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: string,
-  ): Promise<ApplicationHealthReportDetailWithCriticalFlagAndCipher[]> {
+    organizationId: OrganizationId,
+  ): Promise<LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher[]> {
     const cipherViews = await this.cipherService.getAllFromApiForOrganization(organizationId);
 
     const dataWithCiphers = data.map(
@@ -176,11 +257,95 @@ export class RiskInsightsReportService {
         ({
           ...app,
           ciphers: cipherViews.filter((c) => app.cipherIds.some((a) => a === c.id)),
-        }) as ApplicationHealthReportDetailWithCriticalFlagAndCipher,
+        }) as LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher,
     );
     return dataWithCiphers;
   }
 
+  /**
+   * 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<RiskInsightsReportData> {
+    return this.riskInsightsApiService.getRiskInsightsReport$(organizationId).pipe(
+      switchMap((response): Observable<RiskInsightsReportData> => {
+        if (!response) {
+          // Return an empty report and summary if response is falsy
+          return of<RiskInsightsReportData>(createNewReportData());
+        }
+        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"));
+        }
+        return from(
+          this.riskInsightsEncryptionService.decryptRiskInsightsReport<RiskInsightsReportData>(
+            organizationId,
+            userId,
+            response.reportData,
+            response.contentEncryptionKey,
+            (data) => data as RiskInsightsReportData,
+          ),
+        ).pipe(map((decryptedReport) => decryptedReport ?? createNewReportData()));
+      }),
+    );
+  }
+
+  /**
+   * 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,
+    encryptionParameters: {
+      organizationId: OrganizationId;
+      userId: UserId;
+    },
+  ): Observable<SaveRiskInsightsReportResponse> {
+    return from(
+      this.riskInsightsEncryptionService.encryptRiskInsightsReport(
+        encryptionParameters.organizationId,
+        encryptionParameters.userId,
+        {
+          data: report,
+          summary: summary,
+        },
+      ),
+    ).pipe(
+      map(({ encryptedData, contentEncryptionKey }) => ({
+        data: {
+          organizationId: encryptionParameters.organizationId,
+          date: new Date().toISOString(),
+          reportData: encryptedData.toSdk(),
+          contentEncryptionKey: contentEncryptionKey.toSdk(),
+        },
+      })),
+      switchMap((encryptedReport) =>
+        this.riskInsightsApiService.saveRiskInsightsReport$(
+          encryptedReport,
+          encryptionParameters.organizationId,
+        ),
+      ),
+      map((response) => {
+        if (!isSaveRiskInsightsReportResponse(response)) {
+          throw new Error("Invalid response from API");
+        }
+        return response;
+      }),
+    );
+  }
+
   /**
    * Associates the members with the ciphers they have access to. Calculates the password health.
    * Finds the trimmed uris.
@@ -188,16 +353,18 @@ export class RiskInsightsReportService {
    * @param memberDetails Org members
    * @returns Cipher password health data with trimmed uris and associated members
    */
-  private async getCipherDetails(
+  private async LEGACY_getCipherDetails(
     ciphers: CipherView[],
-    memberDetails: MemberDetailsFlat[],
-  ): Promise<CipherHealthReportDetail[]> {
-    const cipherHealthReports: CipherHealthReportDetail[] = [];
+    memberDetails: LEGACY_MemberDetailsFlat[],
+  ): Promise<LEGACY_CipherHealthReportDetail[]> {
+    const cipherHealthReports: LEGACY_CipherHealthReportDetail[] = [];
     const passwordUseMap = new Map<string, number>();
-    const exposedDetails = await this.findExposedPasswords(ciphers);
+    const exposedDetails = await firstValueFrom(
+      this.passwordHealthService.auditPasswordLeaks$(ciphers),
+    );
     for (const cipher of ciphers) {
-      if (this.validateCipher(cipher)) {
-        const weakPassword = this.findWeakPassword(cipher);
+      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)) {
@@ -209,20 +376,20 @@ export class RiskInsightsReportService {
           passwordUseMap.set(cipher.login.password, 1);
         }
 
-        const exposedPassword = exposedDetails.find((x) => x.cipherId === cipher.id);
+        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 = this.getTrimmedCipherUris(cipher);
+        const cipherTrimmedUris = getTrimmedCipherUris(cipher);
         const cipherHealth = {
           ...cipher,
           weakPasswordDetail: weakPassword,
           exposedPasswordDetail: exposedPassword,
           cipherMembers: cipherMembers,
           trimmedUris: cipherTrimmedUris,
-        } as CipherHealthReportDetail;
+        } as LEGACY_CipherHealthReportDetail;
 
         cipherHealthReports.push(cipherHealth);
       }
@@ -241,10 +408,10 @@ export class RiskInsightsReportService {
    * @returns Flattened cipher health details to uri
    */
   private getCipherUriDetails(
-    cipherHealthReport: CipherHealthReportDetail[],
-  ): CipherHealthReportUriDetail[] {
+    cipherHealthReport: LEGACY_CipherHealthReportDetail[],
+  ): LEGACY_CipherHealthReportUriDetail[] {
     return cipherHealthReport.flatMap((rpt) =>
-      rpt.trimmedUris.map((u) => this.getFlattenedCipherDetails(rpt, u)),
+      rpt.trimmedUris.map((u) => getFlattenedCipherDetails(rpt, u)),
     );
   }
 
@@ -254,8 +421,8 @@ export class RiskInsightsReportService {
    * @param cipherHealthUriReport Cipher and password health info broken out into their uris
    * @returns Application health reports
    */
-  private getApplicationHealthReport(
-    cipherHealthUriReport: CipherHealthReportUriDetail[],
+  private LEGACY_getApplicationHealthReport(
+    cipherHealthUriReport: LEGACY_CipherHealthReportUriDetail[],
   ): ApplicationHealthReportDetail[] {
     const appReports: ApplicationHealthReportDetail[] = [];
     cipherHealthUriReport.forEach((uri) => {
@@ -267,223 +434,189 @@ export class RiskInsightsReportService {
       }
 
       if (index === -1) {
-        appReports.push(this.getApplicationReportDetail(uri, atRisk));
+        appReports.push(getApplicationReportDetail(uri, atRisk));
       } else {
-        appReports[index] = this.getApplicationReportDetail(uri, atRisk, appReports[index]);
+        appReports[index] = getApplicationReportDetail(uri, atRisk, appReports[index]);
       }
     });
     return appReports;
   }
 
-  private async findExposedPasswords(ciphers: CipherView[]): Promise<ExposedPasswordDetail[]> {
-    const exposedDetails: ExposedPasswordDetail[] = [];
-    const promises: Promise<void>[] = [];
-
-    ciphers.forEach((ciph) => {
-      if (this.validateCipher(ciph)) {
-        const promise = this.auditService
-          .passwordLeaked(ciph.login.password)
-          .then((exposedCount) => {
-            if (exposedCount > 0) {
-              const detail = {
-                exposedXTimes: exposedCount,
-                cipherId: ciph.id,
-              } as ExposedPasswordDetail;
-              exposedDetails.push(detail);
-            }
-          });
-        promises.push(promise);
-      }
+  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);
     });
-    await Promise.all(promises);
-
-    return exposedDetails;
+    return passwordUseMap;
   }
 
-  private findWeakPassword(cipher: CipherView): WeakPasswordDetail {
-    const hasUserName = this.isUserNameNotEmpty(cipher);
-    let userInput: string[] = [];
-    if (hasUserName) {
-      const atPosition = cipher.login.username.indexOf("@");
-      if (atPosition > -1) {
-        userInput = userInput
-          .concat(
-            cipher.login.username
-              .substring(0, atPosition)
-              .trim()
-              .toLowerCase()
-              .split(/[^A-Za-z0-9]/),
-          )
-          .filter((i) => i.length >= 3);
-      } else {
-        userInput = cipher.login.username
-          .trim()
-          .toLowerCase()
-          .split(/[^A-Za-z0-9]/)
-          .filter((i) => i.length >= 3);
-      }
-    }
-    const { score } = this.passwordStrengthService.getPasswordStrength(
-      cipher.login.password,
-      null,
-      userInput.length > 0 ? userInput : null,
-    );
+  private _groupCiphersByApplication(
+    cipherHealthData: CipherHealthReport[],
+  ): Map<string, CipherHealthReport[]> {
+    const applicationMap = new Map<string, CipherHealthReport[]>();
 
-    if (score != null && score <= 2) {
-      const scoreValue = this.weakPasswordScore(score);
-      const weakPasswordDetail = { score: score, detailValue: scoreValue } as WeakPasswordDetail;
-      return weakPasswordDetail;
-    }
-    return null;
-  }
+    cipherHealthData.forEach((cipher: CipherHealthReport) => {
+      cipher.applications.forEach((application) => {
+        const existingApplication = applicationMap.get(application) || [];
+        existingApplication.push(cipher);
+        applicationMap.set(application, existingApplication);
+      });
+    });
 
-  private weakPasswordScore(score: number): WeakPasswordScore {
-    switch (score) {
-      case 4:
-        return { label: "strong", badgeVariant: "success" };
-      case 3:
-        return { label: "good", badgeVariant: "primary" };
-      case 2:
-        return { label: "weak", badgeVariant: "warning" };
-      default:
-        return { label: "veryWeak", badgeVariant: "danger" };
-    }
+    return applicationMap;
   }
 
   /**
-   * 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
+   *
+   * @param applications The list of application health report details to map ciphers to
+   * @param organizationId
+   * @returns
    */
-  private getApplicationReportDetail(
-    newUriDetail: CipherHealthReportUriDetail,
-    isAtRisk: boolean,
-    existingUriDetail?: ApplicationHealthReportDetail,
+  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 {
-    const reportDetail = {
-      applicationName: existingUriDetail
-        ? existingUriDetail.applicationName
-        : newUriDetail.trimmedUri,
-      passwordCount: existingUriDetail ? existingUriDetail.passwordCount + 1 : 1,
-      memberDetails: existingUriDetail
-        ? this.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;
+    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) {
-      reportDetail.atRiskPasswordCount = reportDetail.atRiskPasswordCount + 1;
-      reportDetail.atRiskCipherIds.push(newUriDetail.cipherId);
-
-      reportDetail.atRiskMemberDetails = this.getUniqueMembers(
-        reportDetail.atRiskMemberDetails.concat(newUriDetail.cipherMembers),
-      );
-      reportDetail.atRiskMemberCount = reportDetail.atRiskMemberDetails.length;
+      baseReport = { ...baseReport, ...this._getAtRiskData(baseReport, newCipherReport) };
     }
 
-    reportDetail.memberCount = reportDetail.memberDetails.length;
+    baseReport.memberCount = baseReport.memberDetails.length;
+    baseReport.atRiskMemberCount = baseReport.atRiskMemberDetails.length;
 
-    return reportDetail;
+    return baseReport;
   }
-
-  /**
-   * Get a distinct array of members from a combined list. Input list may contain
-   * duplicate members.
-   * @param orgMembers Input list of members
-   * @returns Distinct array of members
-   */
-  private getUniqueMembers(orgMembers: MemberDetailsFlat[]): MemberDetailsFlat[] {
-    const existingEmails = new Set<string>();
-    const distinctUsers = orgMembers.filter((member) => {
-      if (existingEmails.has(member.email)) {
-        return false;
-      }
-      existingEmails.add(member.email);
-      return true;
-    });
-    return distinctUsers;
-  }
-
-  private getFlattenedCipherDetails(
-    detail: CipherHealthReportDetail,
-    uri: string,
-  ): CipherHealthReportUriDetail {
+  private _createNewReport(
+    application: string,
+    cipherReport: CipherHealthReport,
+  ): ApplicationHealthReportDetail {
     return {
-      cipherId: detail.id,
-      reusedPasswordCount: detail.reusedPasswordCount,
-      weakPasswordDetail: detail.weakPasswordDetail,
-      exposedPasswordDetail: detail.exposedPasswordDetail,
-      cipherMembers: detail.cipherMembers,
-      trimmedUri: uri,
-      cipher: detail as CipherView,
+      applicationName: application,
+      cipherIds: [cipherReport.cipher.id],
+      passwordCount: 1,
+      memberDetails: [...cipherReport.cipherMembers],
+      memberCount: cipherReport.cipherMembers.length,
+      atRiskCipherIds: [],
+      atRiskMemberCount: 0,
+      atRiskMemberDetails: [],
+      atRiskPasswordCount: 0,
     };
   }
 
-  private getMemberDetailsFlat(
-    userGuid: string,
-    userName: string,
-    email: string,
-    cipherId: string,
-  ): MemberDetailsFlat {
+  private _updateExistingReport(
+    existingReport: ApplicationHealthReportDetail,
+    newCipherReport: CipherHealthReport,
+  ): ApplicationHealthReportDetail {
     return {
-      userGuid: userGuid,
-      userName: userName,
-      email: email,
-      cipherId: cipherId,
+      ...existingReport,
+      passwordCount: existingReport.passwordCount + 1,
+      memberDetails: getUniqueMembers(
+        existingReport.memberDetails.concat(newCipherReport.cipherMembers),
+      ),
+      cipherIds: existingReport.cipherIds.concat(newCipherReport.cipher.id),
     };
   }
 
-  /**
-   * Trim the cipher uris down to get the password health application.
-   * The uri should only exist once after being trimmed. No duplication.
-   * Example:
-   *   - Untrimmed Uris: https://gmail.com, gmail.com/login
-   *   - Both would trim to gmail.com
-   *   - The cipher trimmed uri list should only return on instance in the list
-   * @param cipher
-   * @returns distinct list of trimmed cipher uris
-   */
-  private getTrimmedCipherUris(cipher: CipherView): string[] {
-    const cipherUris: string[] = [];
-    const uris = cipher.login?.uris ?? [];
-    uris.map((u: { uri: string }) => {
-      const uri = Utils.getDomain(u.uri) ?? u.uri;
-      if (!cipherUris.includes(uri)) {
-        cipherUris.push(uri);
-      }
-    });
-    return cipherUris;
+  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,
+    };
   }
 
-  private isUserNameNotEmpty(c: CipherView): boolean {
-    return !Utils.isNullOrWhitespace(c.login.username);
+  // TODO Move to health service
+  private _isPasswordAtRisk(healthData: PasswordHealthData): boolean {
+    return !!(
+      healthData.exposedPasswordDetail ||
+      healthData.weakPasswordDetail ||
+      healthData.reusedPasswordCount > 1
+    );
   }
-
   /**
-   * Validates that the cipher is a login item, has a password
-   * is not deleted, and the user can view the password
-   * @param c the input cipher
+   * 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 validateCipher(c: CipherView): boolean {
-    const { type, login, isDeleted, viewPassword } = c;
-    if (
-      type !== CipherType.Login ||
-      login.password == null ||
-      login.password === "" ||
-      isDeleted ||
-      !viewPassword
-    ) {
-      return false;
-    }
-    return true;
+  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/security-tasks-api.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/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/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/security-tasks-api.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/security-tasks-api.service.ts
new file mode 100644
index 00000000000..92bb9207453
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/security-tasks-api.service.ts
@@ -0,0 +1,25 @@
+import { from, Observable } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+
+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>);
+  }
+}
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html
index fb17989aa57..cb4632ef548 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html
@@ -103,7 +103,7 @@
 <bit-no-items
   class="tw-text-main"
   *ngIf="!loading && tableDataSource.data.length == 0"
-  [icon]="Devices"
+  [icon]="DevicesIcon"
 >
   <ng-container slot="title">{{ "noDeviceRequests" | i18n }}</ng-container>
   <ng-container slot="description">{{ "noDeviceRequestsDesc" | i18n }}</ng-container>
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 bd62d972500..258a112e234 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
@@ -6,7 +6,7 @@ import { BehaviorSubject, Subject, switchMap, takeUntil, tap } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
 import { SafeProvider, safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
-import { Devices } from "@bitwarden/assets/svg";
+import { DevicesIcon } from "@bitwarden/assets/svg";
 import { OrganizationAuthRequestApiService } from "@bitwarden/bit-common/admin-console/auth-requests/organization-auth-request-api.service";
 import { OrganizationAuthRequestService } from "@bitwarden/bit-common/admin-console/auth-requests/organization-auth-request.service";
 import { PendingAuthRequestWithFingerprintView } from "@bitwarden/bit-common/admin-console/auth-requests/pending-auth-request-with-fingerprint.view";
@@ -51,7 +51,7 @@ export class DeviceApprovalsComponent implements OnInit, OnDestroy {
   loading = true;
   actionInProgress = false;
 
-  protected readonly Devices = Devices;
+  protected readonly DevicesIcon = DevicesIcon;
 
   private destroy$ = new Subject<void>();
   private refresh$ = new BehaviorSubject<void>(null);
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html
index 20afe902b73..0b2bb4803fc 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html
@@ -103,21 +103,13 @@
       class="tw-mt-6 tw-flex tw-flex-col tw-items-center tw-justify-center"
       *ngIf="orgDomains?.length == 0"
     >
-      <img src="../../images/domain-verification/domain.svg" class="tw-mb-4" alt="" />
-
-      <div class="tw-mb-2 tw-flex tw-flex-row tw-justify-center">
-        <span class="tw-text-lg tw-font-bold">{{ "noDomains" | i18n }}</span>
-      </div>
-
-      <div class="tw-mb-4 tw-flex tw-flex-row tw-justify-center">
-        <span>
-          {{ "noDomainsSubText" | i18n }}
-        </span>
-      </div>
-
-      <button type="button" buttonType="secondary" bitButton (click)="addDomain()">
-        <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i> {{ "newDomain" | i18n }}
-      </button>
+      <bit-no-items [icon]="domainIcon">
+        <div slot="title">{{ "noDomains" | i18n }}</div>
+        <div slot="description">{{ "noDomainsSubText" | i18n }}</div>
+        <button slot="button" type="button" buttonType="secondary" bitButton (click)="addDomain()">
+          <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i> {{ "newDomain" | i18n }}
+        </button>
+      </bit-no-items>
     </div>
   </ng-container>
 </ng-container>
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 1f644f55a9f..3bc916d3fc5 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
@@ -13,6 +13,7 @@ import {
   takeUntil,
 } from "rxjs";
 
+import { DomainIcon } from "@bitwarden/assets/svg";
 import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction";
 import { OrgDomainServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain.service.abstraction";
 import { OrganizationDomainResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/organization-domain.response";
@@ -40,6 +41,7 @@ import {
 export class DomainVerificationComponent implements OnInit, OnDestroy {
   private componentDestroyed$ = new Subject<void>();
   private singleOrgPolicyEnabled = false;
+  protected domainIcon = DomainIcon;
 
   loading = true;
 
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 35659d05dce..0ee78e59312 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
@@ -85,6 +85,14 @@ const routes: Routes = [
             (m) => m.AccessIntelligenceModule,
           ),
       },
+      {
+        path: "integrations",
+        canActivate: [organizationPermissionsGuard((org) => org.canAccessIntegrations)],
+        loadChildren: () =>
+          import("../../dirt/organization-integrations/organization-integrations.module").then(
+            (m) => m.OrganizationIntegrationsModule,
+          ),
+      },
     ],
   },
 ];
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/index.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/index.ts
new file mode 100644
index 00000000000..c2cd83f838c
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/index.ts
@@ -0,0 +1 @@
+export { bitPolicyEditRegister } from "./policy-edit-register";
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.html b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/activate-autofill.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.html
rename to bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/activate-autofill.component.html
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/activate-autofill.component.ts
similarity index 71%
rename from bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.ts
rename to bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/activate-autofill.component.ts
index 821509b43e2..17efc017136 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/activate-autofill.component.ts
@@ -5,11 +5,12 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import {
-  BasePolicy,
-  BasePolicyComponent,
-} from "@bitwarden/web-vault/app/admin-console/organizations/policies/base-policy.component";
+  BasePolicyEditDefinition,
+  BasePolicyEditComponent,
+} from "@bitwarden/web-vault/app/admin-console/organizations/policies";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
-export class ActivateAutofillPolicy extends BasePolicy {
+export class ActivateAutofillPolicy extends BasePolicyEditDefinition {
   name = "activateAutofill";
   description = "activateAutofillPolicyDesc";
   type = PolicyType.ActivateAutofill;
@@ -21,8 +22,7 @@ export class ActivateAutofillPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-activate-autofill",
   templateUrl: "activate-autofill.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class ActivateAutofillPolicyComponent extends BasePolicyComponent {}
+export class ActivateAutofillPolicyComponent extends BasePolicyEditComponent {}
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/automatic-app-login.component.html b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/automatic-app-login.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/admin-console/policies/automatic-app-login.component.html
rename to bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/automatic-app-login.component.html
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/automatic-app-login.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/automatic-app-login.component.ts
similarity index 76%
rename from bitwarden_license/bit-web/src/app/admin-console/policies/automatic-app-login.component.ts
rename to bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/automatic-app-login.component.ts
index 1a478fb4393..7dadc04c6f4 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/automatic-app-login.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/automatic-app-login.component.ts
@@ -5,11 +5,12 @@ import { FormBuilder, FormControl } from "@angular/forms";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import {
-  BasePolicy,
-  BasePolicyComponent,
-} from "@bitwarden/web-vault/app/admin-console/organizations/policies/base-policy.component";
+  BasePolicyEditDefinition,
+  BasePolicyEditComponent,
+} from "@bitwarden/web-vault/app/admin-console/organizations/policies";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
-export class AutomaticAppLoginPolicy extends BasePolicy {
+export class AutomaticAppLoginPolicy extends BasePolicyEditDefinition {
   name = "automaticAppLogin";
   description = "automaticAppLoginDesc";
   type = PolicyType.AutomaticAppLogIn;
@@ -17,11 +18,10 @@ export class AutomaticAppLoginPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-automatic-app-login",
   templateUrl: "automatic-app-login.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class AutomaticAppLoginPolicyComponent extends BasePolicyComponent {
+export class AutomaticAppLoginPolicyComponent extends BasePolicyEditComponent {
   data = this.formBuilder.group({
     idpHost: new FormControl<string>(null),
   });
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/disable-personal-vault-export.component.html b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/disable-personal-vault-export.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/admin-console/policies/disable-personal-vault-export.component.html
rename to bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/disable-personal-vault-export.component.html
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/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
similarity index 75%
rename from bitwarden_license/bit-web/src/app/admin-console/policies/disable-personal-vault-export.component.ts
rename to bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/disable-personal-vault-export.component.ts
index c274e58ccac..d93fb50b0e2 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/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
@@ -2,11 +2,12 @@ import { Component } from "@angular/core";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import {
-  BasePolicy,
-  BasePolicyComponent,
-} from "@bitwarden/web-vault/app/admin-console/organizations/policies/base-policy.component";
+  BasePolicyEditDefinition,
+  BasePolicyEditComponent,
+} from "@bitwarden/web-vault/app/admin-console/organizations/policies";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
-export class DisablePersonalVaultExportPolicy extends BasePolicy {
+export class DisablePersonalVaultExportPolicy extends BasePolicyEditDefinition {
   name = "disablePersonalVaultExport";
   description = "disablePersonalVaultExportDescription";
   type = PolicyType.DisablePersonalVaultExport;
@@ -14,8 +15,7 @@ export class DisablePersonalVaultExportPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-disable-personal-vault-export",
   templateUrl: "disable-personal-vault-export.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class DisablePersonalVaultExportPolicyComponent extends BasePolicyComponent {}
+export class DisablePersonalVaultExportPolicyComponent extends BasePolicyEditComponent {}
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
new file mode 100644
index 00000000000..8c4be2eeea1
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/index.ts
@@ -0,0 +1,4 @@
+export { ActivateAutofillPolicy } from "./activate-autofill.component";
+export { AutomaticAppLoginPolicy } from "./automatic-app-login.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/maximum-vault-timeout.component.html b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/maximum-vault-timeout.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.html
rename to bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/maximum-vault-timeout.component.html
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/maximum-vault-timeout.component.ts
similarity index 90%
rename from bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.ts
rename to bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/maximum-vault-timeout.component.ts
index a5b9ad47f6e..160ce9aeb20 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/maximum-vault-timeout.component.ts
@@ -8,11 +8,12 @@ import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/po
 import { VaultTimeoutAction } from "@bitwarden/common/key-management/vault-timeout";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import {
-  BasePolicy,
-  BasePolicyComponent,
-} from "@bitwarden/web-vault/app/admin-console/organizations/policies/base-policy.component";
+  BasePolicyEditDefinition,
+  BasePolicyEditComponent,
+} from "@bitwarden/web-vault/app/admin-console/organizations/policies";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
-export class MaximumVaultTimeoutPolicy extends BasePolicy {
+export class MaximumVaultTimeoutPolicy extends BasePolicyEditDefinition {
   name = "maximumVaultTimeout";
   description = "maximumVaultTimeoutDesc";
   type = PolicyType.MaximumVaultTimeout;
@@ -20,11 +21,10 @@ export class MaximumVaultTimeoutPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-maximum-timeout",
   templateUrl: "maximum-vault-timeout.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class MaximumVaultTimeoutPolicyComponent extends BasePolicyComponent {
+export class MaximumVaultTimeoutPolicyComponent extends BasePolicyEditComponent {
   vaultTimeoutActionOptions: { name: string; value: string }[];
   data = this.formBuilder.group({
     hours: new FormControl<number>(null),
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
new file mode 100644
index 00000000000..3438e706f10
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-register.ts
@@ -0,0 +1,28 @@
+import {
+  ossPolicyEditRegister,
+  BasePolicyEditDefinition,
+} from "@bitwarden/web-vault/app/admin-console/organizations/policies";
+
+import { FreeFamiliesSponsorshipPolicy } from "../../billing/policies/free-families-sponsorship.component";
+
+import {
+  ActivateAutofillPolicy,
+  AutomaticAppLoginPolicy,
+  DisablePersonalVaultExportPolicy,
+  MaximumVaultTimeoutPolicy,
+} from "./policy-edit-definitions";
+
+/**
+ * The policy register for Bitwarden Licensed policies.
+ * Add your policy definition here if it is under the Bitwarden License.
+ * It will not appear in the web vault when running in OSS mode.
+ */
+const policyEditRegister: BasePolicyEditDefinition[] = [
+  new MaximumVaultTimeoutPolicy(),
+  new DisablePersonalVaultExportPolicy(),
+  new FreeFamiliesSponsorshipPolicy(),
+  new ActivateAutofillPolicy(),
+  new AutomaticAppLoginPolicy(),
+];
+
+export const bitPolicyEditRegister = ossPolicyEditRegister.concat(policyEditRegister);
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
index 0fa39f2f292..82e412c2ef6 100644
--- 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
@@ -11,7 +11,14 @@
             {{ o.name }}
           </td>
           <td bitCell>
-            <button type="button" bitButton [bitAction]="add(o)" class="tw-float-right">Add</button>
+            <button
+              type="button"
+              bitButton
+              [bitAction]="add(o, provider$ | async)"
+              class="tw-float-right"
+            >
+              Add
+            </button>
           </td>
         </tr>
       </ng-template>
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
index 51296c52281..4f4b85e544b 100644
--- 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
@@ -1,10 +1,13 @@
 // 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";
@@ -22,7 +25,7 @@ interface AddOrganizationDialogData {
   standalone: false,
 })
 export class AddOrganizationComponent implements OnInit {
-  protected provider: Provider;
+  protected provider$: Observable<Provider>;
   protected loading = true;
 
   constructor(
@@ -35,6 +38,7 @@ export class AddOrganizationComponent implements OnInit {
     private validationService: ValidationService,
     private dialogService: DialogService,
     private toastService: ToastService,
+    private accountService: AccountService,
   ) {}
 
   async ngOnInit() {
@@ -46,18 +50,21 @@ export class AddOrganizationComponent implements OnInit {
       return;
     }
 
-    this.provider = await this.providerService.get(this.data.providerId);
+    this.provider$ = this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) => this.providerService.get$(this.data.providerId, userId)),
+    );
 
     this.loading = false;
   }
 
-  add(organization: Organization) {
+  add(organization: Organization, provider: Provider) {
     return async () => {
       const confirmed = await this.dialogService.openSimpleDialog({
         title: organization.name,
         content: {
           key: "addOrganizationConfirmation",
-          placeholders: [organization.name, this.provider.name],
+          placeholders: [organization.name, provider.name],
         },
         type: "warning",
       });
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
index 325301f6001..6d0b52b05d6 100644
--- 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
@@ -3,7 +3,7 @@ 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 { firstValueFrom, from, map, Observable, switchMap } from "rxjs";
+import { combineLatest, firstValueFrom, from, map, Observable, switchMap } from "rxjs";
 import { debounceTime, first } from "rxjs/operators";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
@@ -65,9 +65,10 @@ export class ClientsComponent {
     this.activatedRoute.parent?.params.pipe(map((params) => params.providerId as string)) ??
     new Observable();
 
-  protected provider$ = this.providerId$.pipe(
-    switchMap((providerId) => this.providerService.get$(providerId)),
-  );
+  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(
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts
index 086be39b754..a0a881dbad7 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts
@@ -3,12 +3,16 @@
 import { TestBed } from "@angular/core/testing";
 import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from "@angular/router";
 import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
 
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { ProviderUserType } 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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { UserId } from "@bitwarden/common/types/guid";
 import { ToastService } from "@bitwarden/components";
+import { newGuid } from "@bitwarden/guid";
 
 import { providerPermissionsGuard } from "./provider-permissions.guard";
 
@@ -25,11 +29,23 @@ const providerFactory = (props: Partial<Provider> = {}) =>
 
 describe("Provider Permissions Guard", () => {
   let providerService: MockProxy<ProviderService>;
+  let accountService: MockProxy<AccountService>;
   let route: MockProxy<ActivatedRouteSnapshot>;
   let state: MockProxy<RouterStateSnapshot>;
 
+  const mockUserId = newGuid() as UserId;
+
   beforeEach(() => {
     providerService = mock<ProviderService>();
+    accountService = mock<AccountService>();
+
+    accountService.activeAccount$ = of({
+      id: mockUserId,
+      email: "test@example.com",
+      emailVerified: true,
+      name: "Test User",
+    });
+
     route = mock<ActivatedRouteSnapshot>({
       params: {
         providerId: providerFactory().id,
@@ -44,12 +60,15 @@ describe("Provider Permissions Guard", () => {
         { provide: ToastService, useValue: mock<ToastService>() },
         { provide: I18nService, useValue: mock<I18nService>() },
         { provide: Router, useValue: mock<Router>() },
+        { provide: AccountService, useValue: accountService },
       ],
     });
   });
 
   it("blocks navigation if provider does not exist", async () => {
-    providerService.get.mockResolvedValue(null);
+    providerService.get$
+      .calledWith(providerFactory().id, mockUserId)
+      .mockReturnValue(of(undefined));
 
     const actual = await TestBed.runInInjectionContext(
       async () => await providerPermissionsGuard()(route, state),
@@ -60,7 +79,7 @@ describe("Provider Permissions Guard", () => {
 
   it("permits navigation if no permissions are specified", async () => {
     const provider = providerFactory();
-    providerService.get.calledWith(provider.id).mockResolvedValue(provider);
+    providerService.get$.calledWith(provider.id, mockUserId).mockReturnValue(of(provider));
 
     const actual = await TestBed.runInInjectionContext(
       async () => await providerPermissionsGuard()(route, state),
@@ -74,7 +93,7 @@ describe("Provider Permissions Guard", () => {
     permissionsCallback.mockImplementation((_provider) => true);
 
     const provider = providerFactory();
-    providerService.get.calledWith(provider.id).mockResolvedValue(provider);
+    providerService.get$.calledWith(provider.id, mockUserId).mockReturnValue(of(provider));
 
     const actual = await TestBed.runInInjectionContext(
       async () => await providerPermissionsGuard(permissionsCallback)(route, state),
@@ -88,7 +107,7 @@ describe("Provider Permissions Guard", () => {
     const permissionsCallback = jest.fn();
     permissionsCallback.mockImplementation((_org) => false);
     const provider = providerFactory();
-    providerService.get.calledWith(provider.id).mockResolvedValue(provider);
+    providerService.get$.calledWith(provider.id, mockUserId).mockReturnValue(of(provider));
 
     const actual = await TestBed.runInInjectionContext(
       async () => await providerPermissionsGuard(permissionsCallback)(route, state),
@@ -104,7 +123,7 @@ describe("Provider Permissions Guard", () => {
         type: ProviderUserType.ServiceUser,
         enabled: false,
       });
-      providerService.get.calledWith(org.id).mockResolvedValue(org);
+      providerService.get$.calledWith(org.id, mockUserId).mockReturnValue(of(org));
 
       const actual = await TestBed.runInInjectionContext(
         async () => await providerPermissionsGuard()(route, state),
@@ -118,7 +137,7 @@ describe("Provider Permissions Guard", () => {
         type: ProviderUserType.ProviderAdmin,
         enabled: false,
       });
-      providerService.get.calledWith(org.id).mockResolvedValue(org);
+      providerService.get$.calledWith(org.id, mockUserId).mockReturnValue(of(org));
 
       const actual = await TestBed.runInInjectionContext(
         async () => await providerPermissionsGuard()(route, state),
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts
index 6146e990972..7971ab9a99e 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts
@@ -7,9 +7,12 @@ import {
   Router,
   RouterStateSnapshot,
 } from "@angular/router";
+import { firstValueFrom, switchMap } from "rxjs";
 
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 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 { ToastService } from "@bitwarden/components";
 
@@ -40,8 +43,14 @@ export function providerPermissionsGuard(
     const router = inject(Router);
     const i18nService = inject(I18nService);
     const toastService = inject(ToastService);
+    const accountService = inject(AccountService);
 
-    const provider = await providerService.get(route.params.providerId);
+    const provider = await firstValueFrom(
+      accountService.activeAccount$.pipe(
+        getUserId,
+        switchMap((userId) => providerService.get$(route.params.providerId, userId)),
+      ),
+    );
     if (provider == null) {
       return router.createUrlTree(["/"]);
     }
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 d8ad2e01343..43fc958585a 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
@@ -2,12 +2,14 @@
 // @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
+import { firstValueFrom, switchMap } from "rxjs";
 
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { EventResponse } from "@bitwarden/common/models/response/event.response";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -64,7 +66,13 @@ export class EventsComponent extends BaseEventsComponent implements OnInit {
     // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
     this.route.parent.parent.params.subscribe(async (params) => {
       this.providerId = params.providerId;
-      const provider = await this.providerService.get(this.providerId);
+      const provider = await firstValueFrom(
+        this.accountService.activeAccount$.pipe(
+          getUserId,
+          switchMap((userId) => this.providerService.get$(this.providerId, userId)),
+        ),
+      );
+
       if (provider == null || !provider.useEvents) {
         // 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
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 b4433f84fe5..affcfce9c17 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
@@ -3,7 +3,7 @@
 import { Component } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ActivatedRoute, Router } from "@angular/router";
-import { combineLatest, lastValueFrom, switchMap } from "rxjs";
+import { combineLatest, firstValueFrom, lastValueFrom, switchMap } from "rxjs";
 import { first } from "rxjs/operators";
 
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
@@ -14,6 +14,8 @@ import { ProviderUserStatusType, ProviderUserType } from "@bitwarden/common/admi
 import { ProviderUserBulkRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk.request";
 import { ProviderUserConfirmRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-confirm.request";
 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 { 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";
@@ -73,6 +75,7 @@ export class MembersComponent extends BaseMembersComponent<ProviderUser> {
     private activatedRoute: ActivatedRoute,
     private providerService: ProviderService,
     private router: Router,
+    private accountService: AccountService,
   ) {
     super(
       apiService,
@@ -96,7 +99,13 @@ export class MembersComponent extends BaseMembersComponent<ProviderUser> {
           this.dataSource.filter = peopleFilter(queryParams.search, null);
 
           this.providerId = urlParams.providerId;
-          const provider = await this.providerService.get(this.providerId);
+          const provider = await firstValueFrom(
+            this.accountService.activeAccount$.pipe(
+              getUserId,
+              switchMap((userId) => this.providerService.get$(this.providerId, userId)),
+            ),
+          );
+
           if (!provider || !provider.canManageUsers) {
             return await this.router.navigate(["../"], { relativeTo: this.activatedRoute });
           }
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..724e5891dc8 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
@@ -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 159a0105df9..59266d6b4be 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
@@ -11,6 +11,8 @@ import { BusinessUnitPortalLogo, Icon, ProviderPortalLogo } from "@bitwarden/ass
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { ProviderStatusType, ProviderType } from "@bitwarden/common/admin-console/enums";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
+import { 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 { IconModule } from "@bitwarden/components";
@@ -45,7 +47,6 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
   protected canAccessBilling$: Observable<boolean>;
 
   protected clientsTranslationKey$: Observable<string>;
-  protected managePaymentDetailsOutsideCheckout$: Observable<boolean>;
   protected providerPortalTakeover$: Observable<boolean>;
 
   protected subscriber$: Observable<NonIndividualSubscriber>;
@@ -56,6 +57,7 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
     private providerService: ProviderService,
     private configService: ConfigService,
     private providerWarningsService: ProviderWarningsService,
+    private accountService: AccountService,
   ) {}
 
   ngOnInit() {
@@ -65,8 +67,11 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
       map((params) => params.providerId),
     );
 
-    this.provider$ = providerId$.pipe(
-      switchMap((providerId) => this.providerService.get$(providerId)),
+    this.provider$ = combineLatest([
+      providerId$,
+      this.accountService.activeAccount$.pipe(getUserId),
+    ]).pipe(
+      switchMap(([providerId, userId]) => this.providerService.get$(providerId, userId)),
       takeUntil(this.destroy$),
     );
 
@@ -94,10 +99,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.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.component.html
index 1c8c12a1fe1..eec6f713903 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.component.html
@@ -1,3 +1,4 @@
+@let providers = providers$ | async;
 <app-header></app-header>
 
 <bit-container>
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 f3d67abd4e1..d13ac863437 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
@@ -1,9 +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 { map, Observable, switchMap, tap } from "rxjs";
 
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 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 { Utils } from "@bitwarden/common/platform/misc/utils";
 
@@ -13,24 +16,27 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
   standalone: false,
 })
 export class ProvidersComponent implements OnInit {
-  providers: Provider[];
+  providers$: Observable<Provider[]>;
   loaded = false;
   actionPromise: Promise<any>;
 
   constructor(
     private providerService: ProviderService,
     private i18nService: I18nService,
+    private accountService: AccountService,
   ) {}
 
-  async ngOnInit() {
+  ngOnInit() {
     document.body.classList.remove("layout_frontend");
-    await this.load();
+    this.load();
   }
 
-  async load() {
-    const providers = await this.providerService.getAll();
-    providers.sort(Utils.getSortFunction(this.i18nService, "name"));
-    this.providers = providers;
-    this.loaded = true;
+  load() {
+    this.providers$ = this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) => this.providerService.providers$(userId)),
+      map((p) => p.sort(Utils.getSortFunction(this.i18nService, "name"))),
+      tap(() => (this.loaded = true)),
+    );
   }
 }
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..24e8a757bdf 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,14 +7,18 @@ 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,
+  InvoicesComponent,
   ManageClientNameDialogComponent,
   ManageClientSubscriptionDialogComponent,
+  NoInvoicesComponent,
   ProviderBillingHistoryComponent,
   ProviderSubscriptionComponent,
   ProviderSubscriptionStatusComponent,
@@ -52,11 +56,11 @@ import { VerifyRecoverDeleteProviderComponent } from "./verify-recover-delete-pr
     ProvidersLayoutComponent,
     DangerZoneComponent,
     ScrollingModule,
-    VerifyBankAccountComponent,
     CardComponent,
     ScrollLayoutDirective,
-    PaymentComponent,
     ProviderWarningsModule,
+    EnterPaymentMethodComponent,
+    EnterBillingAddressComponent,
   ],
   declarations: [
     AcceptProviderComponent,
@@ -72,8 +76,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/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..0fa69c7a0e6 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,25 +1,24 @@
-// 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";
 
 @Component({
   selector: "provider-setup",
@@ -27,16 +26,17 @@ import { PaymentComponent } from "@bitwarden/web-vault/app/billing/shared/paymen
   standalone: false,
 })
 export class SetupComponent implements OnInit, OnDestroy {
-  @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
-  @ViewChild(ManageTaxInformationComponent) taxInformationComponent: ManageTaxInformationComponent;
+  @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 +69,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 +95,7 @@ export class SetupComponent implements OnInit, OnDestroy {
                 replaceUrl: true,
               });
             }
+
             this.loading = false;
           } catch (error) {
             this.validationService.showError(error);
@@ -115,10 +116,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 +124,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 +149,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/app.component.ts b/bitwarden_license/bit-web/src/app/app.component.ts
index ca6a5ea8f62..abfb79b8f18 100644
--- a/bitwarden_license/bit-web/src/app/app.component.ts
+++ b/bitwarden_license/bit-web/src/app/app.component.ts
@@ -1,31 +1,10 @@
-import { Component, OnInit } from "@angular/core";
+import { Component } from "@angular/core";
 
 import { AppComponent as BaseAppComponent } from "@bitwarden/web-vault/app/app.component";
 
-import { ActivateAutofillPolicy } from "./admin-console/policies/activate-autofill.component";
-import { AutomaticAppLoginPolicy } from "./admin-console/policies/automatic-app-login.component";
-import { DisablePersonalVaultExportPolicy } from "./admin-console/policies/disable-personal-vault-export.component";
-import { MaximumVaultTimeoutPolicy } from "./admin-console/policies/maximum-vault-timeout.component";
-import { FreeFamiliesSponsorshipPolicy } from "./billing/policies/free-families-sponsorship.component";
-
 @Component({
   selector: "app-root",
   templateUrl: "../../../../apps/web/src/app/app.component.html",
   standalone: false,
 })
-export class AppComponent extends BaseAppComponent implements OnInit {
-  ngOnInit() {
-    super.ngOnInit();
-
-    this.policyListService.addPolicies([
-      new MaximumVaultTimeoutPolicy(),
-      new DisablePersonalVaultExportPolicy(),
-      new FreeFamiliesSponsorshipPolicy(),
-      new ActivateAutofillPolicy(),
-    ]);
-
-    if (!this.policyListService.getPolicies().some((p) => p instanceof AutomaticAppLoginPolicy)) {
-      this.policyListService.addPolicies([new AutomaticAppLoginPolicy()]);
-    }
-  }
-}
+export class AppComponent extends BaseAppComponent {}
diff --git a/bitwarden_license/bit-web/src/app/app.module.ts b/bitwarden_license/bit-web/src/app/app.module.ts
index b665dee3b17..e9696a4549f 100644
--- a/bitwarden_license/bit-web/src/app/app.module.ts
+++ b/bitwarden_license/bit-web/src/app/app.module.ts
@@ -6,19 +6,17 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { RouterModule } from "@angular/router";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { safeProvider } from "@bitwarden/ui-common";
+import { POLICY_EDIT_REGISTER } from "@bitwarden/web-vault/app/admin-console/organizations/policies";
 import { CoreModule } from "@bitwarden/web-vault/app/core";
 import { OssRoutingModule } from "@bitwarden/web-vault/app/oss-routing.module";
 import { OssModule } from "@bitwarden/web-vault/app/oss.module";
 import { WildcardRoutingModule } from "@bitwarden/web-vault/app/wildcard-routing.module";
 
 import { OrganizationsModule } from "./admin-console/organizations/organizations.module";
-import { ActivateAutofillPolicyComponent } from "./admin-console/policies/activate-autofill.component";
-import { AutomaticAppLoginPolicyComponent } from "./admin-console/policies/automatic-app-login.component";
-import { DisablePersonalVaultExportPolicyComponent } from "./admin-console/policies/disable-personal-vault-export.component";
-import { MaximumVaultTimeoutPolicyComponent } from "./admin-console/policies/maximum-vault-timeout.component";
+import { bitPolicyEditRegister } from "./admin-console/policies";
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
-import { FreeFamiliesSponsorshipPolicyComponent } from "./billing/policies/free-families-sponsorship.component";
 import { AccessIntelligenceModule } from "./dirt/access-intelligence/access-intelligence.module";
 
 /**
@@ -44,14 +42,13 @@ import { AccessIntelligenceModule } from "./dirt/access-intelligence/access-inte
     RouterModule,
     WildcardRoutingModule, // Needs to be last to catch all non-existing routes
   ],
-  declarations: [
-    AppComponent,
-    DisablePersonalVaultExportPolicyComponent,
-    MaximumVaultTimeoutPolicyComponent,
-    ActivateAutofillPolicyComponent,
-    AutomaticAppLoginPolicyComponent,
-    FreeFamiliesSponsorshipPolicyComponent,
-  ],
+  declarations: [AppComponent],
   bootstrap: [AppComponent],
+  providers: [
+    safeProvider({
+      provide: POLICY_EDIT_REGISTER,
+      useValue: bitPolicyEditRegister,
+    }),
+  ],
 })
 export class AppModule {}
diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
index ef8241b534c..6d2836ee0ba 100644
--- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
+++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
@@ -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>
 
@@ -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.component.ts
index 9baeaabb33f..f68e35bf240 100644
--- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts
+++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts
@@ -121,6 +121,8 @@ export class SsoComponent implements OnInit, OnDestroy {
   spMetadataUrl: string;
   spAcsUrl: string;
 
+  showClientSecret = false;
+
   protected openIdForm = this.formBuilder.group<ControlsOf<SsoConfigView["openId"]>>(
     {
       authority: new FormControl("", Validators.required),
@@ -156,7 +158,7 @@ export class SsoComponent implements OnInit, OnDestroy {
 
       idpEntityId: new FormControl("", Validators.required),
       idpBindingType: new FormControl(Saml2BindingType.HttpRedirect),
-      idpSingleSignOnServiceUrl: new FormControl(),
+      idpSingleSignOnServiceUrl: new FormControl("", Validators.required),
       idpSingleLogoutServiceUrl: new FormControl(),
       idpX509PublicCert: new FormControl("", Validators.required),
       idpOutboundSigningAlgorithm: new FormControl(defaultSigningAlgorithm),
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 dd808300988..db5ef3ba62f 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
@@ -2,11 +2,12 @@ import { Component } from "@angular/core";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import {
-  BasePolicy,
-  BasePolicyComponent,
-} from "@bitwarden/web-vault/app/admin-console/organizations/policies/base-policy.component";
+  BasePolicyEditDefinition,
+  BasePolicyEditComponent,
+} from "@bitwarden/web-vault/app/admin-console/organizations/policies";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
-export class FreeFamiliesSponsorshipPolicy extends BasePolicy {
+export class FreeFamiliesSponsorshipPolicy extends BasePolicyEditDefinition {
   name = "freeFamiliesSponsorship";
   description = "freeFamiliesSponsorshipPolicyDesc";
   type = PolicyType.FreeFamiliesSponsorshipPolicy;
@@ -14,8 +15,7 @@ export class FreeFamiliesSponsorshipPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-free-families-sponsorship",
   templateUrl: "free-families-sponsorship.component.html",
-  standalone: false,
+  imports: [SharedModule],
 })
-export class FreeFamiliesSponsorshipPolicyComponent extends BasePolicyComponent {}
+export class FreeFamiliesSponsorshipPolicyComponent extends BasePolicyEditComponent {}
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 100%
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
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/billing-history/no-invoices.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/billing-history/no-invoices.component.ts
new file mode 100644
index 00000000000..ded6bc79593
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/billing/providers/billing-history/no-invoices.component.ts
@@ -0,0 +1,14 @@
+import { Component } from "@angular/core";
+
+import { CreditCardIcon } from "@bitwarden/assets/svg";
+
+@Component({
+  selector: "app-no-invoices",
+  template: `<bit-no-items [icon]="icon">
+    <div slot="title">{{ "noInvoicesToList" | i18n }}</div>
+  </bit-no-items>`,
+  standalone: false,
+})
+export class NoInvoicesComponent {
+  icon = CreditCardIcon;
+}
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
index 27f45cb250e..9933c316869 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
@@ -21,6 +21,8 @@ import {
 } from "@bitwarden/common/admin-console/enums";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 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 { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -87,9 +89,10 @@ export class ManageClientsComponent {
     this.activatedRoute.parent?.params.pipe(map((params) => params.providerId as string)) ??
     new Observable();
 
-  protected provider$ = this.providerId$.pipe(
-    switchMap((providerId) => this.providerService.get$(providerId)),
-  );
+  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(
@@ -126,6 +129,7 @@ export class ManageClientsComponent {
     private webProviderService: WebProviderService,
     private billingNotificationService: BillingNotificationService,
     private configService: ConfigService,
+    private accountService: AccountService,
   ) {
     this.activatedRoute.queryParams.pipe(first(), takeUntilDestroyed()).subscribe((queryParams) => {
       this.searchControl.setValue(queryParams.search);
@@ -133,7 +137,7 @@ export class ManageClientsComponent {
 
     this.provider$
       .pipe(
-        map((provider: Provider) => {
+        map((provider: Provider | undefined) => {
           if (provider?.providerStatus !== ProviderStatusType.Billable) {
             return from(
               this.router.navigate(["../clients"], {
@@ -158,7 +162,8 @@ export class ManageClientsComponent {
   async load() {
     try {
       const providerId = await firstValueFrom(this.providerId$);
-      const provider = await firstValueFrom(this.providerService.get$(providerId));
+      const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+      const provider = await firstValueFrom(this.providerService.get$(providerId, userId));
       if (provider?.providerType === ProviderType.BusinessUnit) {
         this.pageTitle = this.i18nService.t("businessUnits");
         this.clientColumnHeader = this.i18nService.t("businessUnit");
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts
index 8ff5d070241..ed11eb8ef0a 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts
@@ -1,26 +1,29 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
 
 import { GearIcon } from "@bitwarden/assets/svg";
+import { NoItemsModule } from "@bitwarden/components";
 import { SharedOrganizationModule } from "@bitwarden/web-vault/app/admin-console/organizations/shared";
 
 @Component({
   selector: "app-no-clients",
-  imports: [SharedOrganizationModule],
-  template: `<div class="tw-flex tw-flex-col tw-items-center tw-text-info">
-    <bit-icon [icon]="icon"></bit-icon>
-    <p class="tw-mt-4">{{ "noClients" | i18n }}</p>
-    <a
-      *ngIf="showAddOrganizationButton"
-      [disabled]="disableAddOrganizationButton"
-      type="button"
-      bitButton
-      buttonType="primary"
-      (click)="addNewOrganization()"
-    >
-      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-      {{ "addNewOrganization" | i18n }}
-    </a>
-  </div>`,
+  imports: [SharedOrganizationModule, NoItemsModule],
+  template: `
+    <bit-no-items [icon]="icon">
+      <div slot="title">{{ "noClients" | i18n }}</div>
+      <a
+        *ngIf="showAddOrganizationButton"
+        [disabled]="disableAddOrganizationButton"
+        type="button"
+        bitButton
+        buttonType="primary"
+        (click)="addNewOrganization()"
+        slot="button"
+      >
+        <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
+        {{ "addNewOrganization" | i18n }}
+      </a>
+    </bit-no-items>
+  `,
 })
 export class NoClientsComponent {
   icon = GearIcon;
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
index 60dbf4b3b82..de13cca3ad4 100644
--- 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
@@ -4,11 +4,15 @@ 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 provider = await firstValueFrom(providerService.get$(route.params.providerId));
+  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]);
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/index.ts b/bitwarden_license/bit-web/src/app/billing/providers/index.ts
index b1294bc8047..3cd83e68990 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/index.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/index.ts
@@ -1,3 +1,5 @@
+export * from "./billing-history/invoices.component";
+export * from "./billing-history/no-invoices.component";
 export * from "./billing-history/provider-billing-history.component";
 export * from "./clients";
 export * from "./guards/has-consolidated-billing.guard";
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 05cf8f55858..5a070687de4 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;
@@ -83,23 +72,15 @@ const BANK_ACCOUNT_VERIFIED_COMMAND = new CommandDefinition<{
 export class ProviderPaymentDetailsComponent implements OnInit, OnDestroy {
   private viewState$ = new BehaviorSubject<View | null>(null);
 
-  private provider$ = this.activatedRoute.params.pipe(
-    switchMap(({ providerId }) => this.providerService.get$(providerId)),
+  private provider$ = combineLatest([
+    this.activatedRoute.params,
+    this.accountService.activeAccount$.pipe(getUserId),
+  ]).pipe(
+    switchMap(([{ providerId }, userId]) => this.providerService.get$(providerId, userId)),
+    filter((provider) => provider != null),
   );
 
   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(
@@ -127,14 +108,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(
@@ -154,7 +127,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/subscription/provider-subscription.component.html b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html
index 0205d2838d1..05eda7e7ea4 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
@@ -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..98aceb0f878 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,26 +2,14 @@
 // @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";
 
 @Component({
   selector: "app-provider-subscription",
@@ -36,18 +24,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 +36,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 +61,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 +105,7 @@ export class ProviderSubscriptionComponent implements OnInit, OnDestroy {
   }
 
   protected getBillingCadenceLabel(providerPlanResponse: ProviderPlanResponse): string {
-    if (providerPlanResponse == null || providerPlanResponse == undefined) {
+    if (providerPlanResponse == null) {
       return "month";
     }
 
@@ -174,27 +118,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.module.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence.module.ts
index 25baf2e0fed..01bf19f30a4 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,13 +3,21 @@ 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 { 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";
+import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/auth/abstractions/account.service";
+import { KeyGenerationService } from "@bitwarden/common/key-management/crypto";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength/password-strength.service.abstraction";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -26,17 +34,36 @@ import { RiskInsightsComponent } from "./risk-insights.component";
       deps: [ApiService],
     },
     {
-      provide: RiskInsightsReportService,
-      deps: [
-        PasswordStrengthServiceAbstraction,
-        AuditService,
-        CipherService,
-        MemberCipherDetailsApiService,
-      ],
+      provide: PasswordHealthService,
+      deps: [PasswordStrengthServiceAbstraction, AuditService],
     },
     {
+      provide: RiskInsightsApiService,
+      deps: [ApiService],
+    },
+    {
+      provide: RiskInsightsReportService,
+      deps: [
+        CipherService,
+        MemberCipherDetailsApiService,
+        RiskInsightsApiService,
+        RiskInsightsEncryptionService,
+        PasswordHealthService,
+      ],
+    },
+    safeProvider({
       provide: RiskInsightsDataService,
-      deps: [RiskInsightsReportService],
+      deps: [
+        AccountServiceAbstraction,
+        CriticalAppsService,
+        OrganizationService,
+        RiskInsightsReportService,
+      ],
+    }),
+    {
+      provide: RiskInsightsEncryptionService,
+      useClass: RiskInsightsEncryptionService,
+      deps: [KeyService, EncryptService, KeyGenerationService],
     },
     safeProvider({
       provide: CriticalAppsService,
@@ -48,6 +75,16 @@ import { RiskInsightsComponent } from "./risk-insights.component";
       useClass: CriticalAppsApiService,
       deps: [ApiService],
     }),
+    safeProvider({
+      provide: AllActivitiesService,
+      useClass: AllActivitiesService,
+      deps: [],
+    }),
+    safeProvider({
+      provide: SecurityTasksApiService,
+      useClass: SecurityTasksApiService,
+      deps: [ApiService],
+    }),
   ],
 })
 export class AccessIntelligenceModule {}
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
new file mode 100644
index 00000000000..17ae964dbed
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-card.component.html
@@ -0,0 +1,18 @@
+<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">
+    <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 (showNavigationLink) {
+    <div class="tw-flex tw-items-baseline tw-mt-4 tw-gap-2">
+      <p bitTypography="body1">
+        <a bitLink (click)="navigateToLink(navigationLink)" rel="noreferrer">
+          {{ navigationText }}
+        </a>
+      </p>
+    </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
new file mode 100644
index 00000000000..2dc7c6a9c79
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-card.component.ts
@@ -0,0 +1,51 @@
+import { CommonModule } from "@angular/common";
+import { Component, Input } from "@angular/core";
+import { Router } from "@angular/router";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { ButtonModule, LinkModule, TypographyModule } from "@bitwarden/components";
+
+@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
+   */
+  @Input() title: string = "";
+  /**
+   * 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 = "";
+
+  /**
+   * The link to navigate to for more information
+   */
+  @Input() navigationLink: string = "";
+
+  /**
+   * The text to display for the navigation link
+   */
+  @Input() navigationText: string = "";
+
+  /**
+   * Show Navigation link
+   */
+  @Input() showNavigationLink: boolean = false;
+
+  constructor(private router: Router) {}
+
+  navigateToLink = async (navigationLink: string) => {
+    await this.router.navigateByUrl(navigationLink);
+  };
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-cards/password-change-metric.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-cards/password-change-metric.component.html
new file mode 100644
index 00000000000..9b194954f0e
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-cards/password-change-metric.component.html
@@ -0,0 +1,75 @@
+<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>
+
+  @if (renderMode === renderModes.noCriticalApps) {
+    <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>
+  }
+
+  @if (renderMode === renderModes.criticalAppsWithAtRiskAppsAndNoTasks) {
+    <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: atRiskPasswordsCount }}</span>
+    </div>
+
+    <div class="tw-mt-4">
+      <button
+        bitButton
+        buttonType="secondary"
+        type="button"
+        [disabled]="!canAssignTasks"
+        (click)="assignTasks()"
+      >
+        <i class="bwi bwi-envelope tw-mr-2"></i>
+        {{ "assignTasks" | i18n }}
+      </button>
+    </div>
+  }
+
+  @if (renderMode === renderModes.criticalAppsWithAtRiskAppsAndTasks) {
+    <div class="tw-items-start tw-mb-2">
+      <span bitTypography="h3">{{ "percentageCompleted" | i18n: completedPercent }}</span>
+    </div>
+
+    <div class="tw-items-baseline tw-gap-2">
+      <span bitTypography="body2">{{
+        "securityTasksCompleted" | i18n: completedTasksCount : totalTasksCount
+      }}</span>
+    </div>
+
+    <div class="tw-mt-4">
+      <div class="tw-flex tw-justify-between">
+        <div bitTypography="body2">{{ completedTasksCount }}</div>
+        <div bitTypography="body2">{{ totalTasksCount }}</div>
+      </div>
+    </div>
+    <bit-progress
+      [showText]="false"
+      size="small"
+      bgColor="primary"
+      [barWidth]="completedPercent"
+      [ariaLabel]="'passwordChangeProgressBar' | i18n"
+    >
+    </bit-progress>
+
+    <!-- TODO: Implement reminder functionality -->
+    <!-- <div class="tw-items-start tw-mt-4 tw-gap-4">
+      <button bitButton type="button" buttonType="secondary">
+        <i class="bwi bwi-envelope" aria-hidden="true"></i>
+        {{ "sendReminders" | i18n }}
+      </button>
+    </div> -->
+  }
+</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-cards/password-change-metric.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-cards/password-change-metric.component.ts
new file mode 100644
index 00000000000..b7a36a79988
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-cards/password-change-metric.component.ts
@@ -0,0 +1,204 @@
+import { CommonModule } from "@angular/common";
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { Subject, switchMap, takeUntil, of, BehaviorSubject, combineLatest } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import {
+  AllActivitiesService,
+  LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher,
+  SecurityTasksApiService,
+  TaskMetrics,
+} 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 { SecurityTaskType } from "@bitwarden/common/vault/tasks";
+import {
+  ButtonModule,
+  ProgressModule,
+  ToastService,
+  TypographyModule,
+} from "@bitwarden/components";
+
+import { CreateTasksRequest } from "../../../vault/services/abstractions/admin-task.abstraction";
+import { DefaultAdminTaskService } from "../../../vault/services/default-admin-task.service";
+
+export const RenderMode = {
+  noCriticalApps: "noCriticalApps",
+  criticalAppsWithAtRiskAppsAndNoTasks: "criticalAppsWithAtRiskAppsAndNoTasks",
+  criticalAppsWithAtRiskAppsAndTasks: "criticalAppsWithAtRiskAppsAndTasks",
+} as const;
+export type RenderMode = (typeof RenderMode)[keyof typeof RenderMode];
+
+@Component({
+  selector: "dirt-password-change-metric",
+  imports: [CommonModule, TypographyModule, JslibModule, ProgressModule, ButtonModule],
+  templateUrl: "./password-change-metric.component.html",
+  providers: [DefaultAdminTaskService],
+})
+export class PasswordChangeMetricComponent implements OnInit {
+  protected taskMetrics$ = new BehaviorSubject<TaskMetrics>({ totalTasks: 0, completedTasks: 0 });
+  private completedTasks: number = 0;
+  private totalTasks: number = 0;
+  private allApplicationsDetails: LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher[] =
+    [];
+
+  atRiskAppsCount: number = 0;
+  atRiskPasswordsCount: number = 0;
+  private organizationId!: OrganizationId;
+  private destroyRef = new Subject<void>();
+  renderMode: RenderMode = "noCriticalApps";
+
+  async ngOnInit(): Promise<void> {
+    this.activatedRoute.paramMap
+      .pipe(
+        switchMap((paramMap) => {
+          const orgId = paramMap.get("organizationId");
+          if (orgId) {
+            this.organizationId = orgId as OrganizationId;
+            return this.securityTasksApiService.getTaskMetrics(this.organizationId);
+          }
+          return of({ totalTasks: 0, completedTasks: 0 });
+        }),
+        takeUntil(this.destroyRef),
+      )
+      .subscribe((metrics) => {
+        this.taskMetrics$.next(metrics);
+      });
+
+    combineLatest([
+      this.taskMetrics$,
+      this.allActivitiesService.reportSummary$,
+      this.allActivitiesService.atRiskPasswordsCount$,
+      this.allActivitiesService.allApplicationsDetails$,
+    ])
+      .pipe(takeUntil(this.destroyRef))
+      .subscribe(([taskMetrics, summary, atRiskPasswordsCount, allApplicationsDetails]) => {
+        this.atRiskAppsCount = summary.totalCriticalAtRiskApplicationCount;
+        this.atRiskPasswordsCount = atRiskPasswordsCount;
+        this.completedTasks = taskMetrics.completedTasks;
+        this.totalTasks = taskMetrics.totalTasks;
+        this.allApplicationsDetails = allApplicationsDetails;
+
+        // No critical apps setup
+        this.renderMode =
+          summary.totalCriticalApplicationCount === 0 ? RenderMode.noCriticalApps : this.renderMode;
+
+        // Critical apps setup with at-risk apps but no tasks
+        this.renderMode =
+          summary.totalCriticalApplicationCount > 0 &&
+          summary.totalCriticalAtRiskApplicationCount >= 0 &&
+          taskMetrics.totalTasks === 0
+            ? RenderMode.criticalAppsWithAtRiskAppsAndNoTasks
+            : this.renderMode;
+
+        // Critical apps setup with at-risk apps and tasks
+        this.renderMode =
+          summary.totalAtRiskApplicationCount > 0 &&
+          summary.totalCriticalAtRiskApplicationCount >= 0 &&
+          taskMetrics.totalTasks > 0
+            ? RenderMode.criticalAppsWithAtRiskAppsAndTasks
+            : this.renderMode;
+
+        this.allActivitiesService.setPasswordChangeProgressMetricHasProgressBar(
+          this.renderMode === RenderMode.criticalAppsWithAtRiskAppsAndTasks,
+        );
+      });
+  }
+
+  constructor(
+    private activatedRoute: ActivatedRoute,
+    private securityTasksApiService: SecurityTasksApiService,
+    private allActivitiesService: AllActivitiesService,
+    private adminTaskService: DefaultAdminTaskService,
+    protected toastService: ToastService,
+    protected i18nService: I18nService,
+  ) {}
+
+  get completedPercent(): number {
+    if (this.totalTasks === 0) {
+      return 0;
+    }
+    return Math.round((this.completedTasks / this.totalTasks) * 100);
+  }
+
+  get completedTasksCount(): number {
+    switch (this.renderMode) {
+      case RenderMode.noCriticalApps:
+      case RenderMode.criticalAppsWithAtRiskAppsAndNoTasks:
+        return 0;
+
+      case RenderMode.criticalAppsWithAtRiskAppsAndTasks:
+        return this.completedTasks;
+
+      default:
+        return 0;
+    }
+  }
+
+  get totalTasksCount(): number {
+    switch (this.renderMode) {
+      case RenderMode.noCriticalApps:
+        return 0;
+
+      case RenderMode.criticalAppsWithAtRiskAppsAndNoTasks:
+        return this.atRiskAppsCount;
+
+      case RenderMode.criticalAppsWithAtRiskAppsAndTasks:
+        return this.totalTasks;
+
+      default:
+        return 0;
+    }
+  }
+
+  get canAssignTasks(): boolean {
+    return this.atRiskAppsCount > this.totalTasks ? true : false;
+  }
+
+  get renderModes() {
+    return RenderMode;
+  }
+
+  async assignTasks() {
+    const taskCount = await this.requestPasswordChange();
+    this.taskMetrics$.next({
+      totalTasks: this.totalTasks + taskCount,
+      completedTasks: this.completedTasks,
+    });
+  }
+
+  // TODO: this method is shared between here and critical-applications.component.ts
+  async requestPasswordChange() {
+    const apps = this.allApplicationsDetails;
+    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"),
+      });
+
+      return tasks.length;
+    } catch {
+      this.toastService.showToast({
+        message: this.i18nService.t("unexpectedError"),
+        variant: "error",
+        title: this.i18nService.t("error"),
+      });
+    }
+
+    return 0;
+  }
+}
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
new file mode 100644
index 00000000000..a1b5611ff14
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.html
@@ -0,0 +1,49 @@
+@if (isLoading$ | async) {
+  <div *ngIf="isLoading$ | async">
+    <tools-risk-insights-loading></tools-risk-insights-loading>
+  </div>
+}
+
+@if (!(isLoading$ | async)) {
+  <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': passwordChangeMetricHasProgressBar }">
+      <dirt-password-change-metric></dirt-password-change-metric>
+    </li>
+
+    <li class="tw-col-span-1">
+      <dirt-activity-card
+        [title]="'atRiskMembers' | i18n"
+        [cardMetrics]="'membersAtRiskCount' | i18n: totalCriticalAppsAtRiskMemberCount"
+        [metricDescription]="'membersWithAccessToAtRiskItemsForCriticalApps' | i18n"
+        navigationText="{{ 'viewAtRiskMembers' | i18n }}"
+        navigationLink="{{ getLinkForRiskInsightsTab(RiskInsightsTabType.AllApps) }}"
+        [showNavigationLink]="totalCriticalAppsAtRiskMemberCount > 0"
+      >
+      </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)
+        "
+        navigationText="{{ 'viewAtRiskApplications' | i18n }}"
+        navigationLink="{{ getLinkForRiskInsightsTab(RiskInsightsTabType.CriticalApps) }}"
+        [showNavigationLink]="totalCriticalAppsAtRiskCount > 0"
+      >
+      </dirt-activity-card>
+    </li>
+  </ul>
+}
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
new file mode 100644
index 00000000000..1691e35c819
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.ts
@@ -0,0 +1,84 @@
+import { Component, DestroyRef, inject, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { ActivatedRoute } from "@angular/router";
+import { firstValueFrom } from "rxjs";
+
+import {
+  AllActivitiesService,
+  RiskInsightsDataService,
+} 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 { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+import { ActivityCardComponent } from "./activity-card.component";
+import { PasswordChangeMetricComponent } from "./activity-cards/password-change-metric.component";
+import { ApplicationsLoadingComponent } from "./risk-insights-loading.component";
+import { RiskInsightsTabType } from "./risk-insights.component";
+
+@Component({
+  selector: "tools-all-activity",
+  imports: [
+    ApplicationsLoadingComponent,
+    SharedModule,
+    ActivityCardComponent,
+    PasswordChangeMetricComponent,
+  ],
+  templateUrl: "./all-activity.component.html",
+})
+export class AllActivityComponent implements OnInit {
+  protected isLoading$ = this.dataService.isLoading$;
+  organization: Organization | null = null;
+  totalCriticalAppsAtRiskMemberCount = 0;
+  totalCriticalAppsCount = 0;
+  totalCriticalAppsAtRiskCount = 0;
+  passwordChangeMetricHasProgressBar = false;
+
+  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;
+
+      this.allActivitiesService.reportSummary$
+        .pipe(takeUntilDestroyed(this.destroyRef))
+        .subscribe((summary) => {
+          this.totalCriticalAppsAtRiskMemberCount = summary.totalCriticalAtRiskMemberCount;
+          this.totalCriticalAppsCount = summary.totalCriticalApplicationCount;
+          this.totalCriticalAppsAtRiskCount = summary.totalCriticalAtRiskApplicationCount;
+        });
+
+      this.allActivitiesService.passwordChangeProgressMetricHasProgressBar$
+        .pipe(takeUntilDestroyed(this.destroyRef))
+        .subscribe((hasProgressBar) => {
+          this.passwordChangeMetricHasProgressBar = hasProgressBar;
+        });
+    }
+  }
+
+  constructor(
+    protected activatedRoute: ActivatedRoute,
+    private accountService: AccountService,
+    protected organizationService: OrganizationService,
+    protected dataService: RiskInsightsDataService,
+    protected allActivitiesService: AllActivitiesService,
+  ) {}
+
+  get RiskInsightsTabType() {
+    return RiskInsightsTabType;
+  }
+
+  getLinkForRiskInsightsTab(tabIndex: RiskInsightsTabType): string {
+    const organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId");
+    return `/organizations/${organizationId}/access-intelligence/risk-insights?tabIndex=${tabIndex}`;
+  }
+}
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
index d383d1153c7..febdb5fa0de 100644
--- 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
@@ -25,56 +25,72 @@
 </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>
-  <div class="tw-flex tw-gap-6">
-    <dirt-card
-      #allAppsOrgAtRiskMembers
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{ 'tw-bg-primary-100': dataService.drawerInvokerId === 'allAppsOrgAtRiskMembers' }"
-      [title]="'atRiskMembers' | i18n"
-      [value]="applicationSummary.totalAtRiskMemberCount"
-      [maxValue]="applicationSummary.totalMemberCount"
-      (click)="showOrgAtRiskMembers('allAppsOrgAtRiskMembers')"
-    >
-    </dirt-card>
-    <dirt-card
-      #allAppsOrgAtRiskApplications
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{
-        'tw-bg-primary-100': dataService.drawerInvokerId === 'allAppsOrgAtRiskApplications',
-      }"
-      [title]="'atRiskApplications' | i18n"
-      [value]="applicationSummary.totalAtRiskApplicationCount"
-      [maxValue]="applicationSummary.totalApplicationCount"
-      (click)="showOrgAtRiskApps('allAppsOrgAtRiskApplications')"
-    >
-    </dirt-card>
-  </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>
+  @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"
-    [isDrawerIsOpenForThisRecord]="isDrawerOpenForTableRow"
-    [checkboxChange]="onCheckboxChange"
-    [showAppAtRiskMembers]="showAppAtRiskMembers"
-  ></app-table-row-scrollable>
+    <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
index 75712c51a3d..3b7490dbc19 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts
@@ -6,16 +6,18 @@ import { combineLatest, debounceTime, firstValueFrom, map, Observable, of, switc
 
 import { Security } from "@bitwarden/assets/svg";
 import {
+  AllActivitiesService,
   CriticalAppsService,
   RiskInsightsDataService,
   RiskInsightsReportService,
 } from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { createNewSummaryData } from "@bitwarden/bit-common/dirt/reports/risk-insights/helpers";
 import {
-  ApplicationHealthReportDetail,
-  ApplicationHealthReportDetailWithCriticalFlag,
-  ApplicationHealthReportDetailWithCriticalFlagAndCipher,
-  ApplicationHealthReportSummary,
+  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,
@@ -59,19 +61,14 @@ import { ApplicationsLoadingComponent } from "./risk-insights-loading.component"
 })
 export class AllApplicationsComponent implements OnInit {
   protected dataSource =
-    new TableDataSource<ApplicationHealthReportDetailWithCriticalFlagAndCipher>();
+    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: ApplicationHealthReportSummary = {
-    totalMemberCount: 0,
-    totalAtRiskMemberCount: 0,
-    totalApplicationCount: 0,
-    totalAtRiskApplicationCount: 0,
-  };
+  protected applicationSummary: OrganizationReportSummary = createNewSummaryData();
 
   destroyRef = inject(DestroyRef);
   isLoading$: Observable<boolean> = of(false);
@@ -98,7 +95,7 @@ export class AllApplicationsComponent implements OnInit {
               const data = applications?.map((app) => ({
                 ...app,
                 isMarkedAsCritical: criticalUrls.includes(app.applicationName),
-              })) as ApplicationHealthReportDetailWithCriticalFlag[];
+              })) as LEGACY_ApplicationHealthReportDetailWithCriticalFlag[];
               return { data, organization };
             }
 
@@ -108,7 +105,7 @@ export class AllApplicationsComponent implements OnInit {
             if (data && organization) {
               const dataWithCiphers = await this.reportService.identifyCiphers(
                 data,
-                organization.id,
+                organization.id as OrganizationId,
               );
 
               return {
@@ -124,6 +121,7 @@ export class AllApplicationsComponent implements OnInit {
           if (data) {
             this.dataSource.data = data;
             this.applicationSummary = this.reportService.generateApplicationsSummary(data);
+            this.allActivitiesService.setAllAppsReportSummary(this.applicationSummary);
           }
           if (organization) {
             this.organization = organization;
@@ -145,6 +143,8 @@ export class AllApplicationsComponent implements OnInit {
     protected reportService: RiskInsightsReportService,
     private accountService: AccountService,
     protected criticalAppsService: CriticalAppsService,
+    protected riskInsightsEncryptionService: RiskInsightsEncryptionService,
+    protected allActivitiesService: AllActivitiesService,
   ) {
     this.searchControl.valueChanges
       .pipe(debounceTime(200), takeUntilDestroyed())
@@ -184,10 +184,6 @@ export class AllApplicationsComponent implements OnInit {
     }
   };
 
-  trackByFunction(_: number, item: ApplicationHealthReportDetail) {
-    return item.applicationName;
-  }
-
   showAppAtRiskMembers = async (applicationName: string) => {
     const info = {
       members:
@@ -216,10 +212,4 @@ export class AllApplicationsComponent implements OnInit {
       this.selectedUrls.delete(applicationName);
     }
   };
-
-  getSelectedUrls = () => Array.from(this.selectedUrls);
-
-  isDrawerOpenForTableRow = (applicationName: string): boolean => {
-    return this.dataService.drawerInvokerId === applicationName;
-  };
 }
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
index eb7544faf05..ea41dd0aff3 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
@@ -3,17 +3,20 @@
     <ng-container header>
       <th></th>
       <th bitCell></th>
-      <th bitSortable="applicationName" bitCell>{{ "application" | i18n }}</th>
-      <th bitSortable="atRiskPasswordCount" bitCell>{{ "atRiskPasswords" | i18n }}</th>
-      <th bitSortable="passwordCount" bitCell>{{ "totalPasswords" | i18n }}</th>
-      <th bitSortable="atRiskMemberCount" bitCell>{{ "atRiskMembers" | i18n }}</th>
-      <th bitSortable="memberCount" bitCell>{{ "totalMembers" | i18n }}</th>
+      <th bitSortable="applicationName" bitCell tabindex="0">{{ "application" | i18n }}</th>
+      <th bitSortable="atRiskPasswordCount" bitCell default="desc" tabindex="0">
+        {{ "atRiskPasswords" | i18n }}
+      </th>
+      <th bitSortable="passwordCount" bitCell tabindex="0">{{ "totalPasswords" | i18n }}</th>
+      <th bitSortable="atRiskMemberCount" bitCell tabindex="0">{{ "atRiskMembers" | i18n }}</th>
+      <th bitSortable="memberCount" bitCell tabindex="0">{{ "totalMembers" | i18n }}</th>
     </ng-container>
     <ng-template bitRowDef let-row>
       <td
         bitCell
         *ngIf="showRowCheckBox"
-        [ngClass]="{ 'tw-bg-primary-100': isDrawerIsOpenForThisRecord(row.applicationName) }"
+        [ngClass]="{ 'tw-bg-primary-100': row.applicationName === openApplication }"
+        appStopProp
       >
         <input
           bitCheckbox
@@ -27,25 +30,45 @@
       <td
         bitCell
         *ngIf="!showRowCheckBox"
-        [ngClass]="{ 'tw-bg-primary-100': isDrawerIsOpenForThisRecord(row.applicationName) }"
+        [ngClass]="{ 'tw-bg-primary-100': row.applicationName === openApplication }"
       >
         <i class="bwi bwi-star-f" *ngIf="row.isMarkedAsCritical"></i>
       </td>
-      <td bitCell>
+      <td
+        bitCell
+        class="tw-cursor-pointer"
+        [ngClass]="{ 'tw-bg-primary-100': row.applicationName === openApplication }"
+        (click)="showAppAtRiskMembers(row.applicationName)"
+        (keydown.enter)="showAppAtRiskMembers(row.applicationName)"
+        (keydown.space)="showAppAtRiskMembers(row.applicationName)"
+        role="button"
+        tabindex="0"
+        [attr.aria-label]="'viewItem' | i18n"
+      >
         <app-vault-icon *ngIf="row.ciphers.length > 0" [cipher]="row.ciphers[0]"></app-vault-icon>
       </td>
       <td
         class="tw-cursor-pointer"
-        [ngClass]="{ 'tw-bg-primary-100': isDrawerIsOpenForThisRecord(row.applicationName) }"
+        [ngClass]="{ 'tw-bg-primary-100': row.applicationName === openApplication }"
         (click)="showAppAtRiskMembers(row.applicationName)"
-        (keypress)="showAppAtRiskMembers(row.applicationName)"
-        bitCell
+        (keydown.enter)="showAppAtRiskMembers(row.applicationName)"
+        (keydown.space)="showAppAtRiskMembers(row.applicationName)"
+        role="button"
+        tabindex="0"
+        [attr.aria-label]="'viewItem' | i18n"
       >
         <span>{{ row.applicationName }}</span>
       </td>
       <td
         bitCell
-        [ngClass]="{ 'tw-bg-primary-100': isDrawerIsOpenForThisRecord(row.applicationName) }"
+        class="tw-cursor-pointer"
+        [ngClass]="{ 'tw-bg-primary-100': row.applicationName === openApplication }"
+        (click)="showAppAtRiskMembers(row.applicationName)"
+        (keydown.enter)="showAppAtRiskMembers(row.applicationName)"
+        (keydown.space)="showAppAtRiskMembers(row.applicationName)"
+        role="button"
+        tabindex="0"
+        [attr.aria-label]="'viewItem' | i18n"
       >
         <span>
           {{ row.atRiskPasswordCount }}
@@ -53,7 +76,14 @@
       </td>
       <td
         bitCell
-        [ngClass]="{ 'tw-bg-primary-100': isDrawerIsOpenForThisRecord(row.applicationName) }"
+        class="tw-cursor-pointer"
+        [ngClass]="{ 'tw-bg-primary-100': row.applicationName === openApplication }"
+        (click)="showAppAtRiskMembers(row.applicationName)"
+        (keydown.enter)="showAppAtRiskMembers(row.applicationName)"
+        (keydown.space)="showAppAtRiskMembers(row.applicationName)"
+        role="button"
+        tabindex="0"
+        [attr.aria-label]="'viewItem' | i18n"
       >
         <span>
           {{ row.passwordCount }}
@@ -61,7 +91,14 @@
       </td>
       <td
         bitCell
-        [ngClass]="{ 'tw-bg-primary-100': isDrawerIsOpenForThisRecord(row.applicationName) }"
+        class="tw-cursor-pointer"
+        [ngClass]="{ 'tw-bg-primary-100': row.applicationName === openApplication }"
+        (click)="showAppAtRiskMembers(row.applicationName)"
+        (keydown.enter)="showAppAtRiskMembers(row.applicationName)"
+        (keydown.space)="showAppAtRiskMembers(row.applicationName)"
+        role="button"
+        tabindex="0"
+        [attr.aria-label]="'viewItem' | i18n"
       >
         <span>
           {{ row.atRiskMemberCount }}
@@ -70,14 +107,22 @@
       <td
         bitCell
         data-testid="total-membership"
-        [ngClass]="{ 'tw-bg-primary-100': isDrawerIsOpenForThisRecord(row.applicationName) }"
+        class="tw-cursor-pointer"
+        [ngClass]="{ 'tw-bg-primary-100': row.applicationName === openApplication }"
+        (click)="showAppAtRiskMembers(row.applicationName)"
+        (keydown.enter)="showAppAtRiskMembers(row.applicationName)"
+        (keydown.space)="showAppAtRiskMembers(row.applicationName)"
+        role="button"
+        tabindex="0"
+        [attr.aria-label]="'viewItem' | i18n"
       >
         {{ row.memberCount }}
       </td>
       <td
         bitCell
         *ngIf="showRowMenuForCriticalApps"
-        [ngClass]="{ 'tw-bg-primary-100': isDrawerIsOpenForThisRecord(row.applicationName) }"
+        [ngClass]="{ 'tw-bg-primary-100': row.applicationName === openApplication }"
+        appStopProp
       >
         <button
           [bitMenuTriggerFor]="rowMenu"
@@ -85,6 +130,7 @@
           bitIconButton="bwi-ellipsis-v"
           size="small"
           label="{{ 'options' | i18n }}"
+          tabindex="0"
         ></button>
 
         <bit-menu #rowMenu>
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
index c6923bf5c77..01f3b8fb494 100644
--- 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
@@ -2,7 +2,7 @@ import { CommonModule } from "@angular/common";
 import { Component, Input } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { ApplicationHealthReportDetailWithCriticalFlagAndCipher } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health";
+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";
@@ -13,11 +13,12 @@ import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pip
   templateUrl: "./app-table-row-scrollable.component.html",
 })
 export class AppTableRowScrollableComponent {
-  @Input() dataSource!: TableDataSource<ApplicationHealthReportDetailWithCriticalFlagAndCipher>;
+  @Input()
+  dataSource!: TableDataSource<LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher>;
   @Input() showRowMenuForCriticalApps: boolean = false;
   @Input() showRowCheckBox: boolean = false;
   @Input() selectedUrls: Set<string> = new Set<string>();
-  @Input() isDrawerIsOpenForThisRecord!: (applicationName: string) => boolean;
+  @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
index a3312dfa4cf..ed2a6b96524 100644
--- 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
@@ -43,46 +43,60 @@
       }}
     </button>
   </div>
-  <div class="tw-flex tw-gap-6">
-    <dirt-card
-      #criticalAppsAtRiskMembers
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{
-        'tw-bg-primary-100': dataService.drawerInvokerId === 'criticalAppsAtRiskMembers',
-      }"
-      [title]="'atRiskMembers' | i18n"
-      [value]="applicationSummary.totalAtRiskMemberCount"
-      [maxValue]="applicationSummary.totalMemberCount"
-      (click)="showOrgAtRiskMembers('criticalAppsAtRiskMembers')"
-    >
-    </dirt-card>
-    <dirt-card
-      #criticalAppsAtRiskApplications
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{
-        'tw-bg-primary-100': dataService.drawerInvokerId === 'criticalAppsAtRiskApplications',
-      }"
-      [title]="'atRiskApplications' | i18n"
-      [value]="applicationSummary.totalAtRiskApplicationCount"
-      [maxValue]="applicationSummary.totalApplicationCount"
-      (click)="showOrgAtRiskApps('criticalAppsAtRiskApplications')"
-    >
-    </dirt-card>
-  </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>
+  @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"
-    [isDrawerIsOpenForThisRecord]="isDrawerOpenForTableRow"
-    [showAppAtRiskMembers]="showAppAtRiskMembers"
-    [unmarkAsCritical]="unmarkAsCritical"
-  ></app-table-row-scrollable>
+    <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
index a94cc6d1441..7848d37ea94 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
@@ -8,15 +8,16 @@ import { combineLatest, debounceTime, firstValueFrom, map, switchMap } from "rxj
 
 import { Security } from "@bitwarden/assets/svg";
 import {
+  AllActivitiesService,
   CriticalAppsService,
   RiskInsightsDataService,
   RiskInsightsReportService,
 } from "@bitwarden/bit-common/dirt/reports/risk-insights";
 import {
-  ApplicationHealthReportDetailWithCriticalFlag,
-  ApplicationHealthReportDetailWithCriticalFlagAndCipher,
-  ApplicationHealthReportSummary,
+  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";
@@ -51,52 +52,59 @@ import { RiskInsightsTabType } from "./risk-insights.component";
 })
 export class CriticalApplicationsComponent implements OnInit {
   protected dataSource =
-    new TableDataSource<ApplicationHealthReportDetailWithCriticalFlagAndCipher>();
+    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: string;
-  protected applicationSummary = {} as ApplicationHealthReportSummary;
+  protected organizationId: OrganizationId;
+  protected applicationSummary = {} as OrganizationReportSummary;
   noItemsIcon = Security;
   enableRequestPasswordChange = false;
 
   async ngOnInit() {
-    this.organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId") ?? "";
+    this.organizationId = this.activatedRoute.snapshot.paramMap.get(
+      "organizationId",
+    ) as OrganizationId;
     const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-    this.criticalAppsService.setOrganizationId(this.organizationId as OrganizationId, userId);
-    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 ApplicationHealthReportDetailWithCriticalFlag[];
-          return data?.filter((app) => app.isMarkedAsCritical);
-        }),
-        switchMap(async (data) => {
-          if (data) {
-            const dataWithCiphers = await this.reportService.identifyCiphers(
-              data,
-              this.organizationId,
-            );
-            return dataWithCiphers;
+    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;
+            this.allActivitiesService.setCriticalAppsReportSummary(this.applicationSummary);
+            this.allActivitiesService.setAllAppsReportDetails(applications);
           }
-          return null;
-        }),
-      )
-      .subscribe((applications) => {
-        if (applications) {
-          this.dataSource.data = applications;
-          this.applicationSummary = this.reportService.generateApplicationsSummary(applications);
-          this.enableRequestPasswordChange = this.applicationSummary.totalAtRiskMemberCount > 0;
-        }
-      });
+        });
+    }
   }
 
   goToAllAppsTab = async () => {
@@ -171,6 +179,7 @@ export class CriticalApplicationsComponent implements OnInit {
     private configService: ConfigService,
     private adminTaskService: DefaultAdminTaskService,
     private accountService: AccountService,
+    private allActivitiesService: AllActivitiesService,
   ) {
     this.searchControl.valueChanges
       .pipe(debounceTime(200), takeUntilDestroyed())
@@ -196,11 +205,4 @@ export class CriticalApplicationsComponent implements OnInit {
     const data = this.reportService.generateAtRiskApplicationList(this.dataSource.data);
     this.dataService.setDrawerForOrgAtRiskApps(data, invokerId);
   };
-
-  trackByFunction(_: number, item: ApplicationHealthReportDetailWithCriticalFlag) {
-    return item.applicationName;
-  }
-  isDrawerOpenForTableRow = (applicationName: string) => {
-    return this.dataService.drawerInvokerId === applicationName;
-  };
 }
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 89ea600f6e0..50af2c9e9a7 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
@@ -15,15 +15,17 @@
       "dataLastUpdated" | i18n: (dataLastUpdated$ | async | date: "MMMM d, y 'at' h:mm a")
     }}</span>
     <span class="tw-flex tw-justify-center tw-w-16">
-      <a
+      <button
         *ngIf="!(isRefreshing$ | async)"
+        type="button"
         bitButton
-        buttonType="unstyled"
+        buttonType="secondary"
         class="tw-border-none !tw-font-normal tw-cursor-pointer !tw-py-0"
+        tabindex="0"
         [bitAction]="refreshData.bind(this)"
       >
         {{ "refresh" | i18n }}
-      </a>
+      </button>
       <span>
         <i
           *ngIf="isRefreshing$ | async"
@@ -34,6 +36,11 @@
     </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>
+    }
     <bit-tab label="{{ 'allApplicationsWithCount' | i18n: appsCount }}">
       <tools-all-applications></tools-all-applications>
     </bit-tab>
@@ -46,93 +53,91 @@
     </bit-tab>
   </bit-tab-group>
 
-  <bit-drawer
-    style="width: 30%"
-    [(open)]="dataService.openDrawer"
-    (openChange)="dataService.closeDrawer()"
-  >
-    <ng-container *ngIf="dataService.isActiveDrawerType(drawerTypes.OrgAtRiskMembers)">
-      <bit-drawer-header
-        title="{{ 'atRiskMembersWithCount' | i18n: dataService.atRiskMemberDetails.length }}"
-      >
-      </bit-drawer-header>
-      <bit-drawer-body>
-        <span bitTypography="body1" class="tw-text-muted tw-text-sm">{{
-          (dataService.atRiskMemberDetails.length > 0
-            ? "atRiskMembersDescription"
-            : "atRiskMembersDescriptionNone"
-          ) | i18n
-        }}</span>
-        <ng-container *ngIf="dataService.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 }}
+  @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>
-          <ng-container *ngFor="let member of dataService.atRiskMemberDetails">
-            <div class="tw-flex tw-justify-between tw-mt-2">
+          <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>
-              <div>{{ member.atRiskPasswordCount }}</div>
-            </div>
-          </ng-container>
-        </ng-container>
-      </bit-drawer-body>
-    </ng-container>
-
-    <ng-container *ngIf="dataService.isActiveDrawerType(drawerTypes.AppAtRiskMembers)">
-      <bit-drawer-header title="{{ dataService.appAtRiskMembers.applicationName }}">
-      </bit-drawer-header>
-      <bit-drawer-body>
-        <div bitTypography="body1" class="tw-mb-2">
-          {{ "atRiskMembersWithCount" | i18n: dataService.appAtRiskMembers.members.length }}
-        </div>
-        <div bitTypography="body1" class="tw-text-muted tw-text-sm tw-mb-2">
-          {{
-            (dataService.appAtRiskMembers.members.length > 0
-              ? "atRiskMembersDescriptionWithApp"
-              : "atRiskMembersDescriptionWithAppNone"
-            ) | i18n: dataService.appAtRiskMembers.applicationName
-          }}
-        </div>
-        <div class="tw-mt-1">
-          <ng-container *ngFor="let member of dataService.appAtRiskMembers.members">
-            <div>{{ member.email }}</div>
-          </ng-container>
-        </div>
-      </bit-drawer-body>
-    </ng-container>
-
-    <ng-container *ngIf="dataService.isActiveDrawerType(drawerTypes.OrgAtRiskApps)">
-      <bit-drawer-header
-        title="{{ 'atRiskApplicationsWithCount' | i18n: dataService.atRiskAppDetails.length }}"
-      >
-      </bit-drawer-header>
-
-      <bit-drawer-body>
-        <span bitTypography="body2" class="tw-text-muted tw-text-sm">{{
-          (dataService.atRiskAppDetails.length > 0
-            ? "atRiskApplicationsDescription"
-            : "atRiskApplicationsDescriptionNone"
-          ) | i18n
-        }}</span>
-        <ng-container *ngIf="dataService.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>
+            </ng-container>
           </div>
-          <ng-container *ngFor="let app of dataService.atRiskAppDetails">
-            <div class="tw-flex tw-justify-between tw-mt-2">
-              <div>{{ app.applicationName }}</div>
-              <div>{{ app.atRiskPasswordCount }}</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>
-        </ng-container>
-      </bit-drawer-body>
-    </ng-container>
-  </bit-drawer>
+        </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 e2fb4469ec4..208ba59fb9d 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
@@ -10,13 +10,14 @@ import {
   CriticalAppsService,
   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,
-  PasswordHealthReportApplicationsResponse,
-} from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health";
+} 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 { OrganizationId } from "@bitwarden/common/types/guid";
 import {
@@ -29,15 +30,17 @@ import {
 } from "@bitwarden/components";
 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 {
-  AllApps = 0,
-  CriticalApps = 1,
-  NotifiedMembers = 2,
+  AllActivity = 0,
+  AllApps = 1,
+  CriticalApps = 2,
+  NotifiedMembers = 3,
 }
 
 @Component({
@@ -54,10 +57,15 @@ export enum RiskInsightsTabType {
     DrawerComponent,
     DrawerBodyComponent,
     DrawerHeaderComponent,
+    AllActivityComponent,
   ],
 })
 export class RiskInsightsComponent implements OnInit {
+  private destroyRef = inject(DestroyRef);
+  private _isDrawerOpen: boolean = false;
+
   tabIndex: RiskInsightsTabType = RiskInsightsTabType.AllApps;
+  isRiskInsightsActivityTabFeatureEnabled: boolean = false;
 
   dataLastUpdated: Date = new Date();
 
@@ -67,8 +75,8 @@ export class RiskInsightsComponent implements OnInit {
   criticalAppsCount: number = 0;
   notifiedMembersCount: number = 0;
 
-  private organizationId: string | null = null;
-  private destroyRef = inject(DestroyRef);
+  private organizationId: OrganizationId = "" as OrganizationId;
+
   isLoading$: Observable<boolean> = new Observable<boolean>();
   isRefreshing$: Observable<boolean> = new Observable<boolean>();
   dataLastUpdated$: Observable<Date | null> = new Observable<Date | null>();
@@ -85,6 +93,14 @@ export class RiskInsightsComponent implements OnInit {
     this.route.queryParams.pipe(takeUntilDestroyed()).subscribe(({ tabIndex }) => {
       this.tabIndex = !isNaN(Number(tabIndex)) ? Number(tabIndex) : RiskInsightsTabType.AllApps;
     });
+
+    this.configService
+      .getFeatureFlag$(FeatureFlag.PM22887_RiskInsightsActivityTab)
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((isEnabled) => {
+        this.isRiskInsightsActivityTabFeatureEnabled = isEnabled;
+        this.tabIndex = 0; // default to first tab
+      });
   }
 
   async ngOnInit() {
@@ -94,10 +110,10 @@ export class RiskInsightsComponent implements OnInit {
       .pipe(
         takeUntilDestroyed(this.destroyRef),
         map((params) => params.get("organizationId")),
-        switchMap((orgId: string | null) => {
+        switchMap((orgId) => {
           if (orgId) {
-            this.organizationId = orgId;
-            this.dataService.fetchApplicationsReport(orgId);
+            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$;
@@ -113,13 +129,26 @@ export class RiskInsightsComponent implements OnInit {
             this.appsCount = applications.length;
           }
 
-          this.criticalAppsService.setOrganizationId(this.organizationId as OrganizationId, userId);
+          this.criticalAppsService.loadOrganizationContext(
+            this.organizationId as OrganizationId,
+            userId,
+          );
           this.criticalApps$ = this.criticalAppsService.getAppsListForOrg(
             this.organizationId as OrganizationId,
           );
         },
       });
+
+    // Subscribe to drawer state changes
+    this.dataService.drawerDetails$
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((details) => {
+        this._isDrawerOpen = details.open;
+      });
   }
+  runReport = () => {
+    this.dataService.triggerReport();
+  };
 
   /**
    * Refreshes the data by re-fetching the applications report.
@@ -146,4 +175,27 @@ export class RiskInsightsComponent implements OnInit {
   get drawerTypes(): typeof DrawerType {
     return DrawerType;
   }
+
+  /**
+   * Special case getter for syncing drawer state from service to component.
+   * This allows the template to use two-way binding while staying reactive.
+   */
+  get isDrawerOpen() {
+    return this._isDrawerOpen;
+  }
+
+  /**
+   * 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();
+      }
+    }
+  }
 }
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.html b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.html
similarity index 82%
rename from apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.html
rename to bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.html
index e5687c71ed9..4367c6c882e 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.html
@@ -22,7 +22,7 @@
       @if (showConnectedBadge()) {
         <span class="tw-ml-3">
           @if (isConnected) {
-            <span bitBadge variant="success">{{ "on" | i18n }}</span>
+            <span bitBadge variant="success">{{ "connected" | i18n }}</span>
           }
           @if (!isConnected) {
             <span bitBadge>{{ "off" | i18n }}</span>
@@ -30,11 +30,15 @@
         </span>
       }
     </h3>
-    <p class="tw-mb-0">{{ description }}</p>
+    <p class="tw-mb-0 tw-font-semibold">{{ description }}</p>
 
     @if (canSetupConnection) {
       <button type="button" class="tw-mt-3" bitButton (click)="setupConnection()">
-        <span>{{ "connectIntegrationButtonDesc" | i18n: name }}</span>
+        @if (isUpdateAvailable) {
+          <span>{{ "updateIntegrationButtonDesc" | i18n: name }}</span>
+        } @else {
+          <span>{{ "connectIntegrationButtonDesc" | i18n: name }}</span>
+        }
       </button>
     }
 
@@ -44,6 +48,7 @@
         [href]="linkURL"
         rel="noopener noreferrer"
         target="_blank"
+        title="{{ linkURL }}"
       >
       </a>
     }
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
new file mode 100644
index 00000000000..74c39613502
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.spec.ts
@@ -0,0 +1,503 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { ActivatedRoute } from "@angular/router";
+import { mock } from "jest-mock-extended";
+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 { 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";
+import { ThemeType } from "@bitwarden/common/platform/enums";
+import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
+import { DialogService, ToastService } from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+import { HecConnectDialogResultStatus, openHecConnectDialog } from "../integration-dialog";
+
+import { IntegrationCardComponent } from "./integration-card.component";
+
+jest.mock("../integration-dialog", () => ({
+  openHecConnectDialog: jest.fn(),
+  HecConnectDialogResultStatus: { Edited: "edit", Delete: "delete" },
+}));
+
+describe("IntegrationCardComponent", () => {
+  let component: IntegrationCardComponent;
+  let fixture: ComponentFixture<IntegrationCardComponent>;
+  const mockI18nService = mock<I18nService>();
+  const activatedRoute = mock<ActivatedRoute>();
+  const mockIntegrationService = mock<HecOrganizationIntegrationService>();
+  const dialogService = mock<DialogService>();
+  const toastService = mock<ToastService>();
+
+  const systemTheme$ = new BehaviorSubject<ThemeType>(ThemeType.Light);
+  const usersPreferenceTheme$ = new BehaviorSubject<ThemeType>(ThemeType.Light);
+
+  beforeEach(async () => {
+    // reset system theme
+    systemTheme$.next(ThemeType.Light);
+    activatedRoute.snapshot = {
+      paramMap: {
+        get: jest.fn().mockReturnValue("test-organization-id"),
+      },
+    } as any;
+
+    await TestBed.configureTestingModule({
+      imports: [IntegrationCardComponent, SharedModule],
+      providers: [
+        { provide: ThemeStateService, useValue: { selectedTheme$: usersPreferenceTheme$ } },
+        { provide: SYSTEM_THEME_OBSERVABLE, useValue: systemTheme$ },
+        { provide: I18nPipe, useValue: mock<I18nPipe>() },
+        { provide: I18nService, useValue: mockI18nService },
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: HecOrganizationIntegrationService, useValue: mockIntegrationService },
+        { provide: ToastService, useValue: toastService },
+        { provide: DialogService, useValue: dialogService },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(IntegrationCardComponent);
+    component = fixture.componentInstance;
+
+    component.name = "Integration Name";
+    component.image = "test-image.png";
+    component.linkURL = "https://example.com/";
+
+    mockI18nService.t.mockImplementation((key) => key);
+    fixture.detectChanges();
+  });
+
+  it("assigns link href", () => {
+    const link = fixture.nativeElement.querySelector("a");
+
+    expect(link.href).toBe("https://example.com/");
+  });
+
+  it("renders card body", () => {
+    const name = fixture.nativeElement.querySelector("h3");
+
+    expect(name.textContent).toContain("Integration Name");
+  });
+
+  it("assigns external rel attribute", () => {
+    component.externalURL = true;
+    fixture.detectChanges();
+
+    const link = fixture.nativeElement.querySelector("a");
+
+    expect(link.rel).toBe("noopener noreferrer");
+  });
+
+  describe("new badge", () => {
+    beforeEach(() => {
+      jest.useFakeTimers();
+      jest.setSystemTime(new Date("2023-09-01"));
+    });
+
+    afterEach(() => {
+      jest.useRealTimers();
+    });
+
+    it("shows when expiration is in the future", () => {
+      component.newBadgeExpiration = "2023-09-02";
+      expect(component.showNewBadge()).toBe(true);
+    });
+
+    it("does not show when expiration is not set", () => {
+      expect(component.showNewBadge()).toBe(false);
+    });
+
+    it("does not show when expiration is in the past", () => {
+      component.newBadgeExpiration = "2023-08-31";
+      expect(component.showNewBadge()).toBe(false);
+    });
+
+    it("does not show when expiration is today", () => {
+      component.newBadgeExpiration = "2023-09-01";
+      expect(component.showNewBadge()).toBe(false);
+    });
+
+    it("does not show when expiration is invalid", () => {
+      component.newBadgeExpiration = "not-a-date";
+      expect(component.showNewBadge()).toBe(false);
+    });
+  });
+
+  describe("imageDarkMode", () => {
+    it("ignores theme changes when darkModeImage is not set", () => {
+      systemTheme$.next(ThemeType.Dark);
+      usersPreferenceTheme$.next(ThemeType.Dark);
+
+      fixture.detectChanges();
+
+      expect(component.imageEle.nativeElement.src).toContain("test-image.png");
+    });
+
+    describe("user prefers the system theme", () => {
+      beforeEach(() => {
+        component.imageDarkMode = "test-image-dark.png";
+      });
+
+      it("sets image src to imageDarkMode", () => {
+        usersPreferenceTheme$.next(ThemeType.System);
+        systemTheme$.next(ThemeType.Dark);
+
+        fixture.detectChanges();
+
+        expect(component.imageEle.nativeElement.src).toContain("test-image-dark.png");
+      });
+
+      it("sets image src to light mode image", () => {
+        component.imageEle.nativeElement.src = "test-image-dark.png";
+
+        usersPreferenceTheme$.next(ThemeType.System);
+        systemTheme$.next(ThemeType.Light);
+
+        fixture.detectChanges();
+
+        expect(component.imageEle.nativeElement.src).toContain("test-image.png");
+      });
+    });
+
+    describe("user prefers dark mode", () => {
+      beforeEach(() => {
+        component.imageDarkMode = "test-image-dark.png";
+      });
+
+      it("updates image to dark mode", () => {
+        systemTheme$.next(ThemeType.Light); // system theme shouldn't matter
+        usersPreferenceTheme$.next(ThemeType.Dark);
+
+        fixture.detectChanges();
+
+        expect(component.imageEle.nativeElement.src).toContain("test-image-dark.png");
+      });
+    });
+
+    describe("user prefers light mode", () => {
+      beforeEach(() => {
+        component.imageDarkMode = "test-image-dark.png";
+      });
+
+      it("updates image to light mode", () => {
+        component.imageEle.nativeElement.src = "test-image-dark.png";
+
+        systemTheme$.next(ThemeType.Dark); // system theme shouldn't matter
+        usersPreferenceTheme$.next(ThemeType.Light);
+
+        fixture.detectChanges();
+
+        expect(component.imageEle.nativeElement.src).toContain("test-image.png");
+      });
+    });
+  });
+
+  describe("showNewBadge", () => {
+    beforeEach(() => {
+      jest.useFakeTimers();
+      jest.setSystemTime(new Date("2024-06-01"));
+    });
+
+    afterEach(() => {
+      jest.useRealTimers();
+    });
+
+    it("returns false when newBadgeExpiration is undefined", () => {
+      component.newBadgeExpiration = undefined;
+      expect(component.showNewBadge()).toBe(false);
+    });
+
+    it("returns false when newBadgeExpiration is an invalid date", () => {
+      component.newBadgeExpiration = "invalid-date";
+      expect(component.showNewBadge()).toBe(false);
+    });
+
+    it("returns true when newBadgeExpiration is in the future", () => {
+      component.newBadgeExpiration = "2024-06-02";
+      expect(component.showNewBadge()).toBe(true);
+    });
+
+    it("returns false when newBadgeExpiration is today", () => {
+      component.newBadgeExpiration = "2024-06-01";
+      expect(component.showNewBadge()).toBe(false);
+    });
+
+    it("returns false when newBadgeExpiration is in the past", () => {
+      component.newBadgeExpiration = "2024-05-31";
+      expect(component.showNewBadge()).toBe(false);
+    });
+  });
+  describe("showConnectedBadge", () => {
+    it("returns true when canSetupConnection is true", () => {
+      component.canSetupConnection = true;
+      expect(component.showConnectedBadge()).toBe(true);
+    });
+
+    it("returns false when canSetupConnection is false", () => {
+      component.canSetupConnection = false;
+      expect(component.showConnectedBadge()).toBe(false);
+    });
+
+    it("returns false when canSetupConnection is undefined", () => {
+      component.canSetupConnection = undefined;
+      expect(component.showConnectedBadge()).toBe(false);
+    });
+  });
+
+  describe("setupConnection", () => {
+    beforeEach(() => {
+      component.integrationSettings = {
+        organizationIntegration: {
+          id: "integration-id",
+          configuration: {},
+          integrationConfiguration: [{ id: "config-id" }],
+        },
+        name: OrganizationIntegrationServiceType.CrowdStrike,
+      } as any;
+      component.organizationId = "org-id" as any;
+      jest.resetAllMocks();
+    });
+
+    it("should not proceed if dialog is cancelled", async () => {
+      (openHecConnectDialog as jest.Mock).mockReturnValue({
+        closed: of({ success: false }),
+      });
+      await component.setupConnection();
+      expect(mockIntegrationService.updateHec).not.toHaveBeenCalled();
+      expect(mockIntegrationService.saveHec).not.toHaveBeenCalled();
+    });
+
+    it("should call updateHec if isUpdateAvailable is true", async () => {
+      (openHecConnectDialog as jest.Mock).mockReturnValue({
+        closed: of({
+          success: HecConnectDialogResultStatus.Edited,
+          url: "test-url",
+          bearerToken: "token",
+          index: "index",
+        }),
+      });
+
+      jest.spyOn(component, "isUpdateAvailable", "get").mockReturnValue(true);
+
+      await component.setupConnection();
+
+      expect(mockIntegrationService.updateHec).toHaveBeenCalledWith(
+        "org-id",
+        "integration-id",
+        "config-id",
+        OrganizationIntegrationServiceType.CrowdStrike,
+        "test-url",
+        "token",
+        "index",
+      );
+      expect(mockIntegrationService.saveHec).not.toHaveBeenCalled();
+    });
+
+    it("should call saveHec if isUpdateAvailable is false", async () => {
+      component.integrationSettings = {
+        organizationIntegration: null,
+        name: OrganizationIntegrationServiceType.CrowdStrike,
+      } as any;
+      component.organizationId = "org-id" as any;
+
+      (openHecConnectDialog as jest.Mock).mockReturnValue({
+        closed: of({
+          success: HecConnectDialogResultStatus.Edited,
+          url: "test-url",
+          bearerToken: "token",
+          index: "index",
+        }),
+      });
+
+      jest.spyOn(component, "isUpdateAvailable", "get").mockReturnValue(false);
+
+      mockIntegrationService.saveHec.mockResolvedValue({ mustBeOwner: false, success: true });
+
+      await component.setupConnection();
+
+      expect(mockIntegrationService.saveHec).toHaveBeenCalledWith(
+        "org-id",
+        OrganizationIntegrationServiceType.CrowdStrike,
+        "test-url",
+        "token",
+        "index",
+      );
+      expect(mockIntegrationService.updateHec).not.toHaveBeenCalled();
+    });
+
+    it("should call deleteHec when a delete is requested", async () => {
+      component.organizationId = "org-id" as any;
+
+      (openHecConnectDialog as jest.Mock).mockReturnValue({
+        closed: of({
+          success: HecConnectDialogResultStatus.Delete,
+          url: "test-url",
+          bearerToken: "token",
+          index: "index",
+        }),
+      });
+
+      mockIntegrationService.deleteHec.mockResolvedValue({ mustBeOwner: false, success: true });
+
+      await component.setupConnection();
+
+      expect(mockIntegrationService.deleteHec).toHaveBeenCalledWith(
+        "org-id",
+        "integration-id",
+        "config-id",
+      );
+      expect(mockIntegrationService.saveHec).not.toHaveBeenCalled();
+    });
+
+    it("should not call deleteHec if no existing configuration", async () => {
+      component.integrationSettings = {
+        organizationIntegration: null,
+        name: OrganizationIntegrationServiceType.CrowdStrike,
+      } as any;
+      component.organizationId = "org-id" as any;
+
+      (openHecConnectDialog as jest.Mock).mockReturnValue({
+        closed: of({
+          success: HecConnectDialogResultStatus.Delete,
+          url: "test-url",
+          bearerToken: "token",
+          index: "index",
+        }),
+      });
+
+      mockIntegrationService.deleteHec.mockResolvedValue({ mustBeOwner: false, success: true });
+
+      await component.setupConnection();
+
+      expect(mockIntegrationService.deleteHec).not.toHaveBeenCalledWith(
+        "org-id",
+        "integration-id",
+        "config-id",
+        OrganizationIntegrationServiceType.CrowdStrike,
+        "test-url",
+        "token",
+        "index",
+      );
+      expect(mockIntegrationService.updateHec).not.toHaveBeenCalled();
+    });
+
+    it("should show toast on error while saving", async () => {
+      (openHecConnectDialog as jest.Mock).mockReturnValue({
+        closed: of({
+          success: HecConnectDialogResultStatus.Edited,
+          url: "test-url",
+          bearerToken: "token",
+          index: "index",
+        }),
+      });
+
+      jest.spyOn(component, "isUpdateAvailable", "get").mockReturnValue(true);
+      mockIntegrationService.updateHec.mockRejectedValue(new Error("fail"));
+
+      await component.setupConnection();
+
+      expect(mockIntegrationService.updateHec).toHaveBeenCalled();
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "error",
+        title: "",
+        message: mockI18nService.t("failedToSaveIntegration"),
+      });
+    });
+
+    it("should show mustBeOwner toast on error while inserting data", async () => {
+      (openHecConnectDialog as jest.Mock).mockReturnValue({
+        closed: of({
+          success: HecConnectDialogResultStatus.Edited,
+          url: "test-url",
+          bearerToken: "token",
+          index: "index",
+        }),
+      });
+
+      jest.spyOn(component, "isUpdateAvailable", "get").mockReturnValue(true);
+      mockIntegrationService.updateHec.mockRejectedValue(new ErrorResponse("Not Found", 404));
+
+      await component.setupConnection();
+
+      expect(mockIntegrationService.updateHec).toHaveBeenCalled();
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "error",
+        title: "",
+        message: mockI18nService.t("mustBeOrgOwnerToPerformAction"),
+      });
+    });
+
+    it("should show mustBeOwner toast on error while updating data", async () => {
+      (openHecConnectDialog as jest.Mock).mockReturnValue({
+        closed: of({
+          success: HecConnectDialogResultStatus.Edited,
+          url: "test-url",
+          bearerToken: "token",
+          index: "index",
+        }),
+      });
+
+      jest.spyOn(component, "isUpdateAvailable", "get").mockReturnValue(true);
+      mockIntegrationService.updateHec.mockRejectedValue(new ErrorResponse("Not Found", 404));
+
+      await component.setupConnection();
+
+      expect(mockIntegrationService.updateHec).toHaveBeenCalled();
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "error",
+        title: "",
+        message: mockI18nService.t("mustBeOrgOwnerToPerformAction"),
+      });
+    });
+
+    it("should show toast on error while deleting", async () => {
+      (openHecConnectDialog as jest.Mock).mockReturnValue({
+        closed: of({
+          success: HecConnectDialogResultStatus.Delete,
+          url: "test-url",
+          bearerToken: "token",
+          index: "index",
+        }),
+      });
+
+      jest.spyOn(component, "isUpdateAvailable", "get").mockReturnValue(true);
+      mockIntegrationService.deleteHec.mockRejectedValue(new Error("fail"));
+
+      await component.setupConnection();
+
+      expect(mockIntegrationService.deleteHec).toHaveBeenCalled();
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "error",
+        title: "",
+        message: mockI18nService.t("failedToDeleteIntegration"),
+      });
+    });
+
+    it("should show mustbeOwner toast on 404 while deleting", async () => {
+      (openHecConnectDialog as jest.Mock).mockReturnValue({
+        closed: of({
+          success: HecConnectDialogResultStatus.Delete,
+          url: "test-url",
+          bearerToken: "token",
+          index: "index",
+        }),
+      });
+
+      jest.spyOn(component, "isUpdateAvailable", "get").mockReturnValue(true);
+      mockIntegrationService.deleteHec.mockRejectedValue(new ErrorResponse("Not Found", 404));
+
+      await component.setupConnection();
+
+      expect(mockIntegrationService.deleteHec).toHaveBeenCalled();
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "error",
+        title: "",
+        message: mockI18nService.t("mustBeOrgOwnerToPerformAction"),
+      });
+    });
+  });
+});
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
new file mode 100644
index 00000000000..091de63d7a1
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.ts
@@ -0,0 +1,252 @@
+import {
+  AfterViewInit,
+  Component,
+  ElementRef,
+  Inject,
+  Input,
+  OnDestroy,
+  ViewChild,
+} from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { Observable, Subject, combineLatest, lastValueFrom, takeUntil } from "rxjs";
+
+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 { 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 { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+import {
+  HecConnectDialogResult,
+  HecConnectDialogResultStatus,
+  openHecConnectDialog,
+} from "../integration-dialog/index";
+
+@Component({
+  selector: "app-integration-card",
+  templateUrl: "./integration-card.component.html",
+  imports: [SharedModule],
+})
+export class IntegrationCardComponent implements AfterViewInit, OnDestroy {
+  private destroyed$: Subject<void> = new Subject();
+  @ViewChild("imageEle") imageEle!: ElementRef<HTMLImageElement>;
+
+  @Input() name: string = "";
+  @Input() image: string = "";
+  @Input() imageDarkMode: string = "";
+  @Input() linkURL: string = "";
+  @Input() integrationSettings!: Integration;
+
+  /** Adds relevant `rel` attribute to external links */
+  @Input() externalURL?: boolean;
+
+  /**
+   * Date of when the new badge should be hidden.
+   * When omitted, the new badge is never shown.
+   *
+   * @example "2024-12-31"
+   */
+  @Input() newBadgeExpiration?: string;
+  @Input() description?: string;
+  @Input() canSetupConnection?: boolean;
+
+  organizationId: OrganizationId;
+
+  constructor(
+    private themeStateService: ThemeStateService,
+    @Inject(SYSTEM_THEME_OBSERVABLE)
+    private systemTheme$: Observable<ThemeType>,
+    private dialogService: DialogService,
+    private activatedRoute: ActivatedRoute,
+    private hecOrganizationIntegrationService: HecOrganizationIntegrationService,
+    private toastService: ToastService,
+    private i18nService: I18nService,
+  ) {
+    this.organizationId = this.activatedRoute.snapshot.paramMap.get(
+      "organizationId",
+    ) as OrganizationId;
+  }
+
+  ngAfterViewInit() {
+    combineLatest([this.themeStateService.selectedTheme$, this.systemTheme$])
+      .pipe(takeUntil(this.destroyed$))
+      .subscribe(([theme, systemTheme]) => {
+        // When the card doesn't have a dark mode image, exit early
+        if (!this.imageDarkMode) {
+          return;
+        }
+
+        if (theme === ThemeType.System) {
+          // When the user's preference is the system theme,
+          // use the system theme to determine the image
+          const prefersDarkMode = systemTheme === ThemeType.Dark;
+
+          this.imageEle.nativeElement.src = prefersDarkMode ? this.imageDarkMode : this.image;
+        } else if (theme === ThemeType.Dark) {
+          // When the user's preference is dark mode, use the dark mode image
+          this.imageEle.nativeElement.src = this.imageDarkMode;
+        } else {
+          // Otherwise use the light mode image
+          this.imageEle.nativeElement.src = this.image;
+        }
+      });
+  }
+
+  ngOnDestroy(): void {
+    this.destroyed$.next();
+    this.destroyed$.complete();
+  }
+
+  /** Show the "new" badge when expiration is in the future */
+  showNewBadge() {
+    if (!this.newBadgeExpiration) {
+      return false;
+    }
+
+    const expirationDate = new Date(this.newBadgeExpiration);
+
+    // Do not show the new badge for invalid dates
+    if (isNaN(expirationDate.getTime())) {
+      return false;
+    }
+
+    return expirationDate > new Date();
+  }
+
+  get isConnected(): boolean {
+    return !!this.integrationSettings.organizationIntegration?.configuration;
+  }
+
+  showConnectedBadge(): boolean {
+    return this.canSetupConnection ?? false;
+  }
+
+  get isUpdateAvailable(): boolean {
+    return !!this.integrationSettings.organizationIntegration;
+  }
+
+  async setupConnection() {
+    // invoke the dialog to connect the integration
+    const 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);
+      }
+    } catch {
+      this.toastService.showToast({
+        variant: "error",
+        title: "",
+        message: this.i18nService.t("failedToSaveIntegration"),
+      });
+    }
+  }
+
+  async saveHec(result: HecConnectDialogResult) {
+    let saveResponse = { mustBeOwner: false, success: false };
+    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
+      saveResponse = await this.hecOrganizationIntegrationService.updateHec(
+        this.organizationId,
+        orgIntegrationId,
+        orgIntegrationConfigurationId,
+        this.integrationSettings.name as OrganizationIntegrationServiceType,
+        result.url,
+        result.bearerToken,
+        result.index,
+      );
+    } else {
+      // create new integration and configuration
+      saveResponse = await this.hecOrganizationIntegrationService.saveHec(
+        this.organizationId,
+        this.integrationSettings.name as OrganizationIntegrationServiceType,
+        result.url,
+        result.bearerToken,
+        result.index,
+      );
+    }
+
+    if (saveResponse.mustBeOwner) {
+      this.showMustBeOwnerToast();
+      return;
+    }
+
+    this.toastService.showToast({
+      variant: "success",
+      title: "",
+      message: this.i18nService.t("success"),
+    });
+  }
+
+  async deleteHec() {
+    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.hecOrganizationIntegrationService.deleteHec(
+      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",
+      title: "",
+      message: this.i18nService.t("mustBeOrgOwnerToPerformAction"),
+    });
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.html b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.html
similarity index 57%
rename from apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.html
rename to bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.html
index 7f28317dd67..557e0fc382f 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.html
@@ -13,26 +13,52 @@
         <ng-container>
           <bit-form-field>
             <bit-label>{{ "url" | i18n }}</bit-label>
-            <input bitInput formControlName="url" />
+            <input
+              bitInput
+              type="text"
+              formControlName="url"
+              placeholder="https://<customer-id>.crowdstrike.com"
+            />
           </bit-form-field>
+
           <bit-form-field>
             <bit-label>{{ "bearerToken" | i18n }}</bit-label>
-            <input bitInput formControlName="bearerToken" />
+            <input bitInput type="text" formControlName="bearerToken" />
+            <bit-hint>{{ "apiKey" | i18n }}</bit-hint>
           </bit-form-field>
+
           <bit-form-field>
             <bit-label>{{ "index" | i18n }}</bit-label>
-            <input bitInput formControlName="index" />
+            <input bitInput type="text" formControlName="index" />
+            <bit-hint>{{ "repositoryNameHint" | i18n }}</bit-hint>
           </bit-form-field>
         </ng-container>
       }
     </div>
     <ng-container bitDialogFooter>
       <button type="submit" bitButton bitFormButton buttonType="primary" [disabled]="loading">
-        {{ "save" | i18n }}
+        @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/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.spec.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.spec.ts
similarity index 91%
rename from apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.spec.ts
rename to bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.spec.ts
index 9be854545aa..9f640ebbcc7 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.spec.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.spec.ts
@@ -3,18 +3,18 @@ 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 { Integration } from "../../models";
-
 import {
   ConnectHecDialogComponent,
   HecConnectDialogParams,
   HecConnectDialogResult,
+  HecConnectDialogResultStatus,
   openHecConnectDialog,
 } from "./connect-dialog-hec.component";
 
@@ -66,11 +66,12 @@ describe("ConnectDialogHecComponent", () => {
     imageDarkMode: "test-image-dark.png",
     newBadgeExpiration: "2024-12-31",
     description: "Test Description",
-    isConnected: false,
     canSetupConnection: true,
     type: IntegrationType.EVENT,
   } as Integration;
-  const connectInfo: HecConnectDialogParams = { settings: integrationMock };
+  const connectInfo: HecConnectDialogParams = {
+    settings: integrationMock, // Provide appropriate mock template if needed
+  };
 
   beforeEach(async () => {
     dialogRefMock = mock<DialogRef<HecConnectDialogResult>>();
@@ -120,9 +121,9 @@ describe("ConnectDialogHecComponent", () => {
     expect(component.formGroup.valid).toBeTruthy();
   });
 
-  it("should invalidate url if not matching pattern", () => {
+  it("should test url is at least 7 characters long", () => {
     component.formGroup.setValue({
-      url: "ftp://test.com",
+      url: "test",
       bearerToken: "token",
       index: "1",
       service: "Test Service",
@@ -150,14 +151,11 @@ describe("ConnectDialogHecComponent", () => {
 
     expect(dialogRefMock.close).toHaveBeenCalledWith({
       integrationSettings: integrationMock,
-      configuration: JSON.stringify({
-        url: "https://test.com",
-        bearerToken: "token",
-        index: "1",
-        service: "Test Service",
-      }),
-      success: true,
-      error: null,
+      url: "https://test.com",
+      bearerToken: "token",
+      index: "1",
+      service: "Test Service",
+      success: HecConnectDialogResultStatus.Edited,
     });
   });
 });
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
new file mode 100644
index 00000000000..dc3490843cf
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts
@@ -0,0 +1,125 @@
+import { Component, Inject, OnInit } from "@angular/core";
+import { FormBuilder, Validators } from "@angular/forms";
+
+import { HecConfiguration } from "@bitwarden/bit-common/dirt/organization-integrations/models/configuration/hec-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 HecConnectDialogParams = {
+  settings: Integration;
+};
+
+export interface HecConnectDialogResult {
+  integrationSettings: Integration;
+  url: string;
+  bearerToken: string;
+  index: string;
+  service: string;
+  success: HecConnectDialogResultStatusType | null;
+}
+
+export const HecConnectDialogResultStatus = {
+  Edited: "edit",
+  Delete: "delete",
+} as const;
+
+export type HecConnectDialogResultStatusType =
+  (typeof HecConnectDialogResultStatus)[keyof typeof HecConnectDialogResultStatus];
+
+@Component({
+  templateUrl: "./connect-dialog-hec.component.html",
+  imports: [SharedModule],
+})
+export class ConnectHecDialogComponent implements OnInit {
+  loading = false;
+  hecConfig: HecConfiguration | null = null;
+  hecTemplate: HecTemplate | null = null;
+  formGroup = this.formBuilder.group({
+    url: ["", [Validators.required, Validators.minLength(7)]],
+    bearerToken: ["", Validators.required],
+    index: ["", Validators.required],
+    service: ["", Validators.required],
+  });
+
+  constructor(
+    @Inject(DIALOG_DATA) protected connectInfo: HecConnectDialogParams,
+    protected formBuilder: FormBuilder,
+    private dialogRef: DialogRef<HecConnectDialogResult>,
+    private dialogService: DialogService,
+  ) {}
+
+  ngOnInit(): void {
+    this.hecConfig =
+      this.connectInfo.settings.organizationIntegration?.getConfiguration<HecConfiguration>() ??
+      null;
+    this.hecTemplate =
+      this.connectInfo.settings.organizationIntegration?.integrationConfiguration?.[0]?.getTemplate<HecTemplate>() ??
+      null;
+
+    this.formGroup.patchValue({
+      url: this.hecConfig?.uri || "",
+      bearerToken: this.hecConfig?.token || "",
+      index: this.hecTemplate?.index || "",
+      service: this.connectInfo.settings.name,
+    });
+  }
+
+  get isUpdateAvailable(): boolean {
+    return !!this.hecConfig;
+  }
+
+  get canDelete(): boolean {
+    return !!this.hecConfig;
+  }
+
+  submit = async (): Promise<void> => {
+    if (this.formGroup.invalid) {
+      this.formGroup.markAllAsTouched();
+      return;
+    }
+    const result = this.getHecConnectDialogResult(HecConnectDialogResultStatus.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.getHecConnectDialogResult(HecConnectDialogResultStatus.Delete);
+      this.dialogRef.close(result);
+    }
+  };
+
+  private getHecConnectDialogResult(
+    status: HecConnectDialogResultStatusType,
+  ): HecConnectDialogResult {
+    const formJson = this.formGroup.getRawValue();
+
+    return {
+      integrationSettings: this.connectInfo.settings,
+      url: formJson.url || "",
+      bearerToken: formJson.bearerToken || "",
+      index: formJson.index || "",
+      service: formJson.service || "",
+      success: status,
+    };
+  }
+}
+
+export function openHecConnectDialog(
+  dialogService: DialogService,
+  config: DialogConfig<HecConnectDialogParams, DialogRef<HecConnectDialogResult>>,
+) {
+  return dialogService.open<HecConnectDialogResult>(ConnectHecDialogComponent, config);
+}
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/index.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/index.ts
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/index.ts
rename to bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/index.ts
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.html b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.html
similarity index 94%
rename from apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.html
rename to bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.html
index 661c57b47fc..9e14023d21b 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.html
@@ -14,7 +14,6 @@
       [externalURL]="integration.type === IntegrationType.SDK"
       [newBadgeExpiration]="integration.newBadgeExpiration"
       [description]="integration.description | i18n"
-      [isConnected]="integration.isConnected"
       [canSetupConnection]="integration.canSetupConnection"
       [integrationSettings]="integration"
     ></app-integration-card>
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/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
similarity index 86%
rename from apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.spec.ts
rename to bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.spec.ts
index 01a512ac38c..f0b371703f6 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/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
@@ -5,22 +5,17 @@ import { mock } from "jest-mock-extended";
 import { of } from "rxjs";
 
 import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
-// eslint-disable-next-line no-restricted-imports
-import { OrganizationIntegrationApiService } from "@bitwarden/bit-common/dirt/integrations/services";
+import { Integration } from "@bitwarden/bit-common/dirt/organization-integrations/models/integration";
+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";
 import { ThemeTypes } from "@bitwarden/common/platform/enums";
-// eslint-disable-next-line import/order
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
-// FIXME: remove `src` and fix import
-
 import { ToastService } from "@bitwarden/components";
-// eslint-disable-next-line no-restricted-imports
-import { SharedModule } from "@bitwarden/components/src/shared";
 import { I18nPipe } from "@bitwarden/ui-common";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
 import { IntegrationCardComponent } from "../integration-card/integration-card.component";
-import { Integration } from "../models";
 
 import { IntegrationGridComponent } from "./integration-grid.component";
 
@@ -28,7 +23,7 @@ describe("IntegrationGridComponent", () => {
   let component: IntegrationGridComponent;
   let fixture: ComponentFixture<IntegrationGridComponent>;
   const mockActivatedRoute = mock<ActivatedRoute>();
-  const mockOrgIntegrationApiService = mock<OrganizationIntegrationApiService>();
+  const mockIntegrationService = mock<HecOrganizationIntegrationService>();
   const integrations: Integration[] = [
     {
       name: "Integration 1",
@@ -74,10 +69,7 @@ describe("IntegrationGridComponent", () => {
           provide: ActivatedRoute,
           useValue: mockActivatedRoute,
         },
-        {
-          provide: OrganizationIntegrationApiService,
-          useValue: mockOrgIntegrationApiService,
-        },
+        { provide: HecOrganizationIntegrationService, useValue: mockIntegrationService },
         {
           provide: ToastService,
           useValue: mock<ToastService>(),
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.ts
similarity index 70%
rename from apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.ts
rename to bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.ts
index 55b552bd251..66ccc2530c2 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.ts
@@ -1,12 +1,10 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, Input } from "@angular/core";
 
+import { Integration } from "@bitwarden/bit-common/dirt/organization-integrations/models/integration";
 import { IntegrationType } from "@bitwarden/common/enums";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
-import { SharedModule } from "../../../../../../shared/shared.module";
 import { IntegrationCardComponent } from "../integration-card/integration-card.component";
-import { Integration } from "../models";
 
 @Component({
   selector: "app-integration-grid",
@@ -14,7 +12,7 @@ import { Integration } from "../models";
   imports: [IntegrationCardComponent, SharedModule],
 })
 export class IntegrationGridComponent {
-  @Input() integrations: Integration[];
+  @Input() integrations: Integration[] = [];
 
   @Input() ariaI18nKey: string = "integrationCardAriaLabel";
   @Input() tooltipI18nKey: string = "integrationCardTooltip";
diff --git a/apps/web/src/app/admin-console/organizations/integrations/integrations.component.html b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/integrations/integrations.component.html
rename to bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.component.html
diff --git a/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.component.ts
similarity index 75%
rename from apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts
rename to bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.component.ts
index 3ddf9c0a720..c249bf42282 100644
--- a/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.component.ts
@@ -1,43 +1,32 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { Observable, Subject, switchMap, takeUntil, scheduled, asyncScheduler } from "rxjs";
+import { firstValueFrom, Observable, Subject, switchMap, takeUntil, takeWhile } from "rxjs";
 
-// eslint-disable-next-line no-restricted-imports
-import { OrganizationIntegrationApiService } from "@bitwarden/bit-common/dirt/integrations";
-import {
-  getOrganizationById,
-  OrganizationService,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+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 { 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";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { IntegrationType } from "@bitwarden/common/enums";
 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 { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
-import { HeaderModule } from "../../../layouts/header/header.module";
-import { SharedModule } from "../../../shared/shared.module";
-import { SharedOrganizationModule } from "../shared";
-import { IntegrationGridComponent } from "../shared/components/integrations/integration-grid/integration-grid.component";
-import { FilterIntegrationsPipe } from "../shared/components/integrations/integrations.pipe";
-import { Integration } from "../shared/components/integrations/models";
+import { IntegrationGridComponent } from "./integration-grid/integration-grid.component";
+import { FilterIntegrationsPipe } from "./integrations.pipe";
 
 @Component({
   selector: "ac-integrations",
   templateUrl: "./integrations.component.html",
-  imports: [
-    SharedModule,
-    SharedOrganizationModule,
-    IntegrationGridComponent,
-    HeaderModule,
-    FilterIntegrationsPipe,
-  ],
+  imports: [SharedModule, IntegrationGridComponent, HeaderModule, FilterIntegrationsPipe],
 })
 export class AdminConsoleIntegrationsComponent implements OnInit, OnDestroy {
-  // integrationsList: Integration[] = [];
-  tabIndex: number;
-  organization$: Observable<Organization>;
+  tabIndex: number = 0;
+  organization$: Observable<Organization> = new Observable<Organization>();
   isEventBasedIntegrationsEnabled: boolean = false;
   private destroy$ = new Subject<void>();
 
@@ -218,38 +207,43 @@ export class AdminConsoleIntegrationsComponent implements OnInit, OnDestroy {
     },
   ];
 
-  ngOnInit(): void {
-    const orgId = this.route.snapshot.params.organizationId;
+  async ngOnInit() {
+    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+    if (!userId) {
+      throw new Error("User ID not found");
+    }
 
     this.organization$ = this.route.params.pipe(
       switchMap((params) =>
-        this.accountService.activeAccount$.pipe(
-          switchMap((account) =>
-            this.organizationService
-              .organizations$(account?.id)
-              .pipe(getOrganizationById(params.organizationId)),
-          ),
+        this.organizationService.organizations$(userId).pipe(
+          getById(params.organizationId),
+          // Filter out undefined values
+          takeWhile((org: Organization | undefined) => !!org),
         ),
       ),
     );
 
-    scheduled(this.orgIntegrationApiService.getOrganizationIntegrations(orgId), asyncScheduler)
+    // Sets the organization ID which also loads the integrations$
+    this.organization$.pipe(takeUntil(this.destroy$)).subscribe((org) => {
+      this.hecOrganizationIntegrationService.setOrganizationIntegrations(org.id);
+    });
+
+    // For all existing event based configurations loop through and assign the
+    // organizationIntegration for the correct services.
+    this.hecOrganizationIntegrationService.integrations$
       .pipe(takeUntil(this.destroy$))
       .subscribe((integrations) => {
-        // Update the integrations list with the fetched integrations
-        if (integrations && integrations.length > 0) {
-          integrations.forEach((integration) => {
-            const configJson = JSON.parse(integration.configuration || "{}");
-            const serviceName = configJson.service ?? "";
-            const existingIntegration = this.integrationsList.find((i) => i.name === serviceName);
+        // reset all integrations to null first - in case one was deleted
+        this.integrationsList.forEach((i) => {
+          i.organizationIntegration = null;
+        });
 
-            if (existingIntegration) {
-              // if a configuration exists, then it is connected
-              existingIntegration.isConnected = !!integration.configuration;
-              existingIntegration.configuration = integration.configuration || "";
-            }
-          });
-        }
+        integrations.map((integration) => {
+          const item = this.integrationsList.find((i) => i.name === integration.serviceType);
+          if (item) {
+            item.organizationIntegration = integration;
+          }
+        });
       });
   }
 
@@ -258,7 +252,7 @@ export class AdminConsoleIntegrationsComponent implements OnInit, OnDestroy {
     private organizationService: OrganizationService,
     private accountService: AccountService,
     private configService: ConfigService,
-    private orgIntegrationApiService: OrganizationIntegrationApiService,
+    private hecOrganizationIntegrationService: HecOrganizationIntegrationService,
   ) {
     this.configService
       .getFeatureFlag$(FeatureFlag.EventBasedOrganizationIntegrations)
@@ -267,16 +261,18 @@ export class AdminConsoleIntegrationsComponent implements OnInit, OnDestroy {
         this.isEventBasedIntegrationsEnabled = isEnabled;
       });
 
+    // Add the new event based items to the list
     if (this.isEventBasedIntegrationsEnabled) {
-      this.integrationsList.push({
-        name: "Crowdstrike",
+      const crowdstrikeIntegration: Integration = {
+        name: OrganizationIntegrationServiceType.CrowdStrike,
         linkURL: "",
         image: "../../../../../../../images/integrations/logo-crowdstrike-black.svg",
         type: IntegrationType.EVENT,
         description: "crowdstrikeEventIntegrationDesc",
-        isConnected: false,
         canSetupConnection: true,
-      });
+      };
+
+      this.integrationsList.push(crowdstrikeIntegration);
     }
   }
   ngOnDestroy(): void {
@@ -284,6 +280,7 @@ export class AdminConsoleIntegrationsComponent implements OnInit, OnDestroy {
     this.destroy$.complete();
   }
 
+  // use in the view
   get IntegrationType(): typeof IntegrationType {
     return IntegrationType;
   }
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integrations.pipe.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.pipe.ts
similarity index 78%
rename from apps/web/src/app/admin-console/organizations/shared/components/integrations/integrations.pipe.ts
rename to bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.pipe.ts
index ae9f73e78c0..7a420ade4b5 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integrations.pipe.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.pipe.ts
@@ -1,9 +1,8 @@
 import { Pipe, PipeTransform } from "@angular/core";
 
+import { Integration } from "@bitwarden/bit-common/dirt/organization-integrations/models/integration";
 import { IntegrationType } from "@bitwarden/common/enums";
 
-import { Integration } from "../../../shared/components/integrations/models";
-
 @Pipe({
   name: "filterIntegrations",
 })
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/organization-integrations-routing.module.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/organization-integrations-routing.module.ts
new file mode 100644
index 00000000000..1667689b186
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/organization-integrations-routing.module.ts
@@ -0,0 +1,23 @@
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
+
+import { organizationPermissionsGuard } from "@bitwarden/web-vault/app/admin-console/organizations/guards/org-permissions.guard";
+
+import { AdminConsoleIntegrationsComponent } from "./integrations.component";
+
+const routes: Routes = [
+  {
+    path: "",
+    canActivate: [organizationPermissionsGuard((org) => org.canAccessIntegrations)],
+    component: AdminConsoleIntegrationsComponent,
+    data: {
+      titleId: "integrations",
+    },
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class OrganizationIntegrationsRoutingModule {}
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
new file mode 100644
index 00000000000..a8e0899f26d
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/organization-integrations.module.ts
@@ -0,0 +1,32 @@
+import { NgModule } from "@angular/core";
+
+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";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { safeProvider } from "@bitwarden/ui-common";
+
+import { AdminConsoleIntegrationsComponent } from "./integrations.component";
+import { OrganizationIntegrationsRoutingModule } from "./organization-integrations-routing.module";
+
+@NgModule({
+  imports: [AdminConsoleIntegrationsComponent, OrganizationIntegrationsRoutingModule],
+  providers: [
+    safeProvider({
+      provide: HecOrganizationIntegrationService,
+      useClass: HecOrganizationIntegrationService,
+      deps: [OrganizationIntegrationApiService, OrganizationIntegrationConfigurationApiService],
+    }),
+    safeProvider({
+      provide: OrganizationIntegrationApiService,
+      useClass: OrganizationIntegrationApiService,
+      deps: [ApiService],
+    }),
+    safeProvider({
+      provide: OrganizationIntegrationConfigurationApiService,
+      useClass: OrganizationIntegrationConfigurationApiService,
+      deps: [ApiService],
+    }),
+  ],
+})
+export class OrganizationIntegrationsModule {}
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 be4b5725ecc..bd105fc21e2 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,14 +9,14 @@ 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 { OrganizationIntegrationApiService } from "@bitwarden/bit-common/dirt/integrations";
+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 { ToastService } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
-import { IntegrationCardComponent } from "@bitwarden/web-vault/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component";
-import { IntegrationGridComponent } from "@bitwarden/web-vault/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component";
+
+import { IntegrationCardComponent } from "../../dirt/organization-integrations/integration-card/integration-card.component";
+import { IntegrationGridComponent } from "../../dirt/organization-integrations/integration-grid/integration-grid.component";
 
 import { IntegrationsComponent } from "./integrations.component";
 
@@ -36,8 +36,8 @@ class MockNewMenuComponent {}
 
 describe("IntegrationsComponent", () => {
   let fixture: ComponentFixture<IntegrationsComponent>;
+  const hecOrgIntegrationSvc = mock<HecOrganizationIntegrationService>();
 
-  const mockOrgIntegrationApiService = mock<OrganizationIntegrationApiService>();
   const activatedRouteMock = {
     snapshot: { paramMap: { get: jest.fn() } },
   };
@@ -52,10 +52,9 @@ describe("IntegrationsComponent", () => {
         { provide: ThemeStateService, useValue: mock<ThemeStateService>() },
         { provide: SYSTEM_THEME_OBSERVABLE, useValue: of(ThemeType.Light) },
         { provide: ActivatedRoute, useValue: activatedRouteMock },
-        { provide: OrganizationIntegrationApiService, useValue: mockOrgIntegrationApiService },
-        { provide: ToastService, useValue: mock<ToastService>() },
         { provide: I18nPipe, useValue: mock<I18nPipe>() },
         { provide: I18nService, useValue: mockI18nService },
+        { provide: HecOrganizationIntegrationService, useValue: hecOrgIntegrationSvc },
       ],
     }).compileComponents();
     fixture = TestBed.createComponent(IntegrationsComponent);
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 01a2edb5d5d..31aff308c51 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
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 
+import { Integration } from "@bitwarden/bit-common/dirt/organization-integrations/models/integration";
 import { IntegrationType } from "@bitwarden/common/enums";
-import { Integration } from "@bitwarden/web-vault/app/admin-console/organizations/shared/components/integrations/models";
 
 @Component({
   selector: "sm-integrations",
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 eee426e3b07..2b0682b6602 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,8 +1,13 @@
 import { NgModule } from "@angular/core";
 
-import { IntegrationCardComponent } from "@bitwarden/web-vault/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component";
-import { IntegrationGridComponent } from "@bitwarden/web-vault/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component";
+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";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { safeProvider } from "@bitwarden/ui-common";
 
+import { IntegrationCardComponent } from "../../dirt/organization-integrations/integration-card/integration-card.component";
+import { IntegrationGridComponent } from "../../dirt/organization-integrations/integration-grid/integration-grid.component";
 import { SecretsManagerSharedModule } from "../shared/sm-shared.module";
 
 import { IntegrationsRoutingModule } from "./integrations-routing.module";
@@ -15,6 +20,23 @@ import { IntegrationsComponent } from "./integrations.component";
     IntegrationCardComponent,
     IntegrationGridComponent,
   ],
+  providers: [
+    safeProvider({
+      provide: HecOrganizationIntegrationService,
+      useClass: HecOrganizationIntegrationService,
+      deps: [OrganizationIntegrationApiService, OrganizationIntegrationConfigurationApiService],
+    }),
+    safeProvider({
+      provide: OrganizationIntegrationApiService,
+      useClass: OrganizationIntegrationApiService,
+      deps: [ApiService],
+    }),
+    safeProvider({
+      provide: OrganizationIntegrationConfigurationApiService,
+      useClass: OrganizationIntegrationConfigurationApiService,
+      deps: [ApiService],
+    }),
+  ],
   declarations: [IntegrationsComponent],
 })
 export class IntegrationsModule {}
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html
index cc61d24921e..e6e990c3d84 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html
@@ -1,24 +1,8 @@
-<ng-container *ngIf="freeTrial$ | async as freeTrial">
-  <bit-banner
-    id="update-browser-banner"
-    class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
-    bannerType="premium"
-    icon="bwi-billing"
-    [showClose]="false"
-    *ngIf="!loading && freeTrial.shownBanner"
-  >
-    {{ freeTrial.message }}
-    <a
-      bitLink
-      linkType="secondary"
-      class="tw-cursor-pointer"
-      (click)="navigateToPaymentMethod()"
-      rel="noreferrer noopener"
-    >
-      {{ "clickHereToAddPaymentMethod" | i18n }}
-    </a>
-  </bit-banner>
-</ng-container>
+<app-organization-free-trial-warning
+  [organization]="organization"
+  (clicked)="navigateToPaymentMethod()"
+>
+</app-organization-free-trial-warning>
 <app-header [title]="organizationName">
   <sm-new-menu></sm-new-menu>
 </app-header>
@@ -83,7 +67,6 @@
       <h2 slot="summary" class="tw-mb-0" bitTypography="h2" noMargin>{{ "secrets" | i18n }}</h2>
       <sm-secrets-list
         baseRoute="secrets"
-        [disableVirtualScroll]="true"
         (deleteSecretsEvent)="openDeleteSecret($event)"
         (newSecretEvent)="openNewSecretDialog()"
         (editSecretEvent)="openEditSecret($event)"
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 ca17ea3bc94..e301c0462c3 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
@@ -14,13 +14,8 @@ import {
   take,
   share,
   firstValueFrom,
-  of,
-  filter,
-  catchError,
-  from,
 } from "rxjs";
 
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import {
   getOrganizationById,
   OrganizationService,
@@ -28,16 +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 { 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 { 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 { BillingNotificationService } from "@bitwarden/web-vault/app/billing/services/billing-notification.service";
-import { TrialFlowService } from "@bitwarden/web-vault/app/billing/services/trial-flow.service";
-import { FreeTrial } from "@bitwarden/web-vault/app/billing/types/free-trial";
 
 import { OrganizationCounts } from "../models/view/counts.view";
 import { ProjectListView } from "../models/view/project-list.view";
@@ -111,7 +100,6 @@ export class OverviewComponent implements OnInit, OnDestroy {
     tasks: OrganizationTasks;
     counts: OrganizationCounts;
   }>;
-  protected freeTrial$: Observable<FreeTrial>;
 
   constructor(
     private route: ActivatedRoute,
@@ -127,11 +115,6 @@ export class OverviewComponent implements OnInit, OnDestroy {
     private smOnboardingTasksService: SMOnboardingTasksService,
     private logService: LogService,
     private router: Router,
-    private organizationApiService: OrganizationApiServiceAbstraction,
-    private trialFlowService: TrialFlowService,
-    private organizationBillingService: OrganizationBillingServiceAbstraction,
-    private billingNotificationService: BillingNotificationService,
-    private configService: ConfigService,
   ) {}
 
   ngOnInit() {
@@ -161,27 +144,6 @@ export class OverviewComponent implements OnInit, OnDestroy {
       this.organizationEnabled = org.enabled;
     });
 
-    this.freeTrial$ = org$.pipe(
-      filter((org) => org.isOwner && org.canViewBillingHistory && org.canViewSubscription),
-      switchMap((org) =>
-        combineLatest([
-          of(org),
-          this.organizationApiService.getSubscription(org.id),
-          from(this.organizationBillingService.getPaymentSource(org.id)).pipe(
-            catchError((error: unknown) => {
-              this.billingNotificationService.handleError(error);
-              return of(null);
-            }),
-          ),
-        ]),
-      ),
-      map(([org, sub, paymentSource]) => {
-        return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(org, sub, paymentSource);
-      }),
-      filter((result) => result !== null),
-      takeUntil(this.destroy$),
-    );
-
     const projects$ = combineLatest([
       orgId$,
       this.projectService.project$.pipe(startWith(null)),
@@ -253,13 +215,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 {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts
index 94d9ab2d8ee..44b19057a0d 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts
@@ -1,6 +1,8 @@
 import { NgModule } from "@angular/core";
 
 import { BannerModule } from "@bitwarden/components";
+import { OrganizationFreeTrialWarningComponent } from "@bitwarden/web-vault/app/billing/organizations/warnings/components";
+import { OrganizationWarningsModule } from "@bitwarden/web-vault/app/billing/organizations/warnings/organization-warnings.module";
 import { OnboardingModule } from "@bitwarden/web-vault/app/shared/components/onboarding/onboarding.module";
 
 import { SecretsManagerSharedModule } from "../shared/sm-shared.module";
@@ -10,7 +12,14 @@ import { OverviewComponent } from "./overview.component";
 import { SectionComponent } from "./section.component";
 
 @NgModule({
-  imports: [SecretsManagerSharedModule, OverviewRoutingModule, OnboardingModule, BannerModule],
+  imports: [
+    SecretsManagerSharedModule,
+    OverviewRoutingModule,
+    OnboardingModule,
+    BannerModule,
+    OrganizationFreeTrialWarningComponent,
+    OrganizationWarningsModule,
+  ],
   declarations: [OverviewComponent, SectionComponent],
   providers: [],
 })
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html
index d9919ef6bac..29fb1210a21 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html
@@ -2,7 +2,7 @@
   <ng-container *ngIf="projectSecrets?.secrets && projectSecrets?.project; else spinner">
     <div
       *ngIf="projectSecrets.secrets?.length > 0 && projectSecrets.project?.write"
-      class="tw-float-right tw-mt-3 tw-items-center"
+      class="tw-flex tw-mt-3 tw-justify-end"
     >
       <button type="button" bitButton buttonType="secondary" (click)="openNewSecretDialog()">
         <i class="bwi bwi-plus" aria-hidden="true"></i>
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..f2fb49b73f4 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
@@ -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..21f11d6bfed 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,11 +1,20 @@
 // 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,
@@ -17,7 +26,7 @@ import {
   templateUrl: "./service-accounts-list.component.html",
   standalone: false,
 })
-export class ServiceAccountsListComponent implements OnDestroy {
+export class ServiceAccountsListComponent implements OnDestroy, OnInit {
   protected dataSource = new TableDataSource<ServiceAccountSecretsDetailsView>();
 
   @Input()
@@ -43,18 +52,52 @@ export class ServiceAccountsListComponent implements OnDestroy {
   @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 +137,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..345fff03876 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,
@@ -46,14 +48,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 +68,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/porting/sm-import.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html
index 1cf11634d72..353d8d8c8ed 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html
@@ -3,7 +3,7 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit" class="tw-max-w-xl">
   <bit-form-field>
     <bit-label>{{ "fileUpload" | i18n }}</bit-label>
-    <div class="file-selector">
+    <div class="file-selector tw-pt-2 tw-pb-1 tw-break-words">
       <button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
         {{ "chooseFile" | i18n }}
       </button>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html
index 512ccbf5bb8..2c4647f3d6f 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html
@@ -1,7 +1,7 @@
 <app-header [title]="organizationName$ | async">
   <sm-new-menu></sm-new-menu>
 </app-header>
-<bit-no-items [icon]="NoAccess">
+<bit-no-items [icon]="DeactivatedOrg">
   <ng-container slot="title">{{ "organizationIsDisabled" | i18n }}</ng-container>
   <ng-container slot="description">{{ "secretsAccessSuspended" | i18n }}</ng-container>
 </bit-no-items>
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 0a7d6befde2..6777df7ef7a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
@@ -2,7 +2,7 @@ import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { map, concatMap, firstValueFrom } from "rxjs";
 
-import { Icon, NoAccess } from "@bitwarden/assets/svg";
+import { Icon, DeactivatedOrg } from "@bitwarden/assets/svg";
 import {
   getOrganizationById,
   OrganizationService,
@@ -21,7 +21,7 @@ export class OrgSuspendedComponent {
     private route: ActivatedRoute,
   ) {}
 
-  protected NoAccess: Icon = NoAccess;
+  protected DeactivatedOrg: Icon = DeactivatedOrg;
   protected organizationName$ = this.route.params.pipe(
     concatMap(async (params) => {
       const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
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 fec317a06b5..35a9b3c5bba 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
@@ -23,11 +23,7 @@
   </bit-no-items>
 </ng-container>
 
-<bit-table-scroll
-  *ngIf="secrets?.length >= 1 && !disableVirtualScroll"
-  [dataSource]="dataSource"
-  [rowSize]="53"
->
+<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">
@@ -148,158 +144,6 @@
   </ng-template>
 </bit-table-scroll>
 
-<ng-container *ngIf="disableVirtualScroll">
-  <bit-table *ngIf="secrets?.length >= 1" [dataSource]="dataSource">
-    <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">
-            <input
-              type="checkbox"
-              (change)="$event ? toggleAll() : null"
-              [checked]="selection.hasValue() && isAllSelected()"
-              [indeterminate]="selection.hasValue() && !isAllSelected()"
-            />
-            {{ "all" | i18n }}
-          </label>
-        </th>
-        <th bitCell bitSortable="name" default>{{ "name" | i18n }}</th>
-        <th bitCell bitSortable="projects" [fn]="sortProjects">{{ "project" | i18n }}</th>
-        <th bitCell bitSortable="revisionDate">{{ "lastEdited" | i18n }}</th>
-        <th bitCell class="tw-w-0">
-          <button
-            type="button"
-            bitIconButton="bwi-ellipsis-v"
-            buttonType="main"
-            [label]="'options' | i18n"
-            [bitMenuTriggerFor]="tableMenu"
-          ></button>
-        </th>
-      </tr>
-    </ng-container>
-    <ng-template body let-rows$>
-      <tr bitRow *ngFor="let secret of rows$ | async">
-        <td bitCell>
-          <input
-            type="checkbox"
-            (change)="$event ? selection.toggle(secret.id) : null"
-            [checked]="selection.isSelected(secret.id)"
-          />
-        </td>
-        <td bitCell>
-          <div class="tw-flex tw-items-center tw-gap-4 tw-break-all">
-            <i class="bwi bwi-key tw-text-muted" aria-hidden="true"></i>
-            <div>
-              <div *ngIf="!trash">
-                <button type="button" bitLink (click)="editSecret(secret)">
-                  {{ secret.name }}
-                </button>
-              </div>
-              <div *ngIf="trash">{{ secret.name }}</div>
-              <div class="tw-text-sm tw-text-muted">
-                {{ secret.id }}
-                <button
-                  type="button"
-                  bitIconButton="bwi-clone"
-                  buttonType="main"
-                  size="small"
-                  [label]="'copyUuid' | i18n"
-                  (click)="copySecretUuidEvent.emit(secret.id)"
-                ></button>
-              </div>
-            </div>
-          </div>
-        </td>
-        <td bitCell>
-          <span
-            *ngFor="let project of secret.projects"
-            bitBadge
-            variant="secondary"
-            class="tw-ml-1"
-            [title]="project.name"
-            maxWidthClass="tw-max-w-60"
-          >
-            {{ project.name }}
-          </span>
-          <span *ngIf="secret.projects.length === 0" bitBadge variant="warning" class="tw-ml-1"
-            ><i class="bwi bwi-fw bwi-exclamation-triangle tw-mr-1" aria-hidden="true"></i
-            >{{ "unassigned" | i18n }}</span
-          >
-        </td>
-        <td bitCell class="tw-whitespace-nowrap">{{ secret.revisionDate | date: "medium" }}</td>
-        <td bitCell>
-          <button
-            type="button"
-            bitIconButton="bwi-ellipsis-v"
-            buttonType="main"
-            [label]="'options' | i18n"
-            [bitMenuTriggerFor]="secretMenu"
-          ></button>
-        </td>
-
-        <bit-menu #secretMenu>
-          <button
-            type="button"
-            bitMenuItem
-            (click)="editSecret(secret)"
-            *ngIf="secret.write && !trash"
-          >
-            <i class="bwi bwi-fw bwi-pencil" aria-hidden="true"></i>
-            {{ "editSecret" | i18n }}
-          </button>
-          <button
-            type="button"
-            bitMenuItem
-            (click)="copySecretNameEvent.emit(secret.name)"
-            *ngIf="!trash"
-          >
-            <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
-            {{ "copySecretName" | i18n }}
-          </button>
-          <button
-            type="button"
-            bitMenuItem
-            (click)="copySecretValueEvent.emit(secret.id)"
-            *ngIf="!trash"
-          >
-            <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
-            {{ "copySecretValue" | i18n }}
-          </button>
-          <button
-            type="button"
-            bitMenuItem
-            (click)="restoreSecretsEvent.emit([secret.id])"
-            *ngIf="trash"
-          >
-            <i class="bwi bwi-fw bwi-refresh" aria-hidden="true"></i>
-            {{ "restoreSecret" | i18n }}
-          </button>
-          <button
-            type="button"
-            bitMenuItem
-            *ngIf="viewEventsAllowed$ | async as allowed"
-            (click)="openEventsDialog(secret)"
-          >
-            <i class="bwi bwi-fw bwi-billing" aria-hidden="true"></i>
-            <span> {{ "viewEvents" | i18n }} </span>
-          </button>
-          <button
-            type="button"
-            bitMenuItem
-            (click)="deleteSecretsEvent.emit([secret])"
-            *ngIf="secret.write"
-          >
-            <i class="bwi bwi-fw bwi-trash tw-text-danger" aria-hidden="true"></i>
-            <span class="tw-text-danger">{{
-              (trash ? "permanentlyDelete" : "deleteSecret") | i18n
-            }}</span>
-          </button>
-        </bit-menu>
-      </tr>
-    </ng-template>
-  </bit-table>
-</ng-container>
-
 <bit-menu #tableMenu>
   <button type="button" bitMenuItem (click)="bulkRestoreSecrets()" *ngIf="trash">
     <i class="bwi bwi-fw bwi-refresh" aria-hidden="true"></i>
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 12b6c69cb37..4ef7dbf22e7 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
@@ -29,9 +29,6 @@ import { SecretService } from "../secrets/secret.service";
 export class SecretsListComponent implements OnDestroy, OnInit {
   protected dataSource = new TableDataSource<SecretListView>();
 
-  @Input()
-  disableVirtualScroll: boolean;
-
   @Input()
   get secrets(): SecretListView[] {
     return this._secrets;
diff --git a/eslint.config.mjs b/eslint.config.mjs
index e3f9c9272bb..0a7b8e59c75 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -35,6 +35,7 @@ export default tseslint.config(
       rxjs: fixupPluginRules(rxjs),
       "rxjs-angular": fixupPluginRules(angularRxjs),
       "@bitwarden/platform": platformPlugins,
+      "@bitwarden/components": componentPlugins,
     },
     languageOptions: {
       parserOptions: {
@@ -74,8 +75,11 @@ export default tseslint.config(
       "@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",
+
       "@typescript-eslint/explicit-member-accessibility": ["error", { accessibility: "no-public" }],
       "@typescript-eslint/no-explicit-any": "off", // TODO: This should be re-enabled
       "@typescript-eslint/no-floating-promises": "error",
diff --git a/jest.config.js b/jest.config.js
index 9be54e99995..e5aeb536172 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -41,7 +41,6 @@ module.exports = {
     "<rootDir>/libs/key-management/jest.config.js",
     "<rootDir>/libs/key-management-ui/jest.config.js",
     "<rootDir>/libs/logging/jest.config.js",
-    "<rootDir>/libs/messaging-internal/jest.config.js",
     "<rootDir>/libs/messaging/jest.config.js",
     "<rootDir>/libs/node/jest.config.js",
     "<rootDir>/libs/platform/jest.config.js",
diff --git a/libs/admin-console/package.json b/libs/admin-console/package.json
index c319beb8f4c..5e934006d0d 100644
--- a/libs/admin-console/package.json
+++ b/libs/admin-console/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest"
   }
 }
diff --git a/libs/admin-console/project.json b/libs/admin-console/project.json
new file mode 100644
index 00000000000..cd9565d7e21
--- /dev/null
+++ b/libs/admin-console/project.json
@@ -0,0 +1,29 @@
+{
+  "name": "@bitwarden/admin-console",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/admin-console/src",
+  "projectType": "library",
+  "tags": ["scope:admin-console", "type:lib"],
+  "targets": {
+    "build": {
+      "executor": "nx:run-script",
+      "dependsOn": [],
+      "options": {
+        "script": "build"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/admin-console/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/admin-console/src/common/collections/abstractions/collection.service.ts b/libs/admin-console/src/common/collections/abstractions/collection.service.ts
index dabaf078e16..f879831324d 100644
--- a/libs/admin-console/src/common/collections/abstractions/collection.service.ts
+++ b/libs/admin-console/src/common/collections/abstractions/collection.service.ts
@@ -28,4 +28,11 @@ export abstract class CollectionService {
    * Transforms the input CollectionViews into TreeNodes and then returns the Treenode with the specified id
    */
   abstract getNested(collections: CollectionView[], id: string): TreeNode<CollectionView>;
+
+  /*
+   * Groups/keys collections by OrganizationId
+   */
+  abstract groupByOrganization(
+    collections: CollectionView[],
+  ): Map<OrganizationId, CollectionView[]>;
 }
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 a0332cfb501..4fe2ac67863 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
@@ -369,6 +369,27 @@ describe("DefaultCollectionService", () => {
     });
   });
 
+  describe("groupByOrganization", () => {
+    it("groups collections by organization", () => {
+      const org1 = { organizationId: "org1" } as CollectionView;
+      org1.name = "Collection 1";
+
+      const org2 = { organizationId: "org1" } as CollectionView;
+      org2.name = "Collection 2";
+      const org3 = { organizationId: "org2" } as CollectionView;
+      org3.name = "Collection 3";
+      const collections = [org1, org2, org3];
+
+      const result = collectionService.groupByOrganization(collections);
+
+      expect(result.size).toBe(2);
+      expect(result.get(org1.organizationId)?.length).toBe(2);
+      expect(result.get(org1.organizationId)).toContainPartialObjects([org1, org2]);
+      expect(result.get(org3.organizationId)?.length).toBe(1);
+      expect(result.get(org3.organizationId)).toContainPartialObjects([org3]);
+    });
+  });
+
   const setEncryptedState = (collectionData: CollectionData[] | null) =>
     stateProvider.setUserState(
       ENCRYPTED_COLLECTION_DATA_KEY,
diff --git a/libs/admin-console/src/common/collections/services/default-collection.service.ts b/libs/admin-console/src/common/collections/services/default-collection.service.ts
index 39b3b491862..0511b692b38 100644
--- a/libs/admin-console/src/common/collections/services/default-collection.service.ts
+++ b/libs/admin-console/src/common/collections/services/default-collection.service.ts
@@ -213,15 +213,30 @@ export class DefaultCollectionService implements CollectionService {
     );
   }
 
+  // Transforms the input CollectionViews into TreeNodes
   getAllNested(collections: CollectionView[]): TreeNode<CollectionView>[] {
-    const nodes: TreeNode<CollectionView>[] = [];
-    collections.forEach((c) => {
-      const collectionCopy = Object.assign(new CollectionView({ ...c, name: c.name }), c);
+    const groupedByOrg = this.groupByOrganization(collections);
 
-      const parts = c.name != null ? c.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
-      ServiceUtils.nestedTraverse(nodes, 0, parts, collectionCopy, undefined, NestingDelimiter);
+    const all: TreeNode<CollectionView>[] = [];
+    for (const group of groupedByOrg.values()) {
+      const nodes: TreeNode<CollectionView>[] = [];
+      for (const c of group) {
+        const collectionCopy = Object.assign(new CollectionView({ ...c, name: c.name }), c);
+        const parts = c.name ? c.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
+        ServiceUtils.nestedTraverse(nodes, 0, parts, collectionCopy, undefined, NestingDelimiter);
+      }
+      all.push(...nodes);
+    }
+    return all;
+  }
+
+  groupByOrganization(collections: CollectionView[]): Map<OrganizationId, CollectionView[]> {
+    const groupedByOrg = new Map<OrganizationId, CollectionView[]>();
+    collections.map((c) => {
+      const key = c.organizationId;
+      (groupedByOrg.get(key) ?? groupedByOrg.set(key, []).get(key)!).push(c);
     });
-    return nodes;
+    return groupedByOrg;
   }
 
   /**
diff --git a/libs/admin-console/src/common/organization-user/models/requests/organization-user-reset-password.request.ts b/libs/admin-console/src/common/organization-user/models/requests/organization-user-reset-password.request.ts
index 7d060e3390e..bd87f6ca5d8 100644
--- a/libs/admin-console/src/common/organization-user/models/requests/organization-user-reset-password.request.ts
+++ b/libs/admin-console/src/common/organization-user/models/requests/organization-user-reset-password.request.ts
@@ -1,6 +1,25 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+
+import {
+  MasterPasswordAuthenticationData,
+  MasterPasswordUnlockData,
+} from "@bitwarden/common/key-management/master-password/types/master-password.types";
+
 export class OrganizationUserResetPasswordRequest {
   newMasterPasswordHash: string;
   key: string;
+
+  // This will eventually be changed to be an actual constructor, once all callers are updated.
+  // The body of this request will be changed to carry the authentication data and unlock data.
+  // https://bitwarden.atlassian.net/browse/PM-23234
+  static newConstructor(
+    authenticationData: MasterPasswordAuthenticationData,
+    unlockData: MasterPasswordUnlockData,
+  ): OrganizationUserResetPasswordRequest {
+    const request = new OrganizationUserResetPasswordRequest();
+    request.newMasterPasswordHash = authenticationData.masterPasswordAuthenticationHash;
+    request.key = unlockData.masterKeyWrappedUserKey;
+    return request;
+  }
 }
diff --git a/libs/angular/package.json b/libs/angular/package.json
index 322c8c826a2..0b9111f88fb 100644
--- a/libs/angular/package.json
+++ b/libs/angular/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest"
   }
 }
diff --git a/libs/angular/project.json b/libs/angular/project.json
new file mode 100644
index 00000000000..eeeb6c68eb0
--- /dev/null
+++ b/libs/angular/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/angular",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/angular/src",
+  "projectType": "library",
+  "tags": ["scope:angular", "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/angular/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/angular/src/auth/components/two-factor-icon.component.html b/libs/angular/src/auth/components/two-factor-icon.component.html
index 46d5211ca0a..14558700757 100644
--- a/libs/angular/src/auth/components/two-factor-icon.component.html
+++ b/libs/angular/src/auth/components/two-factor-icon.component.html
@@ -1,12 +1,7 @@
 <ng-container>
-  <!-- TOTP Authenticator -->
-  <bit-icon [icon]="Icons.TOTPIcon" *ngIf="provider == 0"></bit-icon>
-  <!-- Email -->
-  <bit-icon [icon]="Icons.EmailIcon" *ngIf="provider == 1"></bit-icon>
-  <!-- Webauthn -->
-  <bit-icon [icon]="Icons.WebAuthnIcon" *ngIf="provider == 7"></bit-icon>
-  <!-- Recovery Code -->
-  <bit-icon [icon]="Icons.RecoveryCodeIcon" *ngIf="provider == 'rc'"></bit-icon>
+  <div class="tw-size-[70px] tw-content-center" *ngIf="!!IconProviderMap[provider]">
+    <bit-icon [icon]="IconProviderMap[provider]"></bit-icon>
+  </div>
   <!-- Other 2FA Types (Duo, Yubico, U2F as PNG) -->
   <img
     [class]="'mfaType' + provider"
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 8c650b6b04c..c9c7e43b61f 100644
--- a/libs/angular/src/auth/components/two-factor-icon.component.ts
+++ b/libs/angular/src/auth/components/two-factor-icon.component.ts
@@ -2,7 +2,12 @@
 // @ts-strict-ignore
 import { Component, Input } from "@angular/core";
 
-import { EmailIcon, RecoveryCodeIcon, TOTPIcon, WebAuthnIcon } from "@bitwarden/assets/svg";
+import {
+  Icon,
+  TwoFactorAuthAuthenticatorIcon,
+  TwoFactorAuthEmailIcon,
+  TwoFactorAuthWebAuthnIcon,
+} from "@bitwarden/assets/svg";
 
 @Component({
   selector: "auth-two-factor-icon",
@@ -13,11 +18,10 @@ export class TwoFactorIconComponent {
   @Input() provider: any;
   @Input() name: string;
 
-  protected readonly Icons = {
-    TOTPIcon,
-    EmailIcon,
-    WebAuthnIcon,
-    RecoveryCodeIcon,
+  protected readonly IconProviderMap: { [key: number | string]: Icon } = {
+    0: TwoFactorAuthAuthenticatorIcon,
+    1: TwoFactorAuthEmailIcon,
+    7: TwoFactorAuthWebAuthnIcon,
   };
 
   constructor() {}
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 fbab228d6e0..01e87cae0ed 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
@@ -137,8 +137,7 @@ export class DefaultSetInitialPasswordService implements SetInitialPasswordServi
       newPasswordHint,
       orgSsoIdentifier,
       keysRequest,
-      kdfConfig.kdfType,
-      kdfConfig.iterations,
+      kdfConfig,
     );
 
     await this.masterPasswordApiService.setPassword(request);
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 d96b4c86fb5..7a1dfc91e67 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
@@ -157,8 +157,7 @@ describe("DefaultSetInitialPasswordService", () => {
         credentials.newPasswordHint,
         credentials.orgSsoIdentifier,
         keysRequest,
-        credentials.kdfConfig.kdfType,
-        credentials.kdfConfig.iterations,
+        credentials.kdfConfig,
       );
 
       enrollmentRequest = new OrganizationUserResetPasswordEnrollmentRequest();
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 c31495b60fb..ff78952c562 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
@@ -3,7 +3,7 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
-import { NoAccess } from "@bitwarden/assets/svg";
+import { DeactivatedOrg } 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 {
@@ -112,7 +112,7 @@ export class SetInitialPasswordComponent implements OnInit {
       this.userType = SetInitialPasswordUserType.OFFBOARDED_TDE_ORG_USER_UNTRUSTED_DEVICE;
       this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
         pageTitle: { key: "unableToCompleteLogin" },
-        pageIcon: NoAccess,
+        pageIcon: DeactivatedOrg,
       });
     }
 
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 a6f1db54241..00000000000
--- a/libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.ts
+++ /dev/null
@@ -1,165 +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 this.providerService.get(this.dialogParams.providerId);
-      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..34e1d27c1ed 100644
--- a/libs/angular/src/billing/components/index.ts
+++ b/libs/angular/src/billing/components/index.ts
@@ -1,5 +1 @@
-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";
diff --git a/libs/angular/src/billing/components/invoices/no-invoices.component.ts b/libs/angular/src/billing/components/invoices/no-invoices.component.ts
deleted file mode 100644
index 5251fc0133b..00000000000
--- a/libs/angular/src/billing/components/invoices/no-invoices.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component } from "@angular/core";
-
-import { PartnerTrustIcon } from "@bitwarden/assets/svg";
-
-@Component({
-  selector: "app-no-invoices",
-  template: `<div class="tw-flex tw-flex-col tw-items-center tw-text-info">
-    <bit-icon [icon]="icon"></bit-icon>
-    <p class="tw-mt-4">{{ "noInvoicesToList" | i18n }}</p>
-  </div>`,
-  standalone: false,
-})
-export class NoInvoicesComponent {
-  icon = PartnerTrustIcon;
-}
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/index.ts b/libs/angular/src/billing/components/premium-badge/index.ts
new file mode 100644
index 00000000000..aba6ecc961b
--- /dev/null
+++ b/libs/angular/src/billing/components/premium-badge/index.ts
@@ -0,0 +1 @@
+export * from "./premium-badge.component";
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
new file mode 100644
index 00000000000..a4a1d76d1d6
--- /dev/null
+++ b/libs/angular/src/billing/components/premium-badge/premium-badge.component.ts
@@ -0,0 +1,25 @@
+import { Component, input } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
+import { BadgeModule } from "@bitwarden/components";
+
+@Component({
+  selector: "app-premium-badge",
+  standalone: true,
+  template: `
+    <button type="button" *appNotPremium bitBadge variant="success" (click)="promptForPremium()">
+      {{ "premium" | i18n }}
+    </button>
+  `,
+  imports: [BadgeModule, JslibModule],
+})
+export class PremiumBadgeComponent {
+  organizationId = input<string>();
+
+  constructor(private premiumUpgradePromptService: PremiumUpgradePromptService) {}
+
+  async promptForPremium() {
+    await this.premiumUpgradePromptService.promptForPremium(this.organizationId());
+  }
+}
diff --git a/apps/web/src/app/vault/components/premium-badge.stories.ts b/libs/angular/src/billing/components/premium-badge/premium-badge.stories.ts
similarity index 84%
rename from apps/web/src/app/vault/components/premium-badge.stories.ts
rename to libs/angular/src/billing/components/premium-badge/premium-badge.stories.ts
index 331f72fd0ac..08259358f30 100644
--- a/apps/web/src/app/vault/components/premium-badge.stories.ts
+++ b/libs/angular/src/billing/components/premium-badge/premium-badge.stories.ts
@@ -6,6 +6,7 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 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";
@@ -17,7 +18,7 @@ class MockMessagingService implements MessageSender {
 }
 
 export default {
-  title: "Web/Premium Badge",
+  title: "Billing/Premium Badge",
   component: PremiumBadgeComponent,
   decorators: [
     moduleMetadata({
@@ -51,6 +52,12 @@ export default {
             hasPremiumFromAnySource$: () => of(false),
           },
         },
+        {
+          provide: PremiumUpgradePromptService,
+          useValue: {
+            promptForPremium: (orgId?: string) => {},
+          },
+        },
       ],
     }),
   ],
diff --git a/libs/angular/src/jslib.module.ts b/libs/angular/src/jslib.module.ts
index 86042f4b779..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,
@@ -27,6 +21,7 @@ import {
   TypographyModule,
   CopyClickDirective,
   A11yTitleDirective,
+  NoItemsModule,
 } from "@bitwarden/components";
 
 import { TwoFactorIconComponent } from "./auth/components/two-factor-icon.component";
@@ -77,6 +72,7 @@ import { IconComponent } from "./vault/components/icon.component";
     TypographyModule,
     TableModule,
     MenuModule,
+    NoItemsModule,
     IconButtonModule,
     IconModule,
     LinkModule,
@@ -110,10 +106,6 @@ import { IconComponent } from "./vault/components/icon.component";
     UserTypePipe,
     IfFeatureDirective,
     FingerprintPipe,
-    AddAccountCreditDialogComponent,
-    InvoicesComponent,
-    NoInvoicesComponent,
-    ManageTaxInformationComponent,
     TwoFactorIconComponent,
   ],
   exports: [
@@ -144,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/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 3298e7e5913..df135dcc0ef 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -20,11 +20,13 @@ import {
 import {
   DefaultLoginComponentService,
   DefaultLoginDecryptionOptionsService,
+  DefaultNewDeviceVerificationComponentService,
   DefaultRegistrationFinishService,
   DefaultTwoFactorAuthComponentService,
   DefaultTwoFactorAuthWebAuthnComponentService,
   LoginComponentService,
   LoginDecryptionOptionsService,
+  NewDeviceVerificationComponentService,
   RegistrationFinishService as RegistrationFinishServiceAbstraction,
   TwoFactorAuthComponentService,
   TwoFactorAuthWebAuthnComponentService,
@@ -102,6 +104,7 @@ import { UserVerificationService as UserVerificationServiceAbstraction } from "@
 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";
@@ -144,14 +147,13 @@ import { AccountBillingApiServiceAbstraction } from "@bitwarden/common/billing/a
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 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 { 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 { 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 { HibpApiService } from "@bitwarden/common/dirt/services/hibp-api.service";
 import {
   DefaultKeyGenerationService,
   KeyGenerationService,
@@ -162,6 +164,10 @@ import { EncryptServiceImplementation } from "@bitwarden/common/key-management/c
 import { WebCryptoFunctionService } from "@bitwarden/common/key-management/crypto/services/web-crypto-function.service";
 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 { DefaultChangeKdfApiService } from "@bitwarden/common/key-management/kdf/change-kdf-api.service";
+import { ChangeKdfApiService } from "@bitwarden/common/key-management/kdf/change-kdf-api.service.abstraction";
+import { DefaultChangeKdfService } from "@bitwarden/common/key-management/kdf/change-kdf-service";
+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 {
@@ -259,6 +265,7 @@ 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 { 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";
@@ -279,6 +286,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";
@@ -343,6 +351,8 @@ import { PasswordRepromptService } from "@bitwarden/vault";
 import {
   IndividualVaultExportService,
   IndividualVaultExportServiceAbstraction,
+  DefaultVaultExportApiService,
+  VaultExportApiService,
   OrganizationVaultExportService,
   OrganizationVaultExportServiceAbstraction,
   VaultExportService,
@@ -461,7 +471,12 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: AuditServiceAbstraction,
     useClass: AuditService,
-    deps: [CryptoFunctionServiceAbstraction, ApiServiceAbstraction],
+    deps: [CryptoFunctionServiceAbstraction, ApiServiceAbstraction, HibpApiService],
+  }),
+  safeProvider({
+    provide: HibpApiService,
+    useClass: HibpApiService,
+    deps: [ApiServiceAbstraction],
   }),
   safeProvider({
     provide: AuthServiceAbstraction,
@@ -690,7 +705,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: RestrictedItemTypesService,
     useClass: RestrictedItemTypesService,
-    deps: [ConfigService, AccountService, OrganizationServiceAbstraction, PolicyServiceAbstraction],
+    deps: [AccountService, OrganizationServiceAbstraction, PolicyServiceAbstraction],
   }),
   safeProvider({
     provide: PasswordStrengthServiceAbstraction,
@@ -864,7 +879,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: SsoLoginServiceAbstraction,
     useClass: SsoLoginService,
-    deps: [StateProvider, LogService],
+    deps: [StateProvider, LogService, PolicyServiceAbstraction],
   }),
   safeProvider({
     provide: StateServiceAbstraction,
@@ -882,31 +897,38 @@ const safeProviders: SafeProvider[] = [
       EncryptService,
       CryptoFunctionServiceAbstraction,
       KdfConfigService,
-      AccountServiceAbstraction,
       ApiServiceAbstraction,
       RestrictedItemTypesService,
     ],
   }),
+  safeProvider({
+    provide: VaultExportApiService,
+    useClass: DefaultVaultExportApiService,
+    deps: [ApiServiceAbstraction],
+  }),
   safeProvider({
     provide: OrganizationVaultExportServiceAbstraction,
     useClass: OrganizationVaultExportService,
     deps: [
       CipherServiceAbstraction,
-      ApiServiceAbstraction,
+      VaultExportApiService,
       PinServiceAbstraction,
       KeyService,
       EncryptService,
       CryptoFunctionServiceAbstraction,
       CollectionService,
       KdfConfigService,
-      AccountServiceAbstraction,
       RestrictedItemTypesService,
     ],
   }),
   safeProvider({
     provide: VaultExportServiceAbstraction,
     useClass: VaultExportService,
-    deps: [IndividualVaultExportServiceAbstraction, OrganizationVaultExportServiceAbstraction],
+    deps: [
+      IndividualVaultExportServiceAbstraction,
+      OrganizationVaultExportServiceAbstraction,
+      AccountServiceAbstraction,
+    ],
   }),
   safeProvider({
     provide: SearchServiceAbstraction,
@@ -1222,6 +1244,16 @@ const safeProviders: SafeProvider[] = [
       ConfigService,
     ],
   }),
+  safeProvider({
+    provide: ChangeKdfApiService,
+    useClass: DefaultChangeKdfApiService,
+    deps: [ApiServiceAbstraction],
+  }),
+  safeProvider({
+    provide: ChangeKdfService,
+    useClass: DefaultChangeKdfService,
+    deps: [MasterPasswordServiceAbstraction, KeyService, KdfConfigService, ChangeKdfApiService],
+  }),
   safeProvider({
     provide: AuthRequestServiceAbstraction,
     useClass: AuthRequestService,
@@ -1367,11 +1399,6 @@ const safeProviders: SafeProvider[] = [
     useClass: BillingApiService,
     deps: [ApiServiceAbstraction],
   }),
-  safeProvider({
-    provide: TaxServiceAbstraction,
-    useClass: TaxService,
-    deps: [ApiServiceAbstraction],
-  }),
   safeProvider({
     provide: BillingAccountProfileStateService,
     useClass: DefaultBillingAccountProfileStateService,
@@ -1541,7 +1568,14 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: LoginSuccessHandlerService,
     useClass: DefaultLoginSuccessHandlerService,
-    deps: [SyncService, UserAsymmetricKeysRegenerationService, LoginEmailService],
+    deps: [
+      ConfigService,
+      LoginEmailService,
+      SsoLoginServiceAbstraction,
+      SyncService,
+      UserAsymmetricKeysRegenerationService,
+      LogService,
+    ],
   }),
   safeProvider({
     provide: TaskService,
@@ -1555,6 +1589,11 @@ const safeProviders: SafeProvider[] = [
       MessageListener,
     ],
   }),
+  safeProvider({
+    provide: SendTokenService,
+    useClass: DefaultSendTokenService,
+    deps: [GlobalStateProvider, SdkService, SendPasswordService],
+  }),
   safeProvider({
     provide: EndUserNotificationService,
     useClass: DefaultEndUserNotificationService,
@@ -1605,6 +1644,21 @@ const safeProviders: SafeProvider[] = [
       InternalMasterPasswordServiceAbstraction,
     ],
   }),
+  safeProvider({
+    provide: CipherArchiveService,
+    useClass: DefaultCipherArchiveService,
+    deps: [
+      CipherServiceAbstraction,
+      ApiServiceAbstraction,
+      BillingAccountProfileStateService,
+      ConfigService,
+    ],
+  }),
+  safeProvider({
+    provide: NewDeviceVerificationComponentService,
+    useClass: DefaultNewDeviceVerificationComponentService,
+    deps: [],
+  }),
 ];
 
 @NgModule({
diff --git a/libs/angular/src/vault/components/spotlight/spotlight.stories.ts b/libs/angular/src/vault/components/spotlight/spotlight.stories.ts
index 8e660aacbad..2988344e23d 100644
--- a/libs/angular/src/vault/components/spotlight/spotlight.stories.ts
+++ b/libs/angular/src/vault/components/spotlight/spotlight.stories.ts
@@ -22,6 +22,7 @@ const meta: Meta<SpotlightComponent> = {
           useFactory: () => {
             return new I18nMockService({
               close: "Close",
+              loading: "Loading",
             });
           },
         },
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..e9a6923c2fb 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";
@@ -21,6 +21,7 @@ export class CollectionFilterComponent {
   @Output() onNodeCollapseStateChange: EventEmitter<ITreeNodeObject> =
     new EventEmitter<ITreeNodeObject>();
   @Output() onFilterChange: EventEmitter<VaultFilter> = new EventEmitter<VaultFilter>();
+  DefaultCollectionType = CollectionTypes.DefaultUserCollection;
 
   readonly collectionsGrouping: TopLevelTreeNode = {
     id: "collections",
diff --git a/libs/assets/package.json b/libs/assets/package.json
index cc5935833bf..c46c2a4e954 100644
--- a/libs/assets/package.json
+++ b/libs/assets/package.json
@@ -4,8 +4,8 @@
   "description": "Assets used in Bitwarden clients",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "ui-foundation",
   "scripts": {
diff --git a/libs/assets/project.json b/libs/assets/project.json
index 97e32a24b33..7c1d39adc16 100644
--- a/libs/assets/project.json
+++ b/libs/assets/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/assets",
         "main": "libs/assets/src/index.ts",
         "tsConfig": "libs/assets/tsconfig.lib.json",
-        "assets": ["libs/assets/*.md"]
+        "assets": ["libs/assets/*.md"],
+        "rootDir": "libs/assets/src"
       }
     },
     "lint": {
diff --git a/libs/assets/src/svg/svgs/active-send.icon.ts b/libs/assets/src/svg/svgs/active-send.icon.ts
index be5cb4540f7..3b12ee865d1 100644
--- a/libs/assets/src/svg/svgs/active-send.icon.ts
+++ b/libs/assets/src/svg/svgs/active-send.icon.ts
@@ -1,16 +1,19 @@
 import { svgIcon } from "../icon-service";
 
 export const ActiveSendIcon = svgIcon`
-<svg width="96" height="95" viewBox="0 0 96 95" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path class="tw-stroke-art-primary" d="M89.4998 48.3919C89.4998 70.5749 70.9198 88.5573 47.9998 88.5573C46.0374 88.5573 44.1068 88.4257 42.217 88.1707M6.49976 48.3919C6.49976 26.2092 25.08 8.22656 47.9998 8.22656C51.8283 8.22656 55.5353 8.72824 59.0553 9.66744" stroke-linecap="round" stroke-linejoin="round"/>
-  <path class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M5.47085 67.8617C2.60335 61.9801 1 55.4075 1 48.4729C1 23.3503 22.0426 2.98438 48 2.98438C52.3355 2.98438 56.534 3.55257 60.5205 4.61618M92.211 32.9993C94.016 37.8295 95 43.0399 95 48.4729C95 73.5956 73.9575 93.9614 48 93.9614C45.7775 93.9614 43.5911 93.8119 41.4508 93.5235" />
-  <path class="tw-fill-art-primary" d="M20.8242 84.8672C20.8242 84.3149 20.3765 83.8672 19.8242 83.8672C19.2719 83.8672 18.8242 84.3149 18.8242 84.8672H20.8242ZM18.8242 87.2442C18.8242 87.7965 19.2719 88.2442 19.8242 88.2442C20.3765 88.2442 20.8242 87.7965 20.8242 87.2442H18.8242ZM18.8242 84.1908C18.8242 84.7431 19.2719 85.1908 19.8242 85.1908C20.3765 85.1908 20.8242 84.7431 20.8242 84.1908H18.8242ZM20.8242 83.8516C20.8242 83.2993 20.3765 82.8516 19.8242 82.8516C19.2719 82.8516 18.8242 83.2993 18.8242 83.8516H20.8242ZM26.7882 76.042C26.7882 72.0015 23.7427 68.5898 19.8238 68.5898V70.5898C22.4931 70.5898 24.7882 72.9552 24.7882 76.042H26.7882ZM19.8238 68.5898C15.9049 68.5898 12.8594 72.0015 12.8594 76.042H14.8594C14.8594 72.9552 17.1545 70.5898 19.8238 70.5898V68.5898ZM11.5 77.0391H28.1475V75.0391H11.5V77.0391ZM28.1475 77.0391C28.4548 77.0391 28.6475 77.2719 28.6475 77.4908H30.6475C30.6475 76.1062 29.4972 75.0391 28.1475 75.0391V77.0391ZM28.6475 77.4908V90.5469H30.6475V77.4908H28.6475ZM28.6475 90.5469C28.6475 90.7658 28.4548 90.9987 28.1475 90.9987V92.9987C29.4972 92.9987 30.6475 91.9315 30.6475 90.5469H28.6475ZM28.1475 90.9987H11.5V92.9987H28.1475V90.9987ZM11.5 90.9987C11.1928 90.9987 11 90.7658 11 90.5469H9C9 91.9315 10.1504 92.9987 11.5 92.9987V90.9987ZM11 90.5469V77.4908H9V90.5469H11ZM11 77.4908C11 77.2719 11.1928 77.0391 11.5 77.0391V75.0391C10.1504 75.0391 9 76.1062 9 77.4908H11ZM18.8242 84.8672V87.2442H20.8242V84.8672H18.8242ZM20.8242 84.1908V83.8516H18.8242V84.1908H20.8242Z"/>
-  <path class="tw-stroke-art-primary" d="M36 64L37 63" stroke-width="2" stroke-linecap="round"/>
-  <path class="tw-stroke-art-primary" d="M29.9998 69.9995L30.9998 68.9995" stroke-width="2" stroke-linecap="round"/>
-  <path class="tw-stroke-art-primary" d="M40.0174 51.8491L33 48.7544L61.5083 33L56.6108 58.4604L48.4968 55.4359L44.2571 60.2185V53.8888L55.5873 40.8772" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <mask id="path-7-inside-1_752_3985" fill="white">
-  <path d="M94 17.5C94 26.6127 86.6127 34 77.5 34C68.3873 34 61 26.6127 61 17.5C61 8.3873 68.3873 1 77.5 1C86.6127 1 94 8.3873 94 17.5Z"/>
-  </mask>
-  <path style="fill: rgb(var(--color-success-600) / 1)"  d="M70.7244 19.4372C70.3435 19.0372 69.7106 19.0218 69.3106 19.4027C68.9107 19.7836 68.8953 20.4166 69.2761 20.8165L70.7244 19.4372ZM74.6431 25.0018L73.919 25.6915C74.1205 25.9031 74.4046 26.016 74.6964 26.0004C74.9882 25.9848 75.2586 25.8424 75.4365 25.6105L74.6431 25.0018ZM69.2761 20.8165L73.919 25.6915L75.3673 24.3122L70.7244 19.4372L69.2761 20.8165ZM75.4365 25.6105L85.7937 12.1105L84.2069 10.8931L73.8497 24.3931L75.4365 25.6105ZM92 17.5C92 25.5081 85.5081 32 77.5 32V36C87.7173 36 96 27.7173 96 17.5H92ZM77.5 32C69.4919 32 63 25.5081 63 17.5H59C59 27.7173 67.2827 36 77.5 36V32ZM63 17.5C63 9.49187 69.4919 3 77.5 3V-1C67.2827 -1 59 7.28273 59 17.5H63ZM77.5 3C85.5081 3 92 9.49187 92 17.5H96C96 7.28273 87.7173 -1 77.5 -1V3Z" mask="url(#path-7-inside-1_752_3985)"/>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="5 4 87 87">
+    <path class="tw-fill-illustration-bg-primary" d="M90 48c0 23.196-18.804 42-42 42S6 71.196 6 48 24.804 6 48 6s42 18.804 42 42Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M48 7C25.356 7 7 25.356 7 48s18.356 41 41 41 41-18.356 41-41S70.644 7 48 7ZM5 48C5 24.252 24.252 5 48 5s43 19.252 43 43-19.252 43-43 43S5 71.748 5 48Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M11 72a3 3 0 0 1 3-3h14a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3H14a3 3 0 0 1-3-3V72Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M28 71H14a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V72a1 1 0 0 0-1-1Zm-14-2a3 3 0 0 0-3 3v10a3 3 0 0 0 3 3h14a3 3 0 0 0 3-3V72a3 3 0 0 0-3-3H14Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M20 75a1 1 0 1 1 2 0v4a1 1 0 1 1-2 0v-4Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M16 68a5 5 0 0 1 10 0v1h-2v-1a3 3 0 1 0-6 0v1h-2v-1Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M92 16c0 6.627-5.373 12-12 12s-12-5.373-12-12S73.373 4 80 4s12 5.373 12 12Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M80 26c5.523 0 10-4.477 10-10S85.523 6 80 6s-10 4.477-10 10 4.477 10 10 10Zm0 2c6.627 0 12-5.373 12-12S86.627 4 80 4 68 9.373 68 16s5.373 12 12 12Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M85.707 12.293a1 1 0 0 1 0 1.414l-7 7a1 1 0 0 1-1.414 0l-3-3a1 1 0 0 1 1.414-1.414L78 18.586l6.293-6.293a1 1 0 0 1 1.414 0Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M43 60.883V52l7 4-5.052 5.63A1.117 1.117 0 0 1 43 60.882Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="m42 50.276 9.571 5.47-5.878 6.55A2.117 2.117 0 0 1 42 60.884V50.276Zm2 3.447v7.16a.117.117 0 0 0 .204.078l4.225-4.708L44 53.723Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M31.186 44.957 58.6 32.123a1.5 1.5 0 0 1 2.128 1.513l-2.763 26.793a1.5 1.5 0 0 1-2.366 1.066L42.3 51.965l-11.018-4.25c-1.233-.476-1.293-2.198-.096-2.758Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M59.733 33.533a.5.5 0 0 0-.709-.504L31.61 45.862a.5.5 0 0 0 .032.92l10.42 4.02 8.341-8.106a1 1 0 1 1 1.394 1.434l-7.942 7.719 12.327 8.833a.5.5 0 0 0 .788-.356l2.764-26.793Zm-17.912 19.32-10.899-4.206c-2.054-.793-2.154-3.663-.16-4.596l27.414-12.834c1.76-.824 3.746.588 3.547 2.521L58.96 60.532c-.197 1.909-2.383 2.893-3.943 1.775l-13.196-9.455Z" clip-rule="evenodd"/>
   </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/admin-console.ts b/libs/assets/src/svg/svgs/admin-console.ts
index 596822dde57..83c8cf9f0e1 100644
--- a/libs/assets/src/svg/svgs/admin-console.ts
+++ b/libs/assets/src/svg/svgs/admin-console.ts
@@ -1,7 +1,17 @@
 import { svgIcon } from "../icon-service";
 
 const AdminConsoleLogo = svgIcon`
-    <svg xmlns="http://www.w3.org/2000/svg" width="200" height="46" fill="none"><g class="tw-fill-text-alt2" clip-path="url(#admin-console-logo-clip)"><path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/><path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM92.66 45.44l3.974-10.782h1.37l3.959 10.782h-1.371l-.986-2.773h-4.59l-1 2.773H92.66Zm2.742-3.82h3.82l-1.91-5.33-1.91 5.33ZM106.533 45.624c-.76 0-1.427-.174-2.002-.523a3.634 3.634 0 0 1-1.325-1.433c-.308-.606-.462-1.294-.462-2.064s.159-1.453.478-2.048a3.523 3.523 0 0 1 1.324-1.417c.565-.35 1.232-.524 2.002-.524.627 0 1.181.129 1.664.385.482.257.857.616 1.124 1.078V34.35h1.294v11.09h-1.171l-.123-1.264c-.246.37-.6.704-1.063 1.002-.462.297-1.042.446-1.74.446Zm.139-1.124c.513 0 .965-.118 1.355-.354.4-.247.709-.586.924-1.017.226-.431.339-.934.339-1.51 0-.574-.113-1.077-.339-1.509a2.356 2.356 0 0 0-.924-1c-.39-.247-.842-.37-1.355-.37-.503 0-.955.123-1.356.37-.39.235-.698.57-.924 1-.215.432-.323.935-.323 1.51s.108 1.078.323 1.51c.226.43.534.77.924 1.016.401.236.853.354 1.356.354ZM112.739 45.44V37.8h1.171l.092 1.109c.246-.41.575-.729.986-.955.41-.226.872-.339 1.386-.339.606 0 1.124.123 1.555.37.442.246.781.621 1.017 1.124a2.943 2.943 0 0 1 1.094-1.093c.472-.267.98-.4 1.524-.4.914 0 1.643.276 2.187.83.545.545.817 1.387.817 2.527v4.467h-1.279v-4.328c0-.791-.159-1.387-.477-1.787-.318-.4-.775-.6-1.371-.6-.616 0-1.129.24-1.54.723-.4.472-.601 1.15-.601 2.033v3.959h-1.293v-4.328c0-.791-.16-1.387-.478-1.787-.318-.4-.775-.6-1.371-.6-.606 0-1.114.24-1.525.723-.4.472-.6 1.15-.6 2.033v3.959h-1.294ZM127.302 36.106a.908.908 0 0 1-.647-.247.909.909 0 0 1-.246-.647c0-.246.082-.451.246-.616a.908.908 0 0 1 .647-.246.89.89 0 0 1 .632.246c.174.165.261.37.261.617a.88.88 0 0 1-.261.646.89.89 0 0 1-.632.247Zm-.647 9.334V37.8h1.294v7.64h-1.294ZM130.202 45.44V37.8h1.17l.077 1.37a2.779 2.779 0 0 1 1.063-1.139 2.994 2.994 0 0 1 1.571-.416c.904 0 1.622.277 2.156.832.545.544.817 1.386.817 2.526v4.467h-1.294v-4.328c0-1.592-.657-2.388-1.972-2.388-.657 0-1.206.242-1.648.724-.431.472-.647 1.15-.647 2.033v3.959h-1.293ZM147.897 45.624c-1.057 0-1.971-.23-2.741-.693a4.804 4.804 0 0 1-1.771-1.956c-.421-.842-.632-1.817-.632-2.926 0-1.099.211-2.064.632-2.896.421-.842 1.011-1.499 1.771-1.971.77-.473 1.684-.709 2.741-.709 1.233 0 2.234.298 3.004.894.78.585 1.278 1.406 1.494 2.464h-1.433c-.164-.668-.503-1.202-1.016-1.602-.503-.41-1.186-.616-2.049-.616-.77 0-1.442.18-2.017.539-.575.35-1.022.857-1.34 1.525-.308.657-.462 1.448-.462 2.372 0 .924.154 1.72.462 2.387.318.657.765 1.166 1.34 1.525.575.349 1.247.523 2.017.523.863 0 1.546-.195 2.049-.585.513-.4.852-.929 1.016-1.586h1.433c-.216 1.037-.714 1.848-1.494 2.433-.77.586-1.771.878-3.004.878ZM157.658 45.624c-.719 0-1.366-.164-1.941-.493a3.62 3.62 0 0 1-1.37-1.386c-.329-.606-.493-1.314-.493-2.125 0-.811.169-1.515.508-2.11a3.602 3.602 0 0 1 1.371-1.402 3.924 3.924 0 0 1 1.956-.493c.719 0 1.366.164 1.941.493a3.497 3.497 0 0 1 1.355 1.402c.339.595.508 1.299.508 2.11 0 .81-.169 1.52-.508 2.125a3.598 3.598 0 0 1-1.386 1.386c-.575.329-1.222.493-1.941.493Zm0-1.109c.442 0 .852-.108 1.232-.323.38-.216.688-.54.924-.97.237-.432.355-.966.355-1.602 0-.637-.118-1.17-.355-1.602-.226-.431-.528-.755-.908-.97a2.428 2.428 0 0 0-1.217-.324c-.442 0-.852.108-1.232.324-.38.215-.688.539-.924.97-.237.431-.355.965-.355 1.602 0 .636.118 1.17.355 1.602.236.43.539.754.908.97.38.215.786.323 1.217.323ZM163.292 45.44V37.8h1.171l.077 1.37a2.77 2.77 0 0 1 1.062-1.139 2.994 2.994 0 0 1 1.571-.416c.904 0 1.623.277 2.157.832.544.544.816 1.386.816 2.526v4.467h-1.294v-4.328c0-1.592-.657-2.388-1.971-2.388-.657 0-1.207.242-1.648.724-.431.472-.647 1.15-.647 2.033v3.959h-1.294ZM175.033 45.624c-.914 0-1.674-.23-2.28-.693-.606-.462-.96-1.088-1.063-1.879h1.325c.082.4.293.75.631 1.047.35.288.817.432 1.402.432.544 0 .945-.113 1.201-.34.257-.235.385-.513.385-.83 0-.463-.169-.77-.508-.925-.328-.154-.796-.293-1.401-.416a7.95 7.95 0 0 1-1.233-.354 2.866 2.866 0 0 1-1.032-.647c-.277-.287-.415-.662-.415-1.124 0-.668.246-1.212.739-1.633.503-.431 1.181-.647 2.033-.647.811 0 1.473.206 1.987.616.524.4.826.976.909 1.725h-1.279c-.051-.39-.221-.693-.508-.908-.277-.226-.652-.34-1.124-.34-.462 0-.822.098-1.079.293a.935.935 0 0 0-.369.77c0 .309.159.55.477.724.329.175.77.324 1.325.447.472.103.919.231 1.34.385.431.144.78.365 1.047.662.277.288.416.709.416 1.263.01.688-.252 1.258-.786 1.71-.523.441-1.237.662-2.14.662ZM183.288 45.624c-.719 0-1.366-.164-1.941-.493a3.627 3.627 0 0 1-1.37-1.386c-.329-.606-.493-1.314-.493-2.125 0-.811.169-1.515.508-2.11a3.602 3.602 0 0 1 1.371-1.402 3.924 3.924 0 0 1 1.956-.493c.719 0 1.366.164 1.941.493a3.497 3.497 0 0 1 1.355 1.402c.339.595.508 1.299.508 2.11 0 .81-.169 1.52-.508 2.125a3.598 3.598 0 0 1-1.386 1.386c-.575.329-1.222.493-1.941.493Zm0-1.109c.442 0 .852-.108 1.232-.323.38-.216.688-.54.924-.97.237-.432.355-.966.355-1.602 0-.637-.118-1.17-.355-1.602a2.307 2.307 0 0 0-.908-.97 2.428 2.428 0 0 0-1.217-.324c-.442 0-.852.108-1.232.324-.38.215-.688.539-.924.97-.237.431-.355.965-.355 1.602 0 .636.118 1.17.355 1.602.236.43.539.754.908.97.38.215.786.323 1.217.323ZM188.922 45.44V34.35h1.294v11.09h-1.294ZM195.771 45.624c-.729 0-1.376-.164-1.941-.493a3.673 3.673 0 0 1-1.34-1.401c-.318-.596-.477-1.3-.477-2.11 0-.801.159-1.5.477-2.095a3.427 3.427 0 0 1 1.325-1.401c.575-.34 1.237-.509 1.987-.509.739 0 1.376.17 1.91.508.544.33.96.766 1.247 1.31a3.697 3.697 0 0 1 .416 2.094v.385h-6.084c.031.586.165 1.073.401 1.464a2.5 2.5 0 0 0 .909.862c.369.195.759.293 1.17.293.534 0 .981-.123 1.34-.37.359-.246.621-.58.786-1.001h1.278a3.47 3.47 0 0 1-1.186 1.771c-.575.462-1.314.693-2.218.693Zm0-6.915c-.616 0-1.165.19-1.648.57-.472.37-.744.913-.816 1.632h4.805c-.031-.688-.267-1.227-.708-1.617-.442-.39-.986-.585-1.633-.585Z"/></g><defs><clipPath id="admin-console-logo-clip"><path class="tw-fill-text-alt2" d="M0 0h200v46H0z"/></clipPath></defs></svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 200 46">
+    <g class="tw-fill-text-alt2" clip-path="url(#admin-console-logo-clip)">
+      <path d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217a14.66 14.66 0 0 0 2.103-.578c.471-.18.979.18.979.687a.74.74 0 0 1-.472.686 12.46 12.46 0 0 1-2.465.723c-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/>
+      <path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM92.66 45.44l3.974-10.782h1.37l3.959 10.782h-1.371l-.986-2.773h-4.59l-1 2.773H92.66Zm2.742-3.82h3.82l-1.91-5.33-1.91 5.33Zm11.131 4.004c-.76 0-1.427-.174-2.002-.523a3.634 3.634 0 0 1-1.325-1.433c-.308-.606-.462-1.294-.462-2.064s.159-1.453.478-2.048a3.523 3.523 0 0 1 1.324-1.417c.565-.35 1.232-.524 2.002-.524.627 0 1.181.129 1.664.385a2.78 2.78 0 0 1 1.124 1.078V34.35h1.294v11.09h-1.171l-.123-1.264c-.246.37-.6.704-1.063 1.002-.462.297-1.042.446-1.74.446Zm.139-1.124c.513 0 .965-.118 1.355-.354.4-.247.709-.586.924-1.017.226-.431.339-.934.339-1.51 0-.574-.113-1.077-.339-1.509a2.356 2.356 0 0 0-.924-1c-.39-.247-.842-.37-1.355-.37-.503 0-.955.123-1.356.37-.39.235-.698.57-.924 1-.215.432-.323.935-.323 1.51s.108 1.078.323 1.51c.226.43.534.77.924 1.016.401.236.853.354 1.356.354Zm6.067.94V37.8h1.171l.092 1.109a2.59 2.59 0 0 1 .986-.955c.41-.226.872-.339 1.386-.339.606 0 1.124.123 1.555.37.442.246.781.621 1.017 1.124a2.943 2.943 0 0 1 1.094-1.093c.472-.267.98-.4 1.524-.4.914 0 1.643.276 2.187.83.545.545.817 1.387.817 2.527v4.467h-1.279v-4.328c0-.791-.159-1.387-.477-1.787-.318-.4-.775-.6-1.371-.6-.616 0-1.129.24-1.54.723-.4.472-.601 1.15-.601 2.033v3.959h-1.293v-4.328c0-.791-.16-1.387-.478-1.787-.318-.4-.775-.6-1.371-.6-.606 0-1.114.24-1.525.723-.4.472-.6 1.15-.6 2.033v3.959h-1.294Zm14.563-9.334a.908.908 0 0 1-.647-.247.909.909 0 0 1-.246-.647c0-.246.082-.451.246-.616a.908.908 0 0 1 .647-.246.89.89 0 0 1 .632.246c.174.165.261.37.261.617a.88.88 0 0 1-.261.646.89.89 0 0 1-.632.247Zm-.647 9.334V37.8h1.294v7.64h-1.294Zm3.547 0V37.8h1.17l.077 1.37a2.779 2.779 0 0 1 1.063-1.139 2.994 2.994 0 0 1 1.571-.416c.904 0 1.622.277 2.156.832.545.544.817 1.386.817 2.526v4.467h-1.294v-4.328c0-1.592-.657-2.388-1.972-2.388-.657 0-1.206.242-1.648.724-.431.472-.647 1.15-.647 2.033v3.959h-1.293Zm17.695.184c-1.057 0-1.971-.23-2.741-.693a4.804 4.804 0 0 1-1.771-1.956c-.421-.842-.632-1.817-.632-2.926 0-1.099.211-2.064.632-2.896.421-.842 1.011-1.499 1.771-1.971.77-.473 1.684-.709 2.741-.709 1.233 0 2.234.298 3.004.894.78.585 1.278 1.406 1.494 2.464h-1.433c-.164-.668-.503-1.202-1.016-1.602-.503-.41-1.186-.616-2.049-.616-.77 0-1.442.18-2.017.539-.575.35-1.022.857-1.34 1.525-.308.657-.462 1.448-.462 2.372 0 .924.154 1.72.462 2.387.318.657.765 1.166 1.34 1.525.575.349 1.247.523 2.017.523.863 0 1.546-.195 2.049-.585.513-.4.852-.929 1.016-1.586h1.433c-.216 1.037-.714 1.848-1.494 2.433-.77.586-1.771.878-3.004.878Zm9.761 0c-.719 0-1.366-.164-1.941-.493a3.62 3.62 0 0 1-1.37-1.386c-.329-.606-.493-1.314-.493-2.125 0-.811.169-1.515.508-2.11a3.602 3.602 0 0 1 1.371-1.402 3.924 3.924 0 0 1 1.956-.493c.719 0 1.366.164 1.941.493a3.497 3.497 0 0 1 1.355 1.402c.339.595.508 1.299.508 2.11 0 .81-.169 1.52-.508 2.125a3.598 3.598 0 0 1-1.386 1.386c-.575.329-1.222.493-1.941.493Zm0-1.109a2.46 2.46 0 0 0 1.232-.323c.38-.216.688-.54.924-.97.237-.432.355-.966.355-1.602 0-.637-.118-1.17-.355-1.602-.226-.431-.528-.755-.908-.97a2.428 2.428 0 0 0-1.217-.324 2.45 2.45 0 0 0-1.232.324c-.38.215-.688.539-.924.97-.237.431-.355.965-.355 1.602 0 .636.118 1.17.355 1.602.236.43.539.754.908.97.38.215.786.323 1.217.323Zm5.634.925V37.8h1.171l.077 1.37a2.77 2.77 0 0 1 1.062-1.139 2.994 2.994 0 0 1 1.571-.416c.904 0 1.623.277 2.157.832.544.544.816 1.386.816 2.526v4.467h-1.294v-4.328c0-1.592-.657-2.388-1.971-2.388-.657 0-1.207.242-1.648.724-.431.472-.647 1.15-.647 2.033v3.959h-1.294Zm11.741.184c-.914 0-1.674-.23-2.28-.693-.606-.462-.96-1.088-1.063-1.879h1.325c.082.4.293.75.631 1.047.35.288.817.432 1.402.432.544 0 .945-.113 1.201-.34.257-.235.385-.513.385-.83 0-.463-.169-.77-.508-.925-.328-.154-.796-.293-1.401-.416a7.95 7.95 0 0 1-1.233-.354 2.866 2.866 0 0 1-1.032-.647c-.277-.287-.415-.662-.415-1.124 0-.668.246-1.212.739-1.633.503-.431 1.181-.647 2.033-.647.811 0 1.473.206 1.987.616.524.4.826.976.909 1.725h-1.279c-.051-.39-.221-.693-.508-.908-.277-.226-.652-.34-1.124-.34-.462 0-.822.098-1.079.293a.935.935 0 0 0-.369.77c0 .309.159.55.477.724.329.175.77.324 1.325.447.472.103.919.231 1.34.385.431.144.78.365 1.047.662.277.288.416.709.416 1.263.01.688-.252 1.258-.786 1.71-.523.441-1.237.662-2.14.662Zm8.255 0c-.719 0-1.366-.164-1.941-.493a3.627 3.627 0 0 1-1.37-1.386c-.329-.606-.493-1.314-.493-2.125 0-.811.169-1.515.508-2.11a3.602 3.602 0 0 1 1.371-1.402 3.924 3.924 0 0 1 1.956-.493c.719 0 1.366.164 1.941.493a3.497 3.497 0 0 1 1.355 1.402c.339.595.508 1.299.508 2.11 0 .81-.169 1.52-.508 2.125a3.598 3.598 0 0 1-1.386 1.386c-.575.329-1.222.493-1.941.493Zm0-1.109a2.46 2.46 0 0 0 1.232-.323c.38-.216.688-.54.924-.97.237-.432.355-.966.355-1.602 0-.637-.118-1.17-.355-1.602a2.307 2.307 0 0 0-.908-.97 2.428 2.428 0 0 0-1.217-.324 2.45 2.45 0 0 0-1.232.324c-.38.215-.688.539-.924.97-.237.431-.355.965-.355 1.602 0 .636.118 1.17.355 1.602.236.43.539.754.908.97.38.215.786.323 1.217.323Zm5.634.925V34.35h1.294v11.09h-1.294Zm6.849.184c-.729 0-1.376-.164-1.941-.493a3.673 3.673 0 0 1-1.34-1.401c-.318-.596-.477-1.3-.477-2.11 0-.801.159-1.5.477-2.095a3.427 3.427 0 0 1 1.325-1.401c.575-.34 1.237-.509 1.987-.509.739 0 1.376.17 1.91.508.544.33.96.766 1.247 1.31a3.697 3.697 0 0 1 .416 2.094v.385h-6.084c.031.586.165 1.073.401 1.464a2.5 2.5 0 0 0 .909.862 2.47 2.47 0 0 0 1.17.293c.534 0 .981-.123 1.34-.37a2.12 2.12 0 0 0 .786-1.001h1.278a3.47 3.47 0 0 1-1.186 1.771c-.575.462-1.314.693-2.218.693Zm0-6.915c-.616 0-1.165.19-1.648.57-.472.37-.744.913-.816 1.632h4.805c-.031-.688-.267-1.227-.708-1.617-.442-.39-.986-.585-1.633-.585Z"/>
+    </g>
+    <defs>
+      <clipPath id="admin-console-logo-clip">
+        <path d="M0 0h200v46H0z" class="tw-fill-text-alt2"/>
+      </clipPath>
+    </defs>
+  </svg> 
 `;
 
 export default AdminConsoleLogo;
diff --git a/libs/assets/src/svg/svgs/bitwarden-icon.ts b/libs/assets/src/svg/svgs/bitwarden-icon.ts
index 710d20937bd..2f88b38043c 100644
--- a/libs/assets/src/svg/svgs/bitwarden-icon.ts
+++ b/libs/assets/src/svg/svgs/bitwarden-icon.ts
@@ -3,18 +3,18 @@ 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"/>
-  <mask id="mask0_11934_25684" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="3" y="3" width="14" height="14">
-  <path d="M17 3H3V17H17V3Z" fill="white"/>
-  </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"/>
-  </g>
+    <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"/>
+      <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"/>
+    </g>
   </g>
   <defs>
-  <clipPath id="clip0_11934_25684">
-  <rect width="20" height="20" fill="white"/>
-  </clipPath>
+    <clipPath id="clip0_11934_25684">
+      <rect width="20" height="20" class="tw-fill-text-alt2"/>
+    </clipPath>
   </defs>
 </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/browser-extension.ts b/libs/assets/src/svg/svgs/browser-extension.ts
index 4e3b54e77cd..c15a536c007 100644
--- a/libs/assets/src/svg/svgs/browser-extension.ts
+++ b/libs/assets/src/svg/svgs/browser-extension.ts
@@ -1,17 +1,18 @@
 import { svgIcon } from "../icon-service";
 
 export const BrowserExtensionIcon = svgIcon`
-<svg class="tw-max-w-full" width="115" height="114" viewBox="0 0 115 114" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <rect class="tw-stroke-art-primary" width="107.16" height="70.68" rx="10" transform="matrix(-1 0 0 1 111.08 21.66)" stroke-width="4"/>
-  <rect class="tw-stroke-art-accent" x="77.88" y="36.91" width="24.79" height="33.34" rx="5" stroke-width="2"/>
-  <rect class="tw-fill-art-primary" x="97.97" y="25.65" width="5.7" height="5.7" rx="2" />
-  <path class="tw-fill-art-accent" d="M96.9272 52.2068L96.9822 50.6928L95.7022 51.5048L95.3718 50.9267L96.7207 50.2248L95.3718 49.5228L95.7022 48.9447L96.9822 49.7568L96.9272 48.2427H97.5879L97.5328 49.7568L98.8129 48.9447L99.1432 49.5228L97.7943 50.2248L99.1432 50.9267L98.8129 51.5048L97.5328 50.6928L97.5879 52.2068H96.9272Z" />
-  <path class="tw-fill-art-accent" d="M92.0822 52.2068L92.1373 50.6928L90.8572 51.5048L90.5269 50.9267L91.8757 50.2248L90.5269 49.5228L90.8572 48.9447L92.1373 49.7568L92.0822 48.2427H92.7429L92.6878 49.7568L93.9679 48.9447L94.2982 49.5228L92.9494 50.2248L94.2982 50.9267L93.9679 51.5048L92.6878 50.6928L92.7429 52.2068H92.0822Z" />
-  <path class="tw-fill-art-accent" d="M87.2371 52.2068L87.2922 50.6928L86.0121 51.5048L85.6818 50.9267L87.0307 50.2248L85.6818 49.5228L86.0121 48.9447L87.2922 49.7568L87.2371 48.2427H87.8978L87.8427 49.7568L89.1228 48.9447L89.4532 49.5228L88.1043 50.2248L89.4532 50.9267L89.1228 51.5048L87.8427 50.6928L87.8978 52.2068H87.2371Z" />
-  <path class="tw-fill-art-accent" d="M82.3921 52.2068L82.4472 50.6928L81.1671 51.5048L80.8368 50.9267L82.1857 50.2248L80.8368 49.5228L81.1671 48.9447L82.4472 49.7568L82.3921 48.2427H83.0528L82.9978 49.7568L84.2778 48.9447L84.6082 49.5228L83.2593 50.2248L84.6082 50.9267L84.2778 51.5048L82.9978 50.6928L83.0528 52.2068H82.3921Z" />
-  <path class="tw-stroke-art-primary" d="M25.58 29.07V28.5" stroke-width="4" stroke-linecap="round"/>
-  <path class="tw-stroke-art-primary" d="M18.74 29.07V28.5" stroke-width="4" stroke-linecap="round"/>
-  <path class="tw-stroke-art-primary" d="M11.9 29.07V28.5" stroke-width="4" stroke-linecap="round"/>
-  <path class="tw-stroke-art-primary" d="M110.51 33.6054H4.49" stroke-width="2"/>
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 14.58 100 75">
+    <path class="tw-fill-illustration-bg-secondary" d="M0 20.833a6.25 6.25 0 0 1 6.25-6.25h87.5a6.25 6.25 0 0 1 6.25 6.25v62.5a6.25 6.25 0 0 1-6.25 6.25H6.25A6.25 6.25 0 0 1 0 83.333v-62.5Z"/>
+    <path class="tw-fill-illustration-tertiary" d="M14.583 52.084a4.167 4.167 0 0 1 4.167-4.167h65.625a4.167 4.167 0 0 1 4.166 4.167v6.25a4.167 4.167 0 0 1-4.166 4.166H18.75a4.167 4.167 0 0 1-4.167-4.166v-6.25Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M84.375 50H18.75c-1.15 0-2.084.933-2.084 2.084v6.25c0 1.15.933 2.083 2.084 2.083h65.625c1.15 0 2.083-.933 2.083-2.083v-6.25c0-1.15-.933-2.084-2.083-2.084ZM18.75 47.917a4.167 4.167 0 0 0-4.167 4.167v6.25A4.167 4.167 0 0 0 18.75 62.5h65.625a4.167 4.167 0 0 0 4.166-4.166v-6.25a4.167 4.167 0 0 0-4.166-4.167H18.75Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M33.339 51.638c.575 0 1.041.466 1.041 1.041v1.458l1.366-.447a1.042 1.042 0 0 1 .649 1.98l-1.385.453.868 1.215a1.042 1.042 0 0 1-1.696 1.211l-.843-1.182-.844 1.182a1.042 1.042 0 1 1-1.696-1.21l.868-1.216-1.386-.453a1.042 1.042 0 0 1 .649-1.98l1.367.447V52.68c0-.575.466-1.041 1.042-1.041ZM22.922 51.638c.575 0 1.041.466 1.041 1.041v1.458l1.366-.447a1.042 1.042 0 0 1 .649 1.98l-1.385.453.868 1.215a1.042 1.042 0 0 1-1.695 1.211l-.844-1.182-.844 1.182a1.042 1.042 0 1 1-1.696-1.21l.868-1.216-1.386-.453a1.042 1.042 0 0 1 .649-1.98l1.367.447V52.68c0-.575.466-1.041 1.042-1.041ZM54.172 51.638c.575 0 1.041.466 1.041 1.041v1.458l1.366-.447a1.042 1.042 0 0 1 .649 1.98l-1.385.453.868 1.215a1.042 1.042 0 0 1-1.695 1.211l-.844-1.182-.844 1.182a1.042 1.042 0 1 1-1.696-1.21l.868-1.216-1.386-.453a1.042 1.042 0 0 1 .649-1.98l1.367.447V52.68c0-.575.466-1.041 1.041-1.041ZM43.755 51.638c.575 0 1.041.466 1.041 1.041v1.458l1.366-.447a1.042 1.042 0 0 1 .649 1.98l-1.385.453.868 1.215a1.042 1.042 0 0 1-1.695 1.211l-.844-1.182-.844 1.182a1.042 1.042 0 1 1-1.696-1.21l.868-1.216-1.386-.453a1.042 1.042 0 0 1 .649-1.98l1.367.447V52.68c0-.575.466-1.041 1.041-1.041Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M0 20.833a6.25 6.25 0 0 1 6.25-6.25h87.5a6.25 6.25 0 0 1 6.25 6.25v62.5a6.25 6.25 0 0 1-6.25 6.25H6.25A6.25 6.25 0 0 1 0 83.333v-62.5Zm6.25-4.167h87.5a4.167 4.167 0 0 1 4.167 4.167v2.083H2.083v-2.083a4.167 4.167 0 0 1 4.167-4.167ZM2.083 25v58.333A4.167 4.167 0 0 0 6.25 87.5h87.5a4.167 4.167 0 0 0 4.167-4.167V25H2.083Z" clip-rule="evenodd"/>
+    <circle class="tw-fill-illustration-outline" cx="6.771" cy="19.885" r="1.563"/>
+    <circle class="tw-fill-illustration-outline" cx="11.423" cy="19.885" r="1.563"/>
+    <circle class="tw-fill-illustration-outline" cx="16.145" cy="19.885" r="1.563"/>
+    <path class="tw-fill-illustration-bg-primary" d="M62.108 33.334a4.167 4.167 0 0 1 4.167-4.167h23.282a4.167 4.167 0 0 1 4.166 4.167v39.583a4.167 4.167 0 0 1-4.166 4.167H66.275a4.167 4.167 0 0 1-4.167-4.167V33.334Z"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M88.942 44.86c0 .575-.467 1.042-1.042 1.042H67.872a1.042 1.042 0 0 1 0-2.084H87.9c.575 0 1.042.467 1.042 1.042ZM88.942 51.062c0 .576-.467 1.042-1.042 1.042H67.872a1.042 1.042 0 0 1 0-2.083H87.9c.575 0 1.042.466 1.042 1.041ZM87.9 58.306a1.042 1.042 0 0 0 0-2.083H67.872a1.042 1.042 0 0 0 0 2.083H87.9ZM88.942 63.542c0 .576-.467 1.042-1.042 1.042H67.872a1.042 1.042 0 0 1 0-2.083H87.9c.575 0 1.042.466 1.042 1.041ZM87.9 70.975a1.042 1.042 0 1 0 0-2.083H67.872a1.042 1.042 0 0 0 0 2.083H87.9Z"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M62.135 33.334a4.167 4.167 0 0 1 4.166-4.167h23.282a4.167 4.167 0 0 1 4.167 4.167v2.083H62.135v-2.083Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M66.275 27.084a6.25 6.25 0 0 0-6.25 6.25v39.583a6.25 6.25 0 0 0 6.25 6.25h23.282a6.25 6.25 0 0 0 6.25-6.25V37.501h.026v-4.167a6.25 6.25 0 0 0-6.25-6.25H66.275ZM62.11 37.501v35.416a4.167 4.167 0 0 0 4.166 4.167h23.282a4.167 4.167 0 0 0 4.167-4.167V37.501H62.109Zm27.448-8.334a4.167 4.167 0 0 1 4.167 4.167v2.083h-31.59v-2.083a4.167 4.167 0 0 1 4.167-4.167h23.256Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/business-unit-portal.ts b/libs/assets/src/svg/svgs/business-unit-portal.ts
index bae5ebada6a..db3a6b8ef4f 100644
--- a/libs/assets/src/svg/svgs/business-unit-portal.ts
+++ b/libs/assets/src/svg/svgs/business-unit-portal.ts
@@ -1,7 +1,17 @@
 import { svgIcon } from "../icon-service";
 
 const BusinessUnitPortalLogo = svgIcon`
-    <svg xmlns="http://www.w3.org/2000/svg" width="200" height="46" fill="none"><g class="tw-fill-text-alt2" clip-path="url(#business-unit-portal-logo-clip)"><path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/><path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM198.11 45.358V34.496h1.263v10.862h-1.263ZM192.412 45.539c-.611 0-1.123-.106-1.534-.317-.411-.221-.716-.508-.917-.86a2.355 2.355 0 0 1-.301-1.162c0-.512.131-.945.391-1.297.271-.362.647-.634 1.128-.815.491-.19 1.063-.286 1.714-.286h2.015c0-.473-.075-.865-.225-1.177a1.505 1.505 0 0 0-.632-.71c-.281-.16-.621-.24-1.022-.24-.482 0-.897.12-1.248.362-.351.241-.567.598-.647 1.07h-1.293c.06-.543.24-.995.541-1.357a2.942 2.942 0 0 1 1.173-.845 3.715 3.715 0 0 1 1.474-.302c.701 0 1.283.131 1.744.393.461.251.807.608 1.038 1.07.24.453.36.987.36 1.6v4.692h-1.127l-.076-1.343c-.1.211-.23.412-.391.603a2.49 2.49 0 0 1-.541.483c-.201.13-.436.237-.706.317-.271.08-.577.12-.918.12Zm.195-1.071c.351 0 .667-.07.948-.212.291-.15.536-.352.737-.603.2-.252.351-.533.451-.845.11-.322.165-.648.165-.98v-.046h-1.909c-.482 0-.873.06-1.173.181-.301.11-.517.272-.647.483a1.25 1.25 0 0 0-.195.694c0 .272.06.508.18.71.13.19.316.341.556.452.241.11.537.166.887.166ZM187.034 45.358c-.451 0-.842-.07-1.172-.211a1.545 1.545 0 0 1-.767-.71c-.171-.341-.256-.799-.256-1.372v-4.21h-1.308v-1.07h1.308l.166-1.826h1.097v1.826h2.211v1.07h-2.211v4.21c0 .473.096.794.286.965.19.161.526.242 1.008.242h.811v1.086h-1.173ZM178.521 45.358v-7.574h1.143l.105 1.449c.17-.342.386-.634.647-.875.27-.242.591-.428.962-.558.371-.131.792-.197 1.263-.197v1.328h-.436c-.32 0-.626.045-.917.136-.291.08-.552.216-.782.407-.221.181-.396.437-.526.77-.131.331-.196.739-.196 1.221v3.893h-1.263ZM173.006 45.539a3.741 3.741 0 0 1-1.895-.483 3.625 3.625 0 0 1-1.338-1.388c-.321-.593-.481-1.292-.481-2.097 0-.805.165-1.503.496-2.097a3.525 3.525 0 0 1 1.338-1.373 3.735 3.735 0 0 1 1.91-.498c.712 0 1.348.166 1.91.498.561.322 1.002.78 1.323 1.373.321.594.481 1.292.481 2.097 0 .805-.165 1.504-.496 2.097a3.489 3.489 0 0 1-1.339 1.388c-.561.322-1.197.483-1.909.483Zm0-1.086c.441 0 .847-.106 1.218-.317a2.37 2.37 0 0 0 .887-.966c.23-.432.346-.965.346-1.599 0-.644-.11-1.177-.331-1.599-.221-.423-.516-.74-.887-.95a2.307 2.307 0 0 0-1.203-.332c-.421 0-.822.11-1.203.332a2.355 2.355 0 0 0-.902.95c-.231.422-.346.955-.346 1.599 0 .634.115 1.167.346 1.6.23.422.526.744.887.965.371.21.767.317 1.188.317ZM161.415 45.358v-10.56h3.444c.822 0 1.499.14 2.03.422.532.271.927.638 1.188 1.101.261.463.391.986.391 1.569a3.22 3.22 0 0 1-.391 1.584c-.251.463-.641.835-1.173 1.116-.531.272-1.213.408-2.045.408h-2.18v4.36h-1.264Zm1.264-5.431h2.15c.842 0 1.444-.181 1.805-.544.36-.372.541-.87.541-1.493 0-.644-.181-1.142-.541-1.494-.361-.362-.963-.543-1.805-.543h-2.15v4.074ZM154.434 45.358c-.451 0-.842-.07-1.172-.211a1.545 1.545 0 0 1-.767-.71c-.171-.341-.256-.799-.256-1.372v-4.21h-1.308v-1.07h1.308l.166-1.826h1.097v1.826h2.211v1.07h-2.211v4.21c0 .473.096.794.286.965.19.161.526.242 1.007.242h.812v1.086h-1.173ZM147.995 45.358v-7.573h1.263v7.573h-1.263Zm.631-9.203a.884.884 0 0 1-.631-.241.889.889 0 0 1-.241-.634c0-.251.08-.452.241-.603a.884.884 0 0 1 .631-.242c.241 0 .446.08.617.242.17.15.255.352.255.603a.863.863 0 0 1-.255.634.867.867 0 0 1-.617.241ZM139.24 45.358v-7.574h1.142l.076 1.328a2.64 2.64 0 0 1 1.022-1.101 2.915 2.915 0 0 1 1.534-.408c.591 0 1.103.116 1.534.347.431.232.767.589 1.007 1.072.241.482.361 1.09.361 1.825v4.51h-1.263v-4.374c0-.765-.166-1.338-.497-1.72-.33-.382-.806-.573-1.428-.573-.421 0-.802.105-1.143.316-.33.202-.596.498-.796.89-.191.393-.286.87-.286 1.434v4.028h-1.263ZM133.251 45.539a4.397 4.397 0 0 1-1.97-.438 3.357 3.357 0 0 1-1.398-1.327c-.351-.604-.527-1.373-.527-2.309v-6.668h1.263v6.684c0 .683.111 1.241.331 1.674.231.433.547.75.948.95.401.202.862.302 1.383.302.531 0 .992-.1 1.383-.301.391-.202.697-.518.918-.95.22-.434.331-.992.331-1.675v-6.684h1.263v6.668c0 .936-.176 1.705-.527 2.309a3.335 3.335 0 0 1-1.413 1.327c-.592.292-1.253.438-1.985.438ZM120.686 45.539c-.611 0-1.152-.1-1.624-.302a2.779 2.779 0 0 1-1.128-.89 2.987 2.987 0 0 1-.511-1.343h1.294c.06.262.17.508.33.74.161.221.376.397.647.528.281.13.616.196 1.007.196.361 0 .657-.05.888-.151.23-.11.4-.257.511-.438.11-.18.165-.377.165-.588 0-.302-.075-.533-.225-.694-.141-.16-.351-.287-.632-.377a6.388 6.388 0 0 0-1.008-.257c-.33-.06-.656-.14-.977-.24a3.629 3.629 0 0 1-.842-.393 1.921 1.921 0 0 1-.602-.604 1.705 1.705 0 0 1-.225-.89c0-.432.11-.814.331-1.146.23-.342.546-.609.947-.8.411-.191.897-.287 1.459-.287.802 0 1.453.197 1.954.589.512.392.808.96.888 1.704h-1.248c-.04-.382-.201-.679-.481-.89-.281-.22-.657-.331-1.128-.331-.471 0-.832.095-1.083.286a.919.919 0 0 0-.361.755.78.78 0 0 0 .196.527c.14.151.346.282.616.393.271.1.597.19.978.271.491.091.942.212 1.353.362.411.151.742.373.993.664.26.292.391.71.391 1.252.009.473-.106.885-.346 1.238-.231.351-.562.628-.993.83-.431.19-.942.286-1.534.286ZM113.138 45.539c-.611 0-1.153-.1-1.624-.302a2.77 2.77 0 0 1-1.127-.89 2.976 2.976 0 0 1-.512-1.343h1.293c.061.262.171.508.331.74.161.221.376.397.647.528.28.13.616.196 1.007.196.361 0 .657-.05.888-.151.23-.11.401-.257.511-.438.11-.18.165-.377.165-.588 0-.302-.075-.533-.225-.694-.141-.16-.351-.287-.632-.377a6.43 6.43 0 0 0-1.007-.257 8.21 8.21 0 0 1-.978-.24 3.629 3.629 0 0 1-.842-.393 1.918 1.918 0 0 1-.601-.604 1.696 1.696 0 0 1-.226-.89c0-.432.111-.814.331-1.146.231-.342.546-.609.947-.8.411-.191.897-.287 1.459-.287.802 0 1.453.197 1.955.589.511.392.807.96.887 1.704h-1.248c-.04-.382-.201-.679-.481-.89-.281-.22-.657-.331-1.128-.331-.471 0-.832.095-1.083.286a.919.919 0 0 0-.361.755.78.78 0 0 0 .196.527c.14.151.346.282.616.393.271.1.597.19.978.271.491.091.942.212 1.353.362.411.151.742.373.992.664.261.292.392.71.392 1.252.01.473-.106.885-.346 1.238-.231.351-.562.628-.993.83-.431.19-.942.286-1.534.286ZM105.073 45.539c-.702 0-1.328-.166-1.88-.498a3.56 3.56 0 0 1-1.308-1.388c-.311-.593-.466-1.287-.466-2.082 0-.805.155-1.499.466-2.082a3.456 3.456 0 0 1 1.293-1.388c.562-.332 1.203-.498 1.925-.498.742 0 1.374.166 1.895.498.521.332.917.765 1.188 1.298.28.533.421 1.121.421 1.765v.317c0 .11-.005.236-.015.377h-6.226v-.981h4.993c-.031-.694-.261-1.232-.692-1.614-.421-.392-.952-.588-1.594-.588-.421 0-.817.1-1.188.301a2.271 2.271 0 0 0-.902.845c-.221.372-.331.84-.331 1.403v.423c0 .623.115 1.146.346 1.569.23.412.526.724.887.935.371.21.767.317 1.188.317.531 0 .967-.116 1.308-.347.351-.242.607-.569.767-.98h1.248c-.13.462-.345.874-.646 1.236a3.305 3.305 0 0 1-1.128.845c-.441.211-.958.317-1.549.317ZM93.115 45.358v-7.574h1.143l.075 1.328c.24-.473.581-.84 1.022-1.101a2.917 2.917 0 0 1 1.534-.408c.592 0 1.103.116 1.534.347.431.232.767.589 1.007 1.072.241.482.361 1.09.361 1.825v4.51h-1.263v-4.374c0-.765-.165-1.338-.496-1.72-.33-.382-.807-.573-1.428-.573-.421 0-.802.105-1.143.316-.331.202-.597.498-.797.89-.19.393-.286.87-.286 1.434v4.028h-1.263ZM89.653 45.358v-7.573h1.263v7.573h-1.263Zm.631-9.203a.885.885 0 0 1-.631-.241.89.89 0 0 1-.241-.634c0-.251.08-.452.24-.603a.885.885 0 0 1 .632-.242c.24 0 .446.08.616.242.171.15.256.352.256.603a.86.86 0 0 1-.256.634.866.866 0 0 1-.616.241ZM84.826 45.539c-.611 0-1.152-.1-1.624-.302a2.778 2.778 0 0 1-1.128-.89 2.982 2.982 0 0 1-.51-1.343h1.293c.06.262.17.508.33.74.16.221.376.397.647.528.28.13.616.196 1.007.196.361 0 .657-.05.888-.151.23-.11.4-.257.51-.438.111-.18.166-.377.166-.588 0-.302-.075-.533-.226-.694-.14-.16-.35-.287-.63-.377a6.412 6.412 0 0 0-1.008-.257c-.331-.06-.657-.14-.978-.24a3.63 3.63 0 0 1-.842-.393 1.914 1.914 0 0 1-.601-.604 1.7 1.7 0 0 1-.226-.89c0-.432.11-.814.33-1.146.231-.342.547-.609.948-.8.411-.191.898-.287 1.459-.287.802 0 1.453.197 1.955.589.51.392.806.96.887 1.704h-1.248c-.04-.382-.2-.679-.481-.89-.281-.22-.657-.331-1.128-.331-.471 0-.832.095-1.083.286a.917.917 0 0 0-.36.755c0 .2.064.377.195.527.14.151.345.282.616.393.27.1.597.19.978.271.491.091.942.212 1.353.362.411.151.742.373.993.664.26.292.39.71.39 1.252.01.473-.105.885-.345 1.238-.23.351-.562.628-.993.83-.431.19-.942.286-1.534.286ZM76.101 45.539c-.581 0-1.093-.116-1.534-.347-.43-.231-.767-.589-1.007-1.071-.23-.483-.346-1.092-.346-1.826v-4.51h1.263v4.375c0 .764.165 1.337.496 1.72.331.382.802.573 1.414.573.42 0 .802-.101 1.143-.302a2.13 2.13 0 0 0 .796-.905c.2-.393.301-.87.301-1.434v-4.028h1.264v7.574h-1.144l-.075-1.328a2.71 2.71 0 0 1-1.037 1.117 3.003 3.003 0 0 1-1.534.392ZM64.379 45.358v-10.56h3.7c.741 0 1.353.12 1.834.361.49.232.857.553 1.097.966.241.402.361.855.361 1.358 0 .543-.12.995-.36 1.357-.231.362-.537.64-.918.83a3.248 3.248 0 0 1-1.188.347l.21-.15a2.525 2.525 0 0 1 2.15 1.297c.231.392.347.83.347 1.312 0 .533-.13 1.021-.391 1.464-.26.432-.647.78-1.158 1.04-.501.252-1.123.378-1.865.378H64.38Zm1.263-1.056h2.421c.712 0 1.263-.166 1.654-.498.401-.342.602-.815.602-1.418 0-.594-.206-1.067-.617-1.418-.4-.362-.957-.544-1.669-.544h-2.39v3.878Zm0-4.888h2.346c.681 0 1.198-.161 1.549-.483.36-.322.541-.76.541-1.313 0-.533-.18-.96-.541-1.282-.351-.322-.883-.483-1.594-.483h-2.3v3.56Z"/></g><defs><clipPath id="business-unit-portal-logo-clip"><path class="tw-fill-text-alt2" d="M0 0h200v46H0z"/></clipPath></defs></svg>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 46" fill="none">
+    <g class="tw-fill-text-alt2" clip-path="url(#business-unit-portal-logo-clip)">
+      <path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/>
+      <path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM198.11 45.358V34.496h1.263v10.862h-1.263ZM192.412 45.539c-.611 0-1.123-.106-1.534-.317-.411-.221-.716-.508-.917-.86a2.355 2.355 0 0 1-.301-1.162c0-.512.131-.945.391-1.297.271-.362.647-.634 1.128-.815.491-.19 1.063-.286 1.714-.286h2.015c0-.473-.075-.865-.225-1.177a1.505 1.505 0 0 0-.632-.71c-.281-.16-.621-.24-1.022-.24-.482 0-.897.12-1.248.362-.351.241-.567.598-.647 1.07h-1.293c.06-.543.24-.995.541-1.357a2.942 2.942 0 0 1 1.173-.845 3.715 3.715 0 0 1 1.474-.302c.701 0 1.283.131 1.744.393.461.251.807.608 1.038 1.07.24.453.36.987.36 1.6v4.692h-1.127l-.076-1.343c-.1.211-.23.412-.391.603a2.49 2.49 0 0 1-.541.483c-.201.13-.436.237-.706.317-.271.08-.577.12-.918.12Zm.195-1.071c.351 0 .667-.07.948-.212.291-.15.536-.352.737-.603.2-.252.351-.533.451-.845.11-.322.165-.648.165-.98v-.046h-1.909c-.482 0-.873.06-1.173.181-.301.11-.517.272-.647.483a1.25 1.25 0 0 0-.195.694c0 .272.06.508.18.71.13.19.316.341.556.452.241.11.537.166.887.166ZM187.034 45.358c-.451 0-.842-.07-1.172-.211a1.545 1.545 0 0 1-.767-.71c-.171-.341-.256-.799-.256-1.372v-4.21h-1.308v-1.07h1.308l.166-1.826h1.097v1.826h2.211v1.07h-2.211v4.21c0 .473.096.794.286.965.19.161.526.242 1.008.242h.811v1.086h-1.173ZM178.521 45.358v-7.574h1.143l.105 1.449c.17-.342.386-.634.647-.875.27-.242.591-.428.962-.558.371-.131.792-.197 1.263-.197v1.328h-.436c-.32 0-.626.045-.917.136-.291.08-.552.216-.782.407-.221.181-.396.437-.526.77-.131.331-.196.739-.196 1.221v3.893h-1.263ZM173.006 45.539a3.741 3.741 0 0 1-1.895-.483 3.625 3.625 0 0 1-1.338-1.388c-.321-.593-.481-1.292-.481-2.097 0-.805.165-1.503.496-2.097a3.525 3.525 0 0 1 1.338-1.373 3.735 3.735 0 0 1 1.91-.498c.712 0 1.348.166 1.91.498.561.322 1.002.78 1.323 1.373.321.594.481 1.292.481 2.097 0 .805-.165 1.504-.496 2.097a3.489 3.489 0 0 1-1.339 1.388c-.561.322-1.197.483-1.909.483Zm0-1.086c.441 0 .847-.106 1.218-.317a2.37 2.37 0 0 0 .887-.966c.23-.432.346-.965.346-1.599 0-.644-.11-1.177-.331-1.599-.221-.423-.516-.74-.887-.95a2.307 2.307 0 0 0-1.203-.332c-.421 0-.822.11-1.203.332a2.355 2.355 0 0 0-.902.95c-.231.422-.346.955-.346 1.599 0 .634.115 1.167.346 1.6.23.422.526.744.887.965.371.21.767.317 1.188.317ZM161.415 45.358v-10.56h3.444c.822 0 1.499.14 2.03.422.532.271.927.638 1.188 1.101.261.463.391.986.391 1.569a3.22 3.22 0 0 1-.391 1.584c-.251.463-.641.835-1.173 1.116-.531.272-1.213.408-2.045.408h-2.18v4.36h-1.264Zm1.264-5.431h2.15c.842 0 1.444-.181 1.805-.544.36-.372.541-.87.541-1.493 0-.644-.181-1.142-.541-1.494-.361-.362-.963-.543-1.805-.543h-2.15v4.074ZM154.434 45.358c-.451 0-.842-.07-1.172-.211a1.545 1.545 0 0 1-.767-.71c-.171-.341-.256-.799-.256-1.372v-4.21h-1.308v-1.07h1.308l.166-1.826h1.097v1.826h2.211v1.07h-2.211v4.21c0 .473.096.794.286.965.19.161.526.242 1.007.242h.812v1.086h-1.173ZM147.995 45.358v-7.573h1.263v7.573h-1.263Zm.631-9.203a.884.884 0 0 1-.631-.241.889.889 0 0 1-.241-.634c0-.251.08-.452.241-.603a.884.884 0 0 1 .631-.242c.241 0 .446.08.617.242.17.15.255.352.255.603a.863.863 0 0 1-.255.634.867.867 0 0 1-.617.241ZM139.24 45.358v-7.574h1.142l.076 1.328a2.64 2.64 0 0 1 1.022-1.101 2.915 2.915 0 0 1 1.534-.408c.591 0 1.103.116 1.534.347.431.232.767.589 1.007 1.072.241.482.361 1.09.361 1.825v4.51h-1.263v-4.374c0-.765-.166-1.338-.497-1.72-.33-.382-.806-.573-1.428-.573-.421 0-.802.105-1.143.316-.33.202-.596.498-.796.89-.191.393-.286.87-.286 1.434v4.028h-1.263ZM133.251 45.539a4.397 4.397 0 0 1-1.97-.438 3.357 3.357 0 0 1-1.398-1.327c-.351-.604-.527-1.373-.527-2.309v-6.668h1.263v6.684c0 .683.111 1.241.331 1.674.231.433.547.75.948.95.401.202.862.302 1.383.302.531 0 .992-.1 1.383-.301.391-.202.697-.518.918-.95.22-.434.331-.992.331-1.675v-6.684h1.263v6.668c0 .936-.176 1.705-.527 2.309a3.335 3.335 0 0 1-1.413 1.327c-.592.292-1.253.438-1.985.438ZM120.686 45.539c-.611 0-1.152-.1-1.624-.302a2.779 2.779 0 0 1-1.128-.89 2.987 2.987 0 0 1-.511-1.343h1.294c.06.262.17.508.33.74.161.221.376.397.647.528.281.13.616.196 1.007.196.361 0 .657-.05.888-.151.23-.11.4-.257.511-.438.11-.18.165-.377.165-.588 0-.302-.075-.533-.225-.694-.141-.16-.351-.287-.632-.377a6.388 6.388 0 0 0-1.008-.257c-.33-.06-.656-.14-.977-.24a3.629 3.629 0 0 1-.842-.393 1.921 1.921 0 0 1-.602-.604 1.705 1.705 0 0 1-.225-.89c0-.432.11-.814.331-1.146.23-.342.546-.609.947-.8.411-.191.897-.287 1.459-.287.802 0 1.453.197 1.954.589.512.392.808.96.888 1.704h-1.248c-.04-.382-.201-.679-.481-.89-.281-.22-.657-.331-1.128-.331-.471 0-.832.095-1.083.286a.919.919 0 0 0-.361.755.78.78 0 0 0 .196.527c.14.151.346.282.616.393.271.1.597.19.978.271.491.091.942.212 1.353.362.411.151.742.373.993.664.26.292.391.71.391 1.252.009.473-.106.885-.346 1.238-.231.351-.562.628-.993.83-.431.19-.942.286-1.534.286ZM113.138 45.539c-.611 0-1.153-.1-1.624-.302a2.77 2.77 0 0 1-1.127-.89 2.976 2.976 0 0 1-.512-1.343h1.293c.061.262.171.508.331.74.161.221.376.397.647.528.28.13.616.196 1.007.196.361 0 .657-.05.888-.151.23-.11.401-.257.511-.438.11-.18.165-.377.165-.588 0-.302-.075-.533-.225-.694-.141-.16-.351-.287-.632-.377a6.43 6.43 0 0 0-1.007-.257 8.21 8.21 0 0 1-.978-.24 3.629 3.629 0 0 1-.842-.393 1.918 1.918 0 0 1-.601-.604 1.696 1.696 0 0 1-.226-.89c0-.432.111-.814.331-1.146.231-.342.546-.609.947-.8.411-.191.897-.287 1.459-.287.802 0 1.453.197 1.955.589.511.392.807.96.887 1.704h-1.248c-.04-.382-.201-.679-.481-.89-.281-.22-.657-.331-1.128-.331-.471 0-.832.095-1.083.286a.919.919 0 0 0-.361.755.78.78 0 0 0 .196.527c.14.151.346.282.616.393.271.1.597.19.978.271.491.091.942.212 1.353.362.411.151.742.373.992.664.261.292.392.71.392 1.252.01.473-.106.885-.346 1.238-.231.351-.562.628-.993.83-.431.19-.942.286-1.534.286ZM105.073 45.539c-.702 0-1.328-.166-1.88-.498a3.56 3.56 0 0 1-1.308-1.388c-.311-.593-.466-1.287-.466-2.082 0-.805.155-1.499.466-2.082a3.456 3.456 0 0 1 1.293-1.388c.562-.332 1.203-.498 1.925-.498.742 0 1.374.166 1.895.498.521.332.917.765 1.188 1.298.28.533.421 1.121.421 1.765v.317c0 .11-.005.236-.015.377h-6.226v-.981h4.993c-.031-.694-.261-1.232-.692-1.614-.421-.392-.952-.588-1.594-.588-.421 0-.817.1-1.188.301a2.271 2.271 0 0 0-.902.845c-.221.372-.331.84-.331 1.403v.423c0 .623.115 1.146.346 1.569.23.412.526.724.887.935.371.21.767.317 1.188.317.531 0 .967-.116 1.308-.347.351-.242.607-.569.767-.98h1.248c-.13.462-.345.874-.646 1.236a3.305 3.305 0 0 1-1.128.845c-.441.211-.958.317-1.549.317ZM93.115 45.358v-7.574h1.143l.075 1.328c.24-.473.581-.84 1.022-1.101a2.917 2.917 0 0 1 1.534-.408c.592 0 1.103.116 1.534.347.431.232.767.589 1.007 1.072.241.482.361 1.09.361 1.825v4.51h-1.263v-4.374c0-.765-.165-1.338-.496-1.72-.33-.382-.807-.573-1.428-.573-.421 0-.802.105-1.143.316-.331.202-.597.498-.797.89-.19.393-.286.87-.286 1.434v4.028h-1.263ZM89.653 45.358v-7.573h1.263v7.573h-1.263Zm.631-9.203a.885.885 0 0 1-.631-.241.89.89 0 0 1-.241-.634c0-.251.08-.452.24-.603a.885.885 0 0 1 .632-.242c.24 0 .446.08.616.242.171.15.256.352.256.603a.86.86 0 0 1-.256.634.866.866 0 0 1-.616.241ZM84.826 45.539c-.611 0-1.152-.1-1.624-.302a2.778 2.778 0 0 1-1.128-.89 2.982 2.982 0 0 1-.51-1.343h1.293c.06.262.17.508.33.74.16.221.376.397.647.528.28.13.616.196 1.007.196.361 0 .657-.05.888-.151.23-.11.4-.257.51-.438.111-.18.166-.377.166-.588 0-.302-.075-.533-.226-.694-.14-.16-.35-.287-.63-.377a6.412 6.412 0 0 0-1.008-.257c-.331-.06-.657-.14-.978-.24a3.63 3.63 0 0 1-.842-.393 1.914 1.914 0 0 1-.601-.604 1.7 1.7 0 0 1-.226-.89c0-.432.11-.814.33-1.146.231-.342.547-.609.948-.8.411-.191.898-.287 1.459-.287.802 0 1.453.197 1.955.589.51.392.806.96.887 1.704h-1.248c-.04-.382-.2-.679-.481-.89-.281-.22-.657-.331-1.128-.331-.471 0-.832.095-1.083.286a.917.917 0 0 0-.36.755c0 .2.064.377.195.527.14.151.345.282.616.393.27.1.597.19.978.271.491.091.942.212 1.353.362.411.151.742.373.993.664.26.292.39.71.39 1.252.01.473-.105.885-.345 1.238-.23.351-.562.628-.993.83-.431.19-.942.286-1.534.286ZM76.101 45.539c-.581 0-1.093-.116-1.534-.347-.43-.231-.767-.589-1.007-1.071-.23-.483-.346-1.092-.346-1.826v-4.51h1.263v4.375c0 .764.165 1.337.496 1.72.331.382.802.573 1.414.573.42 0 .802-.101 1.143-.302a2.13 2.13 0 0 0 .796-.905c.2-.393.301-.87.301-1.434v-4.028h1.264v7.574h-1.144l-.075-1.328a2.71 2.71 0 0 1-1.037 1.117 3.003 3.003 0 0 1-1.534.392ZM64.379 45.358v-10.56h3.7c.741 0 1.353.12 1.834.361.49.232.857.553 1.097.966.241.402.361.855.361 1.358 0 .543-.12.995-.36 1.357-.231.362-.537.64-.918.83a3.248 3.248 0 0 1-1.188.347l.21-.15a2.525 2.525 0 0 1 2.15 1.297c.231.392.347.83.347 1.312 0 .533-.13 1.021-.391 1.464-.26.432-.647.78-1.158 1.04-.501.252-1.123.378-1.865.378H64.38Zm1.263-1.056h2.421c.712 0 1.263-.166 1.654-.498.401-.342.602-.815.602-1.418 0-.594-.206-1.067-.617-1.418-.4-.362-.957-.544-1.669-.544h-2.39v3.878Zm0-4.888h2.346c.681 0 1.198-.161 1.549-.483.36-.322.541-.76.541-1.313 0-.533-.18-.96-.541-1.282-.351-.322-.883-.483-1.594-.483h-2.3v3.56Z"/>
+    </g>
+    <defs>
+      <clipPath id="business-unit-portal-logo-clip">
+        <path class="tw-fill-text-alt2" d="M0 0h200v46H0z"/>
+      </clipPath>
+    </defs>
+  </svg>
 `;
 
 export default BusinessUnitPortalLogo;
diff --git a/libs/assets/src/svg/svgs/create-passkey-failed.icon.ts b/libs/assets/src/svg/svgs/create-passkey-failed.icon.ts
deleted file mode 100644
index 37e679b9b5e..00000000000
--- a/libs/assets/src/svg/svgs/create-passkey-failed.icon.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const CreatePasskeyFailedIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" width="163" height="115" fill="none">
-  <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M31 19.46H9v22h22v-22Zm-24-2v26h26v-26H7Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M0 43.46a4 4 0 0 1 4-4h32a4 4 0 0 1 4 4v7h-4v-7H4v16.747l1.705 2.149a4 4 0 0 1 .866 2.486v22.205a4 4 0 0 1-1 2.645L4 91.475v17.985h32V91.475l-1.572-1.783a4 4 0 0 1-1-2.645V64.842a4 4 0 0 1 .867-2.486L36 60.207V56.46h4v3.747a4 4 0 0 1-.867 2.487l-1.704 2.148v22.205L39 88.83a4 4 0 0 1 1 2.645v17.985a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V91.475a4 4 0 0 1 1-2.645l1.571-1.783V64.842L.867 62.694A4 4 0 0 1 0 60.207V43.46Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M19.74 63.96a.5.5 0 0 1 .355.147l2.852 2.866a.5.5 0 0 1 .146.353V77.56c2.585 1.188 4.407 3.814 4.407 6.865 0 4.183-3.357 7.534-7.5 7.534-4.144 0-7.5-3.376-7.5-7.534a7.546 7.546 0 0 1 4.478-6.894v-1.443a.5.5 0 0 1 .146-.353l1.275-1.281-1.322-1.33a.5.5 0 0 1 0-.705l.332-.334-.262-.263a.5.5 0 0 1-.005-.7l1.332-1.377-1.445-1.452a.5.5 0 0 1-.145-.352v-1.114a.5.5 0 0 1 .145-.352l2.357-2.369a.5.5 0 0 1 .355-.147Zm-1.856 3.075v.7l1.645 1.654a.5.5 0 0 1 .005.7l-1.332 1.377.267.268a.5.5 0 0 1 0 .705l-.333.334 1.323 1.329a.5.5 0 0 1 0 .705l-1.48 1.488v1.57a.5.5 0 0 1-.32.466 6.545 6.545 0 0 0-4.159 6.095c0 3.61 2.913 6.534 6.5 6.534 3.588 0 6.5-2.901 6.5-6.534 0-2.749-1.707-5.105-4.095-6.074a.5.5 0 0 1-.312-.463V67.532L19.74 65.17l-1.857 1.866ZM20 85.623a1.27 1.27 0 0 0-1.268 1.276c0 .702.56 1.276 1.268 1.276.712 0 1.268-.555 1.268-1.276A1.27 1.27 0 0 0 20 85.623Zm-2.268 1.276A2.27 2.27 0 0 1 20 84.623a2.27 2.27 0 0 1 2.268 2.276c0 1.269-1 2.276-2.268 2.276a2.27 2.27 0 0 1-2.268-2.276ZM57.623 114a1 1 0 0 1 1-1h63.048a1 1 0 0 1 0 2H58.623a1 1 0 0 1-1-1Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M78.022 114V95.654h2V114h-2ZM98.418 114V95.654h2V114h-2Z" clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M16 14.46c0-7.732 6.268-14 14-14h119c7.732 0 14 6.268 14 14v68c0 7.732-6.268 14-14 14H39.5v-4H149c5.523 0 10-4.477 10-10v-68c0-5.523-4.477-10-10-10H30c-5.523 0-10 4.477-10 10v5h-4v-5Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M25 15.46a6 6 0 0 1 6-6h117a6 6 0 0 1 6 6v66a6 6 0 0 1-6 6H36.5v-2H148a4 4 0 0 0 4-4v-66a4 4 0 0 0-4-4H31a4 4 0 0 0-4 4v3h-2v-3Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600"
-    d="M104.269 32.86a1.42 1.42 0 0 0-1.007-.4h-25.83c-.39 0-.722.132-1.007.4a1.26 1.26 0 0 0-.425.947v16.199c0 1.207.25 2.407.75 3.597a13.22 13.22 0 0 0 1.861 3.165c.74.919 1.62 1.817 2.646 2.69a30.93 30.93 0 0 0 2.834 2.172c.868.577 1.77 1.121 2.712 1.636.942.516 1.612.862 2.007 1.043.394.181.714.326.95.42.18.083.373.128.583.128.21 0 .403-.041.582-.128.241-.099.557-.239.956-.42.394-.181 1.064-.532 2.006-1.043a36.595 36.595 0 0 0 2.712-1.636c.867-.576 1.813-1.302 2.838-2.171a19.943 19.943 0 0 0 2.646-2.69 13.24 13.24 0 0 0 1.862-3.166 9.19 9.19 0 0 0 .749-3.597V33.812c.005-.367-.14-.684-.425-.952Zm-3.329 17.298c0 5.864-10.593 10.916-10.593 10.916V35.93h10.593v14.228Z" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M18 24.46h-5v-2h5v2ZM27 24.46h-5v-2h5v2Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-danger-600"
-    d="M51.066 66.894a2.303 2.303 0 0 1-2.455-.5l-10.108-9.797L28.375 66.4l-.002.002a2.294 2.294 0 0 1-3.185.005 2.24 2.24 0 0 1-.506-2.496c.117-.27.286-.518.503-.728l10.062-9.737-9.945-9.623a2.258 2.258 0 0 1-.698-1.6c-.004-.314.06-.619.176-.894a2.254 2.254 0 0 1 1.257-1.222 2.305 2.305 0 0 1 1.723.014c.267.11.518.274.732.486l10.01 9.682 9.995-9.688.009-.008a2.292 2.292 0 0 1 3.159.026c.425.411.68.98.684 1.59a2.242 2.242 0 0 1-.655 1.6l-.01.01-9.926 9.627 10.008 9.7.029.027a2.237 2.237 0 0 1 .53 2.496l-.002.004a2.258 2.258 0 0 1-1.257 1.222Z" />
-</svg>
-`;
diff --git a/libs/assets/src/svg/svgs/create-passkey.icon.ts b/libs/assets/src/svg/svgs/create-passkey.icon.ts
deleted file mode 100644
index efe180e1e2f..00000000000
--- a/libs/assets/src/svg/svgs/create-passkey.icon.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const CreatePasskeyIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" width="163" height="116" fill="none">
-  <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M31 19.58H9v22h22v-22Zm-24-2v26h26v-26H7Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M0 43.58a4 4 0 0 1 4-4h32a4 4 0 0 1 4 4v7h-4v-7H4v16.747l1.705 2.149a4 4 0 0 1 .866 2.486v22.204a4 4 0 0 1-1 2.646L4 91.595v17.985h32V91.595l-1.572-1.783a4 4 0 0 1-1-2.646V64.962a4 4 0 0 1 .867-2.486L36 60.327V56.58h4v3.747a4 4 0 0 1-.867 2.486l-1.704 2.149v22.204L39 88.95a4 4 0 0 1 1 2.646v17.985a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V91.595a4 4 0 0 1 1-2.646l1.571-1.783V64.962L.867 62.813A4 4 0 0 1 0 60.327V43.58Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M19.74 64.08a.5.5 0 0 1 .355.147l2.852 2.866a.5.5 0 0 1 .146.352V77.68c2.585 1.189 4.407 3.814 4.407 6.865 0 4.183-3.357 7.535-7.5 7.535-4.144 0-7.5-3.377-7.5-7.535a7.546 7.546 0 0 1 4.478-6.894V76.21a.5.5 0 0 1 .146-.353l1.275-1.282-1.322-1.329a.5.5 0 0 1 0-.705l.332-.334-.262-.263a.5.5 0 0 1-.005-.7l1.332-1.377-1.445-1.452a.5.5 0 0 1-.145-.353v-1.113a.5.5 0 0 1 .145-.353l2.357-2.368a.5.5 0 0 1 .355-.147Zm-1.856 3.074v.7l1.645 1.654a.5.5 0 0 1 .005.7l-1.332 1.377.267.268a.5.5 0 0 1 0 .706l-.333.334 1.323 1.329a.5.5 0 0 1 0 .705l-1.48 1.488v1.57a.5.5 0 0 1-.32.466 6.545 6.545 0 0 0-4.159 6.094c0 3.61 2.913 6.535 6.5 6.535 3.588 0 6.5-2.902 6.5-6.535 0-2.748-1.707-5.104-4.095-6.073a.5.5 0 0 1-.312-.463V67.651l-2.352-2.364-1.857 1.866ZM20 85.742a1.27 1.27 0 0 0-1.268 1.277c0 .701.56 1.276 1.268 1.276.712 0 1.268-.555 1.268-1.276A1.27 1.27 0 0 0 20 85.742Zm-2.268 1.277A2.27 2.27 0 0 1 20 84.742a2.27 2.27 0 0 1 2.268 2.277c0 1.268-1 2.276-2.268 2.276a2.27 2.27 0 0 1-2.268-2.276ZM41.796 42.844a1 1 0 0 1 1.413.058l5.526 6A1 1 0 0 1 48 50.58H27a1 1 0 1 1 0-2h18.72l-3.982-4.323a1 1 0 0 1 .058-1.413ZM33.315 62.315a1 1 0 0 1-1.413-.058l-5.526-6a1 1 0 0 1 .735-1.677h21a1 1 0 1 1 0 2h-18.72l3.982 4.322a1 1 0 0 1-.058 1.413ZM57.623 114.12a1 1 0 0 1 1-1h63.048a1 1 0 1 1 0 2H58.623a1 1 0 0 1-1-1Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M78.022 114.12V95.774h2v18.346h-2ZM98.418 114.12V95.774h2v18.346h-2Z" clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M16 14.58c0-7.732 6.268-14 14-14h119c7.732 0 14 6.268 14 14v68c0 7.732-6.268 14-14 14H39.5v-4H149c5.523 0 10-4.478 10-10v-68c0-5.523-4.477-10-10-10H30c-5.523 0-10 4.477-10 10v5h-4v-5Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M25 15.58a6 6 0 0 1 6-6h117a6 6 0 0 1 6 6v66a6 6 0 0 1-6 6H36.5v-2H148a4 4 0 0 0 4-4v-66a4 4 0 0 0-4-4H31a4 4 0 0 0-4 4v3h-2v-3Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600"
-    d="M104.269 32.98a1.42 1.42 0 0 0-1.007-.4h-25.83c-.39 0-.722.132-1.007.4a1.26 1.26 0 0 0-.425.947v16.199c0 1.207.25 2.406.75 3.597a13.222 13.222 0 0 0 1.861 3.165c.74.919 1.62 1.817 2.646 2.69a30.93 30.93 0 0 0 2.834 2.172c.868.577 1.77 1.121 2.712 1.636.942.515 1.612.861 2.007 1.043.394.18.714.325.95.42.18.082.373.128.583.128.21 0 .403-.042.582-.128.241-.099.557-.24.956-.42.394-.182 1.064-.532 2.006-1.043a36.56 36.56 0 0 0 2.712-1.636c.867-.577 1.813-1.302 2.838-2.172a19.943 19.943 0 0 0 2.646-2.69 13.24 13.24 0 0 0 1.862-3.165c.5-1.187.749-2.386.749-3.597V33.93c.005-.367-.14-.684-.425-.952Zm-3.329 17.298c0 5.864-10.593 10.916-10.593 10.916V36.049h10.593v14.23Z" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M18 24.58h-5v-2h5v2ZM27 24.58h-5v-2h5v2Z"
-    clip-rule="evenodd" />
-</svg>
-`;
diff --git a/libs/assets/src/svg/svgs/credit-card.icon.ts b/libs/assets/src/svg/svgs/credit-card.icon.ts
new file mode 100644
index 00000000000..e334766fac7
--- /dev/null
+++ b/libs/assets/src/svg/svgs/credit-card.icon.ts
@@ -0,0 +1,15 @@
+import { svgIcon } from "../icon-service";
+
+export const CreditCardIcon = svgIcon`
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0.98 15.86 95.04 65.76">
+    <path class="tw-fill-illustration-bg-secondary" d="M.98 21.62a5.76 5.76 0 0 1 5.76-5.76h57.6a5.76 5.76 0 0 1 5.76 5.76v33.6a5.76 5.76 0 0 1-5.76 5.76H6.74a5.76 5.76 0 0 1-5.76-5.76v-33.6Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M64.34 17.78H6.74a3.84 3.84 0 0 0-3.84 3.84v33.6a3.84 3.84 0 0 0 3.84 3.84h57.6a3.84 3.84 0 0 0 3.84-3.84v-33.6a3.84 3.84 0 0 0-3.84-3.84Zm-57.6-1.92a5.76 5.76 0 0 0-5.76 5.76v33.6a5.76 5.76 0 0 0 5.76 5.76h57.6a5.76 5.76 0 0 0 5.76-5.76v-33.6a5.76 5.76 0 0 0-5.76-5.76H6.74Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M2.9 26.9h65.28v5.28H2.9V26.9ZM7.22 51.773c0-.747.606-1.353 1.353-1.353h8.117a1.353 1.353 0 0 1 0 2.705H8.573a1.353 1.353 0 0 1-1.352-1.352ZM22.1 51.773c0-.747.605-1.353 1.352-1.353h12.175a1.353 1.353 0 0 1 0 2.705H23.452a1.353 1.353 0 0 1-1.352-1.352Z"/>
+    <path class="tw-fill-illustration-bg-primary" d="M26.9 42.26a5.76 5.76 0 0 1 5.76-5.76h57.6a5.76 5.76 0 0 1 5.76 5.76v33.6a5.76 5.76 0 0 1-5.76 5.76h-57.6a5.76 5.76 0 0 1-5.76-5.76v-33.6Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M90.26 38.42h-57.6a3.84 3.84 0 0 0-3.84 3.84v33.6a3.84 3.84 0 0 0 3.84 3.84h57.6a3.84 3.84 0 0 0 3.84-3.84v-33.6a3.84 3.84 0 0 0-3.84-3.84Zm-57.6-1.92a5.76 5.76 0 0 0-5.76 5.76v33.6a5.76 5.76 0 0 0 5.76 5.76h57.6a5.76 5.76 0 0 0 5.76-5.76v-33.6a5.76 5.76 0 0 0-5.76-5.76h-57.6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M73.502 43.666c0-1.06.86-1.92 1.92-1.92h13.44c1.06 0 1.92.86 1.92 1.92v4.03c0 1.06-.86 1.92-1.92 1.92h-13.44a1.92 1.92 0 0 1-1.92-1.92v-4.03Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M88.862 43.666h-13.44v4.03h13.44v-4.03Zm-13.44-1.92c-1.06 0-1.92.86-1.92 1.92v4.03c0 1.06.86 1.92 1.92 1.92h13.44c1.06 0 1.92-.86 1.92-1.92v-4.03c0-1.06-.86-1.92-1.92-1.92h-13.44Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M33.178 51.536c0-1.06.86-1.92 1.92-1.92h8.727c1.06 0 1.92.86 1.92 1.92v8.752c0 1.06-.86 1.92-1.92 1.92h-8.727a1.92 1.92 0 0 1-1.92-1.92v-8.752Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M43.825 51.536h-8.727v8.752h8.727v-8.752Zm-8.727-1.92c-1.06 0-1.92.86-1.92 1.92v8.752c0 1.06.86 1.92 1.92 1.92h8.727c1.06 0 1.92-.86 1.92-1.92v-8.752c0-1.06-.86-1.92-1.92-1.92h-8.727ZM33.178 73.967c0-.53.43-.96.96-.96h25.286a.96.96 0 1 1 0 1.92H34.138a.96.96 0 0 1-.96-.96ZM33.178 66.828c0-.53.43-.96.96-.96h5.853a.96.96 0 1 1 0 1.92h-5.853a.96.96 0 0 1-.96-.96ZM42.895 66.828c0-.53.43-.96.96-.96h5.853a.96.96 0 1 1 0 1.92h-5.853a.96.96 0 0 1-.96-.96ZM53.262 66.828c0-.53.43-.96.96-.96h5.853a.96.96 0 1 1 0 1.92h-5.853a.96.96 0 0 1-.96-.96ZM62.978 66.828c0-.53.43-.96.96-.96h5.854a.96.96 0 1 1 0 1.92h-5.854a.96.96 0 0 1-.96-.96Z" clip-rule="evenodd"/>
+  </svg>
+`;
diff --git a/libs/assets/src/svg/svgs/deactivated-org.ts b/libs/assets/src/svg/svgs/deactivated-org.ts
index 92a1064e31e..75b25e3fd27 100644
--- a/libs/assets/src/svg/svgs/deactivated-org.ts
+++ b/libs/assets/src/svg/svgs/deactivated-org.ts
@@ -1,32 +1,31 @@
 import { svgIcon } from "../icon-service";
 
 export const DeactivatedOrg = svgIcon`
-<svg width="138" height="118" viewBox="0 0 138 118" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <g clip-path="url(#clip0_2929_17380)">
-    <path class="tw-stroke-art-primary" d="M80.0852 15.889V11.7504C80.0852 9.75243 78.6181 8.18262 76.7509 8.18262H53.1445C51.2773 8.18262 49.8102 9.75243 49.8102 11.7504V16.0317"  stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M73.3568 7.06126V3.568C73.3568 1.75668 71.8648 0.333496 69.9658 0.333496H59.9285C58.0295 0.333496 56.5374 1.75668 56.5374 3.568V7.06126"  stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M41.9611 29.8517V20.5736C41.9611 18.658 43.4441 17.1528 45.3315 17.1528H84.5637C86.4511 17.1528 87.9341 18.658 87.9341 20.5736V83.2728"  stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M12.8074 103.493V32.9262C12.8074 31.0004 14.3311 29.4873 16.2703 29.4873H56.4389C58.3781 29.4873 59.9018 31.0004 59.9018 32.9262V103.493"  stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M36.3545 39.5791V94.5225"  stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M47.5677 39.5791V94.5225"  stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M78.9634 26.1235V37.3365"  stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M78.9634 45.1851V56.398"  stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M78.9634 64.2476V75.4605"  stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M78.9634 83.3091V94.522"  stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M69.9932 26.1235V37.3365"  stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M69.9932 45.1851V56.398"  stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M69.9932 64.2476V75.4605"  stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M69.9932 83.3091V94.522"  stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M24.0202 39.5791V94.5225"  stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-primary" d="M0.473145 104.614H75.3408"  stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-fill-danger-600" fill-rule="evenodd" clip-rule="evenodd" d="M121.425 111.921L99.1265 73.2989C98.3006 71.8685 96.236 71.8685 95.4101 73.2989L73.1119 111.921C72.286 113.351 73.3183 115.139 74.97 115.139H119.567C121.218 115.139 122.251 113.351 121.425 111.921ZM101.604 71.8685C99.6771 68.5308 94.8595 68.5308 92.9325 71.8685L70.6343 110.49C68.7073 113.828 71.116 118 74.97 118H119.567C123.421 118 125.829 113.828 123.902 110.49L101.604 71.8685Z"/>
-    <path class="tw-fill-danger-600" d="M98.2704 84.3848C98.8321 84.3848 99.2836 84.8473 99.2701 85.4088L98.8811 101.584C98.8681 102.127 98.4243 102.56 97.8814 102.56H96.6544C96.1118 102.56 95.6682 102.127 95.6547 101.585L95.254 85.4095C95.24 84.8477 95.6917 84.3848 96.2537 84.3848H98.2704Z" />
-    <circle class="tw-fill-danger-600" cx="97.2682" cy="106.556" r="2.14565" />
-  </g>
-  <defs>
-    <clipPath id="clip0_2929_17380">
-      <rect width="138" height="118" class="tw-fill-danger-600"/>
-    </clipPath>
-  </defs>
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="4 0.5 90.32 96">
+    <path class="tw-fill-illustration-bg-secondary" d="M54 8.5a8 8 0 0 1 8-8h8a8 8 0 0 1 8 8v4H54v-4Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M70 2.5h-8a6 6 0 0 0-6 6v2h20v-2a6 6 0 0 0-6-6Zm-8-2a8 8 0 0 0-8 8v4h24v-4a8 8 0 0 0-8-8h-8Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M47 16.5a8 8 0 0 1 8-8h22a8 8 0 0 1 8 8v6H47v-6Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M77 10.5H55a6 6 0 0 0-6 6v4h34v-4a6 6 0 0 0-6-6Zm-22-2a8 8 0 0 0-8 8v6h38v-6a8 8 0 0 0-8-8H55Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M40 26.5a8 8 0 0 1 8-8h36a8 8 0 0 1 8 8v66H40v-66Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M84 20.5H48a6 6 0 0 0-6 6v64h48v-64a6 6 0 0 0-6-6Zm-36-2a8 8 0 0 0-8 8v66h52v-66a8 8 0 0 0-8-8H48Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M4 44.5a8 8 0 0 1 8-8h38a8 8 0 0 1 8 8v48H4v-48Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M50 38.5H12a6 6 0 0 0-6 6v46h50v-46a6 6 0 0 0-6-6Zm-38-2a8 8 0 0 0-8 8v48h54v-48a8 8 0 0 0-8-8H12Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M68.677 60.935c1.928-3.316 6.718-3.316 8.645 0l16.31 28.052c1.938 3.334-.467 7.513-4.323 7.513H56.691c-3.856 0-6.26-4.18-4.323-7.513l16.31-28.052Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M91.903 89.993 75.593 61.94c-1.156-1.99-4.03-1.99-5.187 0L54.097 89.993c-1.163 2 .28 4.507 2.594 4.507h32.618c2.314 0 3.757-2.507 2.594-4.507Zm-14.58-29.058c-1.928-3.316-6.718-3.316-8.645 0l-16.31 28.052c-1.938 3.334.467 7.513 4.323 7.513h32.618c3.856 0 6.26-4.18 4.323-7.513l-16.31-28.052Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M75 88.5a2 2 0 1 1-4 0 2 2 0 0 1 4 0ZM70.06 71.053a.5.5 0 0 1 .496-.553h4.887a.5.5 0 0 1 .498.553l-1.393 13a.5.5 0 0 1-.498.447h-2.1a.5.5 0 0 1-.498-.447l-1.393-13Z"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M21 80.5a8 8 0 0 1 8-8h4a8 8 0 0 1 8 8v12H21v-12Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M33 74.5h-4a6 6 0 0 0-6 6v10h16v-10a6 6 0 0 0-6-6Zm-4-2a8 8 0 0 0-8 8v12h20v-12a8 8 0 0 0-8-8h-4Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M13 46.5a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1h-8a1 1 0 0 1-1-1v-8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M15 47.5v6h6v-6h-6Zm-1-2a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-8a1 1 0 0 0-1-1h-8Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M13 59.5a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1h-8a1 1 0 0 1-1-1v-8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M15 60.5v6h6v-6h-6Zm-1-2a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-8a1 1 0 0 0-1-1h-8Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M26 46.5a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1h-8a1 1 0 0 1-1-1v-8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M28 47.5v6h6v-6h-6Zm-1-2a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-8a1 1 0 0 0-1-1h-8Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M26 59.5a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1h-8a1 1 0 0 1-1-1v-8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M28 60.5v6h6v-6h-6Zm-1-2a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-8a1 1 0 0 0-1-1h-8Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M39 59.5a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1h-8a1 1 0 0 1-1-1v-8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M41 60.5v6h6v-6h-6Zm-1-2a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-8a1 1 0 0 0-1-1h-8Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M39 46.5a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1h-8a1 1 0 0 1-1-1v-8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M41 47.5v6h6v-6h-6Zm-1-2a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-8a1 1 0 0 0-1-1h-8ZM47 27.5a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2h-6a1 1 0 0 1-1-1Zm11-1a1 1 0 1 0 0 2h6a1 1 0 1 0 0-2h-6Zm9 1a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2h-6a1 1 0 0 1-1-1Zm10 0a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2h-6a1 1 0 0 1-1-1Zm0 6a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2h-6a1 1 0 0 1-1-1Zm1 5a1 1 0 1 0 0 2h6a1 1 0 1 0 0-2h-6Zm-1 7a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2h-6a1 1 0 0 1-1-1Zm1 5a1 1 0 1 0 0 2h6a1 1 0 1 0 0-2h-6Zm-10-18a1 1 0 1 0 0 2h6a1 1 0 1 0 0-2h-6Zm-1 7a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2h-6a1 1 0 0 1-1-1Zm1 5a1 1 0 1 0 0 2h6a1 1 0 1 0 0-2h-6Zm-1 7a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2h-6a1 1 0 0 1-1-1Zm-9-19a1 1 0 1 0 0 2h6a1 1 0 1 0 0-2h-6Zm-11 1a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2h-6a1 1 0 0 1-1-1Zm11 5a1 1 0 1 0 0 2h6a1 1 0 1 0 0-2h-6Zm-1 7a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2h-6a1 1 0 0 1-1-1Zm1 5a1 1 0 1 0 0 2h6a1 1 0 1 0 0-2h-6Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/device-verification.icon.ts b/libs/assets/src/svg/svgs/device-verification.icon.ts
deleted file mode 100644
index c8fccbf7eca..00000000000
--- a/libs/assets/src/svg/svgs/device-verification.icon.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const DeviceVerificationIcon = svgIcon`
-<svg viewBox="0 0 98 95" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path class="tw-stroke-art-primary" d="M12.1759 27.7453L2.54349 34.9329C1.57215 35.6577 1 36.7986 1 38.0105V89.6281C1 91.7489 2.71922 93.4681 4.84 93.4681H93.16C95.2808 93.4681 97 91.7489 97 89.6281V38.0276C97 36.806 96.4188 35.6574 95.4347 34.9338L85.6576 27.7453M61.8791 10.2622L50.9367 2.2168C49.5753 1.21588 47.7197 1.22245 46.3655 2.23297L35.6054 10.2622" stroke-width="1.92"/>
-  <path class="tw-stroke-art-primary" d="M85.7661 45.4682V12.1542C85.7661 11.0938 84.9064 10.2342 83.8461 10.2342H14.1541C13.0937 10.2342 12.2341 11.0938 12.2341 12.1542V45.4682" stroke-width="1.92" stroke-linecap="round"/>
-  <path class="tw-stroke-art-primary" d="M95.7335 92.1003L62.3151 61.2912C61.2514 60.3106 59.8576 59.7661 58.4109 59.7661H38.043C36.5571 59.7661 35.1286 60.3404 34.0562 61.3689L2.01148 92.1003" stroke-width="1.92"/>
-  <line class="tw-stroke-art-primary" x1="96.157" y1="39.125" x2="61.0395" y2="60.0979" stroke-width="1.92" stroke-linecap="round"/>
-  <path class="tw-stroke-art-primary" d="M1.84229 39.1248L36.673 59.7488"  stroke-width="1.92" stroke-linecap="round"/>
-  <rect class="tw-stroke-art-accent" x="23.0046" y="25.5344" width="51.925" height="17.4487" rx="8.72434" stroke-width="0.96"/>
-  <circle class="tw-fill-art-accent" cx="30.2299" cy="34.2588" r="2.24846"/>
-  <circle class="tw-fill-art-accent" cx="45.2196" cy="34.2587" r="2.24846"/>
-  <circle class="tw-fill-art-accent" cx="60.2094" cy="34.2587" r="2.24846"/>
-  <circle class="tw-fill-art-accent" cx="37.7248" cy="34.2587" r="2.24846"/>
-  <circle class="tw-fill-art-accent" cx="52.7145" cy="34.2587" r="2.24846"/>
-  <circle class="tw-fill-art-accent" cx="67.704" cy="34.2587" r="2.24846"/>
-</svg>
-`;
diff --git a/libs/assets/src/svg/svgs/devices.icon.ts b/libs/assets/src/svg/svgs/devices.icon.ts
index 471b44017b1..7c97df48657 100644
--- a/libs/assets/src/svg/svgs/devices.icon.ts
+++ b/libs/assets/src/svg/svgs/devices.icon.ts
@@ -1,52 +1,25 @@
 import { svgIcon } from "../icon-service";
 
 export const DevicesIcon = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
-    <path
-      class="tw-fill-art-primary"
-      fill-rule="evenodd"
-      d="M41.212 87.309c0-.335.271-.606.606-.606H76.97a.606.606 0 0 1 0 1.212H41.818a.606.606 0 0 1-.606-.606Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-primary"
-      fill-rule="evenodd"
-      d="M53.176 87.31V76.542h1.212V87.31h-1.212Zm12.103 0V76.542h1.212V87.31h-1.212Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-primary"
-      fill-rule="evenodd"
-      d="M16.363 29.733a8.485 8.485 0 0 1 8.485-8.485h70.303a8.485 8.485 0 0 1 8.485 8.485v3.637h-2.424v-3.637a6.06 6.06 0 0 0-6.06-6.06H24.847a6.06 6.06 0 0 0-6.06 6.06v9.697h-2.425v-9.697Zm9.091 44.849H76.97v2.424H25.454v-2.424Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M21.212 30.34c0-2.344 1.9-4.243 4.242-4.243h69.091c2.343 0 4.243 1.9 4.243 4.242v3.03h-1.212v-3.03a3.03 3.03 0 0 0-3.03-3.03H25.453a3.03 3.03 0 0 0-3.03 3.03v9.091h-1.212v-9.09Zm4.242 40.605H76.97v1.212H25.454v-1.212Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-primary"
-      fill-rule="evenodd"
-      d="M75.758 38.218a6.06 6.06 0 0 1 6.06-6.06h32.122a6.06 6.06 0 0 1 6.06 6.06v48.485a6.06 6.06 0 0 1-6.06 6.06H81.818a6.06 6.06 0 0 1-6.06-6.06V38.218Zm6.06-3.636a3.636 3.636 0 0 0-3.636 3.636v48.485a3.636 3.636 0 0 0 3.636 3.636h32.122a3.636 3.636 0 0 0 3.636-3.636V38.218a3.636 3.636 0 0 0-3.636-3.636H81.818Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      d="M99.394 87.31a1.212 1.212 0 1 1-2.424 0 1.212 1.212 0 0 1 2.424 0Z"
-    />
-    <path
-      class="tw-fill-art-primary"
-      fill-rule="evenodd"
-      d="M20.606 40.642H6.061a3.636 3.636 0 0 0-3.637 3.636V80.64a3.636 3.636 0 0 0 3.637 3.637h14.545a3.636 3.636 0 0 0 3.636-3.637V44.278a3.636 3.636 0 0 0-3.636-3.636ZM6.061 38.217A6.06 6.06 0 0 0 0 44.277v36.364a6.06 6.06 0 0 0 6.06 6.061h14.546a6.06 6.06 0 0 0 6.06-6.06V44.277a6.06 6.06 0 0 0-6.06-6.06H6.061Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M12.345 43.556c0-.334.272-.606.606-.606h.753a.606.606 0 1 1 0 1.212h-.753a.606.606 0 0 1-.606-.606Z"
-      clip-rule="evenodd"
-    />
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 10 80 60">
+    <path class="tw-fill-illustration-bg-primary" d="M7.5 15a5 5 0 0 1 5-5h55a5 5 0 0 1 5 5v35a5 5 0 0 1-5 5h-55a5 5 0 0 1-5-5V15Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M67.5 11.667h-55A3.333 3.333 0 0 0 9.167 15v35a3.333 3.333 0 0 0 3.333 3.333h55A3.333 3.333 0 0 0 70.833 50V15a3.333 3.333 0 0 0-3.333-3.333ZM12.5 10a5 5 0 0 0-5 5v35a5 5 0 0 0 5 5h55a5 5 0 0 0 5-5V15a5 5 0 0 0-5-5h-55Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M7.5 15h65v35h-65V15Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M70.833 16.667H9.167v31.666h61.666V16.667ZM7.5 15v35h65V15h-65Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M32.5 54.167h15v15h-15v-15Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M31.667 53.334h16.666v15H55a.833.833 0 0 1 0 1.667H25a.833.833 0 0 1 0-1.667h6.667v-15Zm1.666 15h13.334V55.001H33.333v13.333Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M0 40a3.333 3.333 0 0 1 3.333-3.333h15A3.333 3.333 0 0 1 21.667 40v26.667A3.333 3.333 0 0 1 18.333 70h-15A3.333 3.333 0 0 1 0 66.667V40Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M18.333 38.334h-15c-.92 0-1.666.746-1.666 1.666v26.667c0 .92.746 1.667 1.666 1.667h15c.92 0 1.667-.746 1.667-1.667V40c0-.92-.746-1.666-1.667-1.666Zm-15-1.667A3.333 3.333 0 0 0 0 40v26.667A3.333 3.333 0 0 0 3.333 70h15a3.333 3.333 0 0 0 3.334-3.333V40a3.333 3.333 0 0 0-3.334-3.333h-15Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M8.333 40.833c0-.46.373-.833.834-.833H12.5a.833.833 0 0 1 0 1.667H9.167a.833.833 0 0 1-.834-.834Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" fill-rule="evenodd" d="M40 45.834c7.364 0 13.333-5.97 13.333-13.334 0-7.363-5.97-13.333-13.333-13.333-7.364 0-13.333 5.97-13.333 13.333 0 7.364 5.97 13.334 13.333 13.334ZM34.167 27.5a2.5 2.5 0 0 0-2.5 2.5v8.334a2.5 2.5 0 0 0 2.5 2.5h11.666a2.5 2.5 0 0 0 2.5-2.5V30a2.5 2.5 0 0 0-2.5-2.5H34.167Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M31.667 30a2.5 2.5 0 0 1 2.5-2.5h11.666a2.5 2.5 0 0 1 2.5 2.5v8.333a2.5 2.5 0 0 1-2.5 2.5H34.167a2.5 2.5 0 0 1-2.5-2.5V30Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M45.833 29.167H34.167a.833.833 0 0 0-.834.833v8.333c0 .46.373.834.834.834h11.666c.46 0 .834-.373.834-.834V30a.833.833 0 0 0-.834-.833ZM34.167 27.5a2.5 2.5 0 0 0-2.5 2.5v8.333a2.5 2.5 0 0 0 2.5 2.5h11.666a2.5 2.5 0 0 0 2.5-2.5V30a2.5 2.5 0 0 0-2.5-2.5H34.167Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M39.167 32.5a.833.833 0 0 1 1.666 0v3.334a.833.833 0 0 1-1.666 0V32.5Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M35.833 26.667a4.167 4.167 0 0 1 8.334 0v.833H42.5v-.833a2.5 2.5 0 0 0-5 0v.833h-1.667v-.833Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M50 33.333A3.333 3.333 0 0 1 53.333 30h23.334A3.333 3.333 0 0 1 80 33.333v33.334A3.333 3.333 0 0 1 76.667 70H53.333A3.333 3.333 0 0 1 50 66.667V33.333Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M76.667 31.667H53.333c-.92 0-1.666.746-1.666 1.666v33.334c0 .92.746 1.666 1.666 1.666h23.334c.92 0 1.666-.746 1.666-1.666V33.333c0-.92-.746-1.666-1.666-1.666ZM53.333 30A3.333 3.333 0 0 0 50 33.333v33.334A3.333 3.333 0 0 0 53.333 70h23.334A3.333 3.333 0 0 0 80 66.667V33.333A3.333 3.333 0 0 0 76.667 30H53.333Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M67.5 63.334a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M65 64.167a.833.833 0 1 0 0-1.666.833.833 0 0 0 0 1.666Zm0 1.667a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M33.333 55h13.334v5H33.333v-5Z"/>
   </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/devices.ts b/libs/assets/src/svg/svgs/devices.ts
deleted file mode 100644
index 517256ec591..00000000000
--- a/libs/assets/src/svg/svgs/devices.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const Devices = svgIcon`
-<svg width="201" height="201" viewBox="0 0 201 201" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <g opacity=".49">
-    <path class="tw-fill-secondary-600" fill-rule="evenodd" clip-rule="evenodd" d="M34.3628 82.0889H10.3628C7.04908 82.0889 4.36279 84.7752 4.36279 88.0889V148.089C4.36279 151.403 7.04909 154.089 10.3628 154.089H34.3628C37.6765 154.089 40.3628 151.403 40.3628 148.089V88.0889C40.3628 84.7752 37.6765 82.0889 34.3628 82.0889ZM10.3628 78.0889C4.83995 78.0889 0.362793 82.566 0.362793 88.0889V148.089C0.362793 153.612 4.83995 158.089 10.3628 158.089H34.3628C39.8856 158.089 44.3628 153.612 44.3628 148.089V88.0889C44.3628 82.566 39.8856 78.0889 34.3628 78.0889H10.3628Z" />
-    <path class="tw-fill-secondary-600" fill-rule="evenodd" clip-rule="evenodd" d="M20.7329 86.8979C20.7329 86.3457 21.1806 85.8979 21.7329 85.8979H22.975C23.5273 85.8979 23.975 86.3457 23.975 86.8979C23.975 87.4502 23.5273 87.8979 22.975 87.8979H21.7329C21.1806 87.8979 20.7329 87.4502 20.7329 86.8979Z" />
-    <path class="tw-fill-secondary-600" fill-rule="evenodd" clip-rule="evenodd" d="M68.3628 159.089C68.3628 158.537 68.8105 158.089 69.3628 158.089H127.363C127.915 158.089 128.363 158.537 128.363 159.089C128.363 159.641 127.915 160.089 127.363 160.089H69.3628C68.8105 160.089 68.3628 159.641 68.3628 159.089Z" />
-    <path class="tw-fill-secondary-600" fill-rule="evenodd" clip-rule="evenodd" d="M88.103 159.089V141.325H90.103V159.089H88.103Z" />
-    <path class="tw-fill-secondary-600" fill-rule="evenodd" clip-rule="evenodd" d="M108.073 159.089V141.325H110.073V159.089H108.073Z" />
-    <path class="tw-fill-secondary-600" fill-rule="evenodd" clip-rule="evenodd" d="M27.3628 64.0889C27.3628 56.3569 33.6308 50.0889 41.3628 50.0889H157.363C165.095 50.0889 171.363 56.3569 171.363 64.0889V70.0889H167.363V64.0889C167.363 58.566 162.886 54.0889 157.363 54.0889H41.3628C35.8399 54.0889 31.3628 58.566 31.3628 64.0889V80.0889H27.3628V64.0889ZM42.3628 138.089H127.363V142.089H42.3628V138.089Z" />
-    <path class="tw-fill-secondary-600" fill-rule="evenodd" clip-rule="evenodd" d="M35.3628 65.0889C35.3628 61.2229 38.4968 58.0889 42.3628 58.0889H156.363C160.229 58.0889 163.363 61.2229 163.363 65.0889V70.0889H161.363V65.0889C161.363 62.3274 159.124 60.0889 156.363 60.0889H42.3628C39.6014 60.0889 37.3628 62.3274 37.3628 65.0889V80.0889H35.3628V65.0889ZM42.3628 132.089H127.363V134.089H42.3628V132.089Z" />
-    <path class="tw-fill-secondary-600" fill-rule="evenodd" clip-rule="evenodd" d="M125.363 78.0889C125.363 72.566 129.84 68.0889 135.363 68.0889H188.363C193.886 68.0889 198.363 72.566 198.363 78.0889V158.089C198.363 163.612 193.886 168.089 188.363 168.089H135.363C129.84 168.089 125.363 163.612 125.363 158.089V78.0889ZM135.363 72.0889C132.049 72.0889 129.363 74.7752 129.363 78.0889V158.089C129.363 161.403 132.049 164.089 135.363 164.089H188.363C191.676 164.089 194.363 161.403 194.363 158.089V78.0889C194.363 74.7752 191.677 72.0889 188.363 72.0889H135.363Z" />
-    <path class="tw-fill-secondary-600" d="M164.363 159.089C164.363 160.193 163.467 161.089 162.363 161.089C161.258 161.089 160.363 160.193 160.363 159.089C160.363 157.984 161.258 157.089 162.363 157.089C163.467 157.089 164.363 157.984 164.363 159.089Z" />
-  </g>
-</svg>
-`;
diff --git a/libs/assets/src/svg/svgs/domain.icon.ts b/libs/assets/src/svg/svgs/domain.icon.ts
new file mode 100644
index 00000000000..04bd173be98
--- /dev/null
+++ b/libs/assets/src/svg/svgs/domain.icon.ts
@@ -0,0 +1,15 @@
+import { svgIcon } from "../icon-service";
+
+export const DomainIcon = svgIcon`
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0.52 0.12 120 120">
+    <path class="tw-fill-illustration-bg-primary" d="M120.518 60.121c0 33.137-26.863 60-60 60s-60-26.863-60-60 26.863-60 60-60 60 26.863 60 60Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M60.518 117.621c31.756 0 57.5-25.743 57.5-57.5 0-31.756-25.744-57.5-57.5-57.5s-57.5 25.744-57.5 57.5 25.744 57.5 57.5 57.5Zm0 2.5c33.137 0 60-26.863 60-60s-26.863-60-60-60-60 26.863-60 60 26.863 60 60 60Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M51.088.858c12.675 9.633 22.026 23.414 26.03 39.32 16.502.649 31.563 6.91 43.326 16.93.049.998.074 2.003.074 3.014l-.001.38c-11.422-10.39-26.357-16.986-42.813-17.796a71.535 71.535 0 0 1 1.564 14.916c0 16.114-5.35 30.978-14.37 42.915a68.918 68.918 0 0 0 16.87 2.085 68.566 68.566 0 0 0 25.496-4.883 60.441 60.441 0 0 1-3.429 3.9 71.193 71.193 0 0 1-22.067 3.483 71.36 71.36 0 0 1-18.555-2.44A71.615 71.615 0 0 1 45.5 118.227a59.379 59.379 0 0 1-3.288-.949 69.075 69.075 0 0 0 18.38-15.355C43.27 96.538 28.78 84.721 19.918 69.265A68.568 68.568 0 0 0 8.75 90.475a59.868 59.868 0 0 1-1.636-2.974 71.13 71.13 0 0 1 11.496-20.618c-5.17-9.868-8.093-21.098-8.093-33.011 0-2.536.132-5.041.39-7.509a60.255 60.255 0 0 1 3.093-4.141 69.204 69.204 0 0 0-.983 11.65c0 11.122 2.641 21.627 7.33 30.923 13.065-15.111 32.376-24.673 53.92-24.673h.253C70.367 24.294 60.712 10.694 47.723 1.49a59.73 59.73 0 0 1 3.365-.63Zm25.68 56.764c0-5.15-.566-10.168-1.64-14.995a70.333 70.333 0 0 0-.86-.005c-21.139 0-40.05 9.54-52.661 24.55 8.663 15.617 23.23 27.506 40.687 32.653 9.071-11.65 14.474-26.295 14.474-42.203Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M84.268 40.121a7.5 7.5 0 1 1-15 0 7.5 7.5 0 0 1 15 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M76.768 45.121a5 5 0 1 0 0-10 5 5 0 0 0 0 10Zm0 2.5a7.5 7.5 0 1 0 0-15 7.5 7.5 0 0 0 0 15Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M70.518 100.121a7.5 7.5 0 1 1-15 0 7.5 7.5 0 0 1 15 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M63.018 105.121a5 5 0 1 0 0-10 5 5 0 0 0 0 10Zm0 2.5a7.5 7.5 0 1 0 0-15 7.5 7.5 0 0 0 0 15Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M28.018 65.121a7.5 7.5 0 1 1-15 0 7.5 7.5 0 0 1 15 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M20.518 70.121a5 5 0 1 0 0-10 5 5 0 0 0 0 10Zm0 2.5a7.5 7.5 0 1 0 0-15 7.5 7.5 0 0 0 0 15Z" clip-rule="evenodd"/>
+  </svg>
+`;
diff --git a/libs/assets/src/svg/svgs/email.icon.ts b/libs/assets/src/svg/svgs/email.icon.ts
deleted file mode 100644
index c6341707880..00000000000
--- a/libs/assets/src/svg/svgs/email.icon.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const EmailIcon = svgIcon`
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="67"
-    height="64"
-    fill="none"
-    class="tw-text-primary-600"
-    role="img"
-    aria-label="[title]"
-  >
-    <title>Email</title>
-    <path
-      stroke="currentColor"
-      stroke-width="2"
-      d="m9.28 19.155-5.848 4.363a4 4 0 0 0-1.608 3.206V59a4 4 0 0 0 4 4h56.044a4 4 0 0 0 4-4V26.742a4 4 0 0 0-1.63-3.223L58.3 19.155M42.438 7.49l-6.442-4.736a4 4 0 0 0-4.762.017l-6.324 4.72"
-    />
-    <path
-      stroke="currentColor"
-      stroke-linecap="round"
-      stroke-width="2"
-      d="M58.373 30.978V9.473a2 2 0 0 0-2-2H11.318a2 2 0 0 0-2 2v21.505"
-    />
-    <path
-      stroke="currentColor"
-      stroke-width="2"
-      d="M64.504 61.637 43.35 42.107a6 6 0 0 0-4.07-1.59H27.421a6 6 0 0 0-4.175 1.69l-20.06 19.43"
-    />
-    <path
-      stroke="currentColor"
-      stroke-linecap="round"
-      stroke-width="2"
-      d="m65.181 27.239-22.81 13.623M2.51 27.24l22.81 13.622"
-    />
-    <rect width="35" height="12" x="16.324" y="17.5" stroke="currentColor" rx="6" />
-    <circle cx="21.324" cy="23.5" r="1.5" fill="currentColor" />
-    <circle cx="31.324" cy="23.5" r="1.5" fill="currentColor" />
-    <circle cx="41.324" cy="23.5" r="1.5" fill="currentColor" />
-    <circle cx="36.324" cy="23.5" r="1.5" fill="currentColor" />
-    <circle cx="46.324" cy="23.5" r="1.5" fill="currentColor" />
-  </svg>
-`;
diff --git a/libs/assets/src/svg/svgs/empty-trash.ts b/libs/assets/src/svg/svgs/empty-trash.ts
index 61df8933d44..d6c0043d880 100644
--- a/libs/assets/src/svg/svgs/empty-trash.ts
+++ b/libs/assets/src/svg/svgs/empty-trash.ts
@@ -1,18 +1,15 @@
 import { svgIcon } from "../icon-service";
 
 export const EmptyTrash = svgIcon`
-<svg width="174" height="100" viewBox="0 0 174 100" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M113.938 95.7919L121.802 25.2171C121.882 24.4997 121.32 23.8721 120.599 23.8721H52.8158C52.0939 23.8721 51.5324 24.4997 51.6123 25.2171L59.4759 95.7919C59.5442 96.405 60.0625 96.8687 60.6794 96.8687H112.735C113.352 96.8687 113.87 96.405 113.938 95.7919Z" fill="none"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" clip-rule="evenodd" d="M70.9462 38.4568C71.1965 38.44 71.4141 38.6291 71.4323 38.8793L74.2991 78.3031C74.3173 78.5532 74.1292 78.7696 73.879 78.7865C73.6288 78.8033 73.4112 78.6142 73.393 78.364L70.5261 38.9402C70.5079 38.6901 70.696 38.4737 70.9462 38.4568Z"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" clip-rule="evenodd" d="M87.4314 38.4082C87.6822 38.4082 87.8855 38.6115 87.8855 38.8623L87.8855 78.3824C87.8855 78.6332 87.6822 78.8365 87.4314 78.8365C87.1806 78.8365 86.9773 78.6332 86.9773 78.3824L86.9773 38.8623C86.9773 38.6115 87.1806 38.4082 87.4314 38.4082Z"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" clip-rule="evenodd" d="M103.917 38.4572C104.167 38.474 104.355 38.6905 104.337 38.9406L101.47 78.3644C101.452 78.6145 101.234 78.8037 100.984 78.7868C100.734 78.77 100.546 78.5536 100.564 78.3035L103.431 38.8797C103.449 38.6295 103.667 38.4404 103.917 38.4572Z"/>
-<path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M52.8159 24.7803C52.6354 24.7803 52.4951 24.9372 52.515 25.1165L59.3506 86.4648H76.54C76.7908 86.4648 76.9941 86.6682 76.9941 86.9189C76.9941 87.1697 76.7908 87.373 76.54 87.373H59.4518L60.3786 95.6913C60.3957 95.8446 60.5252 95.9605 60.6795 95.9605H112.735C112.889 95.9605 113.019 95.8446 113.036 95.6913L120.353 30.0186L58.2399 30.0186C57.9891 30.0186 57.7858 29.8152 57.7858 29.5645C57.7858 29.3137 57.9891 29.1104 58.2399 29.1104L120.455 29.1104L120.9 25.1165C120.919 24.9372 120.779 24.7803 120.599 24.7803H52.8159ZM50.7098 25.3177C50.5699 24.0621 51.5526 22.9639 52.8159 22.9639H120.599C121.862 22.9639 122.845 24.0622 122.705 25.3177L114.841 95.8924C114.722 96.9654 113.815 97.7769 112.735 97.7769H60.6795C59.5999 97.7769 58.6929 96.9654 58.5734 95.8924L50.7098 25.3177Z"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" clip-rule="evenodd" d="M88.4499 0.527344C88.9515 0.527344 89.3581 0.933958 89.3581 1.43554V11.2051C89.3581 11.7067 88.9515 12.1133 88.4499 12.1133C87.9484 12.1133 87.5417 11.7067 87.5417 11.2051V1.43554C87.5417 0.933958 87.9484 0.527344 88.4499 0.527344Z"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" clip-rule="evenodd" d="M56.8137 6.2397C57.2694 6.03014 57.8774 6.18948 58.1718 6.59559L64.3048 15.0563C64.5992 15.4624 64.4684 15.9615 64.0127 16.1711C63.557 16.3806 62.9489 16.2213 62.6545 15.8152L56.5215 7.35447C56.2272 6.94836 56.358 6.44926 56.8137 6.2397Z"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" clip-rule="evenodd" d="M73.1704 2.01822C73.6671 1.94846 74.1576 2.28892 74.266 2.77864L76.396 12.3998C76.5044 12.8895 76.1896 13.3431 75.6929 13.4129C75.1962 13.4826 74.7057 13.1422 74.5973 12.6524L72.4673 3.03126C72.3589 2.54153 72.6737 2.08798 73.1704 2.01822Z"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" clip-rule="evenodd" d="M104.344 2.13682C104.835 2.24151 105.103 2.71177 104.943 3.18717L101.768 12.6239C101.609 13.0993 101.081 13.3998 100.591 13.2951C100.1 13.1904 99.8321 12.7202 99.9921 12.2448L103.167 2.80806C103.327 2.33266 103.854 2.03213 104.344 2.13682Z"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" clip-rule="evenodd" d="M120.085 6.23979C120.541 6.44935 120.672 6.94845 120.378 7.35456L114.245 15.8153C113.95 16.2214 113.342 16.3807 112.886 16.1712C112.431 15.9616 112.3 15.4625 112.594 15.0564L118.727 6.59568C119.022 6.18957 119.63 6.03023 120.085 6.23979Z"/>
-<path d="M129.384 27.2001L124.272 27.9646C123.505 28.0793 123.059 28.8635 123.353 29.579L150.626 95.9087C150.908 96.5946 151.738 96.888 152.38 96.5285L156.79 94.0573C157.31 93.766 157.526 93.1391 157.297 92.5833L130.726 27.9604C130.509 27.4321 129.95 27.1155 129.384 27.2001Z" fill="none"/>
-<path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M144.4 49.2028C145.911 49.8345 146.573 50.261 147.061 50.8557C147.593 51.504 147.976 52.4111 148.726 54.2353L151.93 62.0272C152.68 63.8513 153.045 64.7652 153.118 65.587C153.185 66.3407 153.004 67.0854 152.349 68.5355C152.26 68.732 152.174 68.9115 152.09 69.0865C151.969 69.3389 151.852 69.5821 151.738 69.8536C151.527 70.3581 151.273 71.0631 150.824 72.4643C150.693 72.8741 150.581 73.2651 150.49 73.6452L139.404 46.6825C139.741 46.9012 140.101 47.1138 140.489 47.3276C141.814 48.0582 142.501 48.408 143.015 48.6385C143.292 48.7625 143.55 48.864 143.818 48.9693C144.004 49.0424 144.195 49.1173 144.4 49.2028ZM134.933 40.574C134.938 40.5882 134.943 40.6024 134.949 40.6166C134.99 40.7164 135.031 40.8147 135.072 40.9115L151.431 80.6977C151.47 80.7949 151.51 80.8934 151.551 80.9931C151.557 81.0072 151.563 81.0211 151.569 81.0349L156.449 92.9041C156.507 93.043 156.453 93.1998 156.323 93.2726L151.912 95.7438C151.752 95.8337 151.544 95.7603 151.474 95.5888L124.201 29.2592C124.127 29.0803 124.239 28.8843 124.431 28.8556L129.543 28.0911C129.685 28.0699 129.824 28.1491 129.879 28.2812L134.933 40.574ZM136.764 40.2619C137.429 41.8455 137.981 42.8653 138.622 43.6471C139.287 44.4581 140.092 45.0652 141.355 45.7612C142.672 46.4872 143.303 46.8056 143.742 47.0027C144.006 47.1212 144.177 47.1875 144.389 47.2695C144.566 47.338 144.771 47.4175 145.082 47.5476C146.656 48.2055 147.682 48.778 148.476 49.7453C149.205 50.6349 149.689 51.8128 150.366 53.4594L150.422 53.5946L153.626 61.3866L153.681 61.5218C154.359 63.1683 154.843 64.3461 154.943 65.4735C155.051 66.6995 154.708 67.7893 154.026 69.2998C153.891 69.5983 153.797 69.7904 153.717 69.9561L153.717 69.9563C153.621 70.1545 153.543 70.3148 153.434 70.5741C153.253 71.0054 153.019 71.6508 152.572 73.0431C152.144 74.3778 151.988 75.3479 152.079 76.3759C152.166 77.3668 152.489 78.4733 153.13 80.066L158.145 92.2635C158.545 93.2361 158.168 94.3331 157.258 94.8429L152.847 97.3142C151.724 97.9433 150.271 97.4298 149.778 96.2295L122.505 29.8998C121.99 28.6476 122.771 27.2752 124.113 27.0746L129.225 26.3101C130.216 26.162 131.194 26.716 131.574 27.6406L136.764 40.2619Z"/>
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0.22 7 95.71 88">
+    <path class="tw-fill-illustration-bg-primary" d="M.232 9.21A2 2 0 0 1 2.222 7h67.556a2 2 0 0 1 1.99 2.21l-7.014 66.627A8 8 0 0 1 56.798 83H15.202a8 8 0 0 1-7.956-7.162L.232 9.209Z"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M60.283 80.99C63.59 80.76 61.313 77 58 77H14c-3.314 0-5.59 3.759-2.284 3.99.094.007.189.01.284.01h48c.095 0 .19-.003.283-.01Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M69.778 9H2.221l7.014 66.628A6 6 0 0 0 15.202 81h41.596a6 6 0 0 0 5.967-5.372L69.778 9ZM2.221 7A2 2 0 0 0 .232 9.21l7.014 66.627A8 8 0 0 0 15.202 83h41.596a8 8 0 0 0 7.956-7.162l7.013-66.629A2 2 0 0 0 69.778 7H2.221Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M36 25a1 1 0 0 1 1 1v38a1 1 0 1 1-2 0V26a1 1 0 0 1 1-1ZM27.079 64.997a1 1 0 0 1-1.076-.918l-3-38a1 1 0 1 1 1.994-.158l3 38a1 1 0 0 1-.918 1.076ZM44.921 64.997a1 1 0 0 0 1.076-.918l3-38a1 1 0 1 0-1.994-.158l-3 38a1 1 0 0 0 .918 1.076ZM80.91 29.443a1 1 0 0 0 .688 1.236l5.522 1.573a3 3 0 0 1 2.09 2.168l4.63 18.795a3 3 0 0 1-.844 2.891l-4.159 3.958a1 1 0 1 0 1.379 1.449l4.158-3.958a5 5 0 0 0 1.408-4.818l-4.63-18.795a5 5 0 0 0-3.484-3.613l-5.522-1.573a1 1 0 0 0-1.235.687Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M73.248 10.117c-1.526-.79-3.272.586-2.861 2.254l17.026 69.12c.411 1.668 2.596 2.075 3.581.667l1.486-2.124a8 8 0 0 0 1.213-6.5L79.643 16.5a8 8 0 0 0-4.093-5.192l-2.302-1.191Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M89.355 81.012 72.33 11.893l2.303 1.191a6 6 0 0 1 3.07 3.894L91.75 74.013a6 6 0 0 1-.91 4.875l-1.486 2.124Zm-18.968-68.64c-.411-1.669 1.335-3.045 2.86-2.255l2.303 1.19a8 8 0 0 1 4.093 5.193l14.05 57.035a8 8 0 0 1-1.213 6.5l-1.486 2.123c-.985 1.408-3.17 1-3.58-.668L70.386 12.372Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M48 83c0 6.627-5.373 12-12 12s-12-5.373-12-12 5.373-12 12-12 12 5.373 12 12Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M36 93c5.523 0 10-4.477 10-10s-4.477-10-10-10-10 4.477-10 10 4.477 10 10 10Zm0 2c6.627 0 12-5.373 12-12s-5.373-12-12-12-12 5.373-12 12 5.373 12 12 12Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M41.707 79.293a1 1 0 0 1 0 1.414l-7 7a1 1 0 0 1-1.414 0l-3-3a1 1 0 0 1 1.414-1.414L34 85.586l6.293-6.293a1 1 0 0 1 1.414 0Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/expired-send.icon.ts b/libs/assets/src/svg/svgs/expired-send.icon.ts
deleted file mode 100644
index 19283525b4c..00000000000
--- a/libs/assets/src/svg/svgs/expired-send.icon.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const ExpiredSendIcon = svgIcon`
-    <svg xmlns="http://www.w3.org/2000/svg" width="130" height="130" fill="none">
-        <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M22.75 29.695c0-4.991 4.074-9.037 9.1-9.037h14.3v2.582h-14.3c-3.59 0-6.5 2.89-6.5 6.455v68.428h-2.6V29.696Zm75.4 76.175V68.428h2.6v37.442c0 4.991-4.074 9.038-9.1 9.038h-53.3v-2.582h53.3c3.59 0 6.5-2.891 6.5-6.456Z" clip-rule="evenodd"/>
-        <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M43.55 37.441c0-17.113 13.969-30.986 31.2-30.986s31.2 13.873 31.2 30.986c0 17.114-13.969 30.987-31.2 30.987s-31.2-13.873-31.2-30.986Zm31.2-33.568c-18.667 0-33.8 15.03-33.8 33.569S56.083 71.01 74.75 71.01c18.668 0 33.8-15.03 33.8-33.569S93.418 3.873 74.75 3.873Z" clip-rule="evenodd"/>
-        <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M73.972 65.2c0 .357.291.646.65.646 15.968 0 28.925-12.71 28.925-28.404a.648.648 0 0 0-.65-.646.648.648 0 0 0-.65.646c0 14.967-12.36 27.113-27.625 27.113a.648.648 0 0 0-.65.645ZM46.347 38.087c.36 0 .65-.289.65-.645 0-14.968 12.361-27.113 27.625-27.113.36 0 .65-.29.65-.646a.648.648 0 0 0-.65-.646c-15.968 0-28.925 12.71-28.925 28.405 0 .356.291.645.65.645Z" clip-rule="evenodd"/>
-        <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M123.729 81.869a1.926 1.926 0 0 1 0 2.739l-1.439 1.43a1.96 1.96 0 0 1-2.758 0L95.577 62.245a1.306 1.306 0 0 0-1.839 0 1.285 1.285 0 0 0 0 1.826l23.956 23.791a4.571 4.571 0 0 0 6.434 0l1.44-1.43a4.497 4.497 0 0 0 0-6.39l-23.956-23.791a1.306 1.306 0 0 0-1.838 0 1.285 1.285 0 0 0 0 1.825l23.955 23.792ZM34.45 36.797c0-.714.582-1.292 1.3-1.292h5.85c.718 0 1.3.578 1.3 1.291 0 .714-.582 1.292-1.3 1.292h-5.85c-.718 0-1.3-.578-1.3-1.291Zm0 10.973c0-.713.582-1.29 1.3-1.29h7.8c.718 0 1.3.578 1.3 1.29 0 .714-.582 1.292-1.3 1.292h-7.8c-.718 0-1.3-.578-1.3-1.291Zm0 10.975c0-.713.582-1.291 1.3-1.291H49.4c.718 0 1.3.578 1.3 1.29 0 .714-.582 1.292-1.3 1.292H35.75c-.718 0-1.3-.578-1.3-1.291Zm0 10.975c0-.714.582-1.292 1.3-1.292H72.8c.718 0 1.3.578 1.3 1.291s-.582 1.291-1.3 1.291H35.75c-.718 0-1.3-.578-1.3-1.29Zm0 10.973c0-.713.582-1.29 1.3-1.29h27.3c.718 0 1.3.577 1.3 1.29 0 .713-.582 1.291-1.3 1.291h-27.3c-.718 0-1.3-.578-1.3-1.29Zm6.5 10.975c0-.713.582-1.291 1.3-1.291H88.4c.718 0 1.3.578 1.3 1.291s-.582 1.291-1.3 1.291H42.25c-.718 0-1.3-.578-1.3-1.291Zm0 10.974c0-.713.582-1.291 1.3-1.291H88.4c.718 0 1.3.578 1.3 1.291s-.582 1.291-1.3 1.291H42.25c-.718 0-1.3-.578-1.3-1.291Z" clip-rule="evenodd"/>
-        <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M43.664 86.742c.412.292.617.794.524 1.289l-6.366 33.964a1.305 1.305 0 0 1-1.745.968l-9.692-3.707-4.914 5.689c-.355.41-.928.557-1.438.37a1.292 1.292 0 0 1-.849-1.211v-8.444c0-.305.108-.599.306-.832l14.73-17.357a1.306 1.306 0 0 1 1.831-.156c.549.46.619 1.275.156 1.82L21.784 116.13v4.485l3.225-3.733c.358-.414.94-.56 1.454-.364l9.089 3.476 5.567-29.698-32.42 18.385 6.813 3.082c.653.296.941 1.061.643 1.71a1.303 1.303 0 0 1-1.722.64l-9.122-4.128a1.289 1.289 0 0 1-.106-2.296l37.06-21.017c.44-.249.986-.222 1.399.07Z" clip-rule="evenodd"/>
-    </svg>
-`;
diff --git a/libs/assets/src/svg/svgs/extension-bitwarden-logo.icon.ts b/libs/assets/src/svg/svgs/extension-bitwarden-logo.icon.ts
deleted file mode 100644
index 42a74e006bc..00000000000
--- a/libs/assets/src/svg/svgs/extension-bitwarden-logo.icon.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const ExtensionBitwardenLogo = svgIcon`
-  <svg
-    width="132"
-    height="22"
-    viewBox="0 0 132 22"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <title>Bitwarden</title>
-    <path
-    class="tw-fill-marketing-logo"
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M31.1754 5.95639C32.6979 5.95639 33.8821 6.53974 34.7521 7.75507C35.6221 8.94609 36.0571 10.5746 36.0571 12.6407C36.0571 14.7797 35.6221 16.4325 34.7279 17.5992C33.8338 18.7902 32.6254 19.3493 31.1029 19.3493C29.5804 19.3493 28.4204 18.8146 27.5503 17.6965H27.3087L26.8495 18.8389C26.777 19.009 26.6078 19.1062 26.4387 19.1062H24.5053C24.2636 19.1062 24.0703 18.9118 24.0703 18.6687V1.5812C24.0703 1.33814 24.2636 1.14369 24.5053 1.14369H27.1153C27.357 1.14369 27.5503 1.33814 27.5503 1.5812V5.32441C27.5503 5.85916 27.502 6.70989 27.4053 7.8766H27.5503C28.3479 6.61266 29.5804 5.95639 31.1754 5.95639ZM30.0637 8.80025C29.2179 8.80025 28.5654 9.06762 28.1545 9.60237C27.7679 10.1371 27.5503 11.0365 27.5503 12.2518V12.6407C27.5503 14.0262 27.7437 15.0227 28.1545 15.6061C28.5654 16.1894 29.2179 16.5054 30.112 16.5054C30.8129 16.5054 31.4171 16.1651 31.8279 15.4846C32.2387 14.8283 32.4562 13.8317 32.4562 12.5921C32.4562 11.3281 32.2387 10.3802 31.8279 9.74821C31.3929 9.11624 30.7887 8.80025 30.0637 8.80025ZM41.8089 19.1305H39.1988C38.9572 19.1305 38.7638 18.9361 38.7638 18.693V6.66128C38.7638 6.41821 38.9572 6.22376 39.1988 6.22376H41.8089C42.0505 6.22376 42.2439 6.41821 42.2439 6.66128V18.6687C42.268 18.8875 42.0505 19.1305 41.8089 19.1305ZM51.3548 16.5297C51.8623 16.5297 52.4665 16.4325 53.1915 16.2381C53.3848 16.1894 53.554 16.3353 53.554 16.5297V18.5472C53.554 18.6687 53.4815 18.7659 53.3848 18.8146C52.5632 19.1548 51.524 19.325 50.364 19.325C48.9623 19.325 47.9473 18.9847 47.3189 18.2555C46.6906 17.5506 46.3523 16.4811 46.3523 15.0713V8.87317H44.9747C44.8056 8.87317 44.6847 8.75164 44.6847 8.58149V7.43909C44.6847 7.41478 44.7089 7.39047 44.7089 7.36617L46.6181 6.22376L47.5606 3.69588C47.6089 3.57434 47.7056 3.50142 47.8264 3.50142H49.5665C49.7356 3.50142 49.8565 3.62296 49.8565 3.7931V6.24806H53.3123C53.3848 6.24806 53.4573 6.32098 53.4573 6.3939V8.58149C53.4573 8.75164 53.3365 8.87317 53.1673 8.87317H49.8806V15.047C49.8806 15.5332 50.0256 15.9221 50.2915 16.1408C50.5331 16.4082 50.9198 16.5297 51.3548 16.5297ZM67.6192 19.1305C67.2808 19.1305 67.015 18.9118 66.87 18.5958L64.3083 10.7448C64.1391 10.1857 63.9216 9.335 63.6316 8.2412H63.5591L63.3175 9.11624L62.81 10.7691L60.1758 18.6201C60.0791 18.9361 59.7891 19.1305 59.4507 19.1305C59.1124 19.1305 58.8224 18.9118 58.7257 18.5715L55.5115 7.26894C55.4149 6.92865 55.6807 6.56405 56.0674 6.56405H56.1399C56.3815 6.56405 56.599 6.73419 56.6715 6.97726L58.5566 13.856C59.0157 15.6547 59.3299 16.9673 59.4749 17.8423H59.5474C59.9824 16.0436 60.3208 14.8526 60.5383 14.2449L62.9791 7.05018C63.0758 6.7585 63.3416 6.56405 63.68 6.56405C63.9941 6.56405 64.26 6.7585 64.3566 7.05018L66.6283 14.1963C67.1842 16.0193 67.5225 17.186 67.6433 17.7937H67.7159C67.7884 17.3075 68.0784 15.9464 68.6342 13.7588L70.4467 6.97726C70.5192 6.73419 70.7367 6.56405 70.9784 6.56405C71.3409 6.56405 71.6067 6.90434 71.5101 7.26894L68.465 18.5715C68.3684 18.9118 68.0784 19.1305 67.7159 19.1305H67.6192ZM81.9744 19.1305C81.7569 19.1305 81.5635 18.9604 81.5394 18.7416L81.3219 17.1374H81.201C80.5727 17.9395 79.9443 18.5229 79.2677 18.8632C78.6152 19.2035 77.8176 19.3493 76.9235 19.3493C75.6909 19.3493 74.7484 19.0333 74.0718 18.4013C73.4676 17.8423 73.1293 17.0888 73.0809 16.1408C72.9843 14.8769 73.5159 13.6616 74.5309 12.9567C75.5701 12.2761 77.0201 11.8629 78.9777 11.8629L81.346 11.79V10.9635C81.346 9.74821 81.1044 8.87317 80.5968 8.26551C80.0893 7.65784 79.3402 7.36617 78.2768 7.36617C77.2618 7.36617 76.2468 7.60923 75.1834 8.11967C74.9176 8.2412 74.6034 8.11967 74.4826 7.8523C74.3618 7.58492 74.4826 7.26894 74.7484 7.17171C75.9568 6.68558 77.141 6.41821 78.3493 6.41821C79.7268 6.41821 80.7419 6.78281 81.4427 7.512C82.1194 8.2169 82.4577 9.3593 82.4577 10.842V18.7416C82.4335 18.8875 82.216 19.1305 81.9744 19.1305ZM76.9718 18.3041C78.3252 18.3041 79.3643 17.9152 80.1135 17.1617C80.8869 16.4082 81.2735 15.3144 81.2735 13.9775V12.7622L79.0985 12.8594C77.3343 12.9324 76.1018 13.224 75.3285 13.6859C74.5793 14.1477 74.1926 14.9012 74.1926 15.8735C74.1926 16.6513 74.4343 17.2832 74.8934 17.7208C75.4251 18.0854 76.1018 18.3041 76.9718 18.3041ZM91.2787 6.32098C91.6412 6.32098 92.0037 6.34529 92.4145 6.3939C92.7287 6.44252 92.922 6.73419 92.8737 7.02587C92.8253 7.31755 92.5353 7.4877 92.2453 7.43909C91.8828 7.39047 91.5203 7.34186 91.1578 7.34186C90.0945 7.34186 89.2245 7.80368 88.5478 8.70303C87.8711 9.60237 87.5328 10.7691 87.5328 12.1303V18.4986C87.5328 18.8146 87.2911 19.0576 86.9769 19.0576C86.6628 19.0576 86.4211 18.8146 86.4211 18.4986V7.07449C86.4211 6.80711 86.6386 6.58836 86.9044 6.58836C87.1703 6.58836 87.3878 6.78281 87.3878 7.05018L87.4844 8.84887H87.5569C88.0644 7.92522 88.6203 7.26894 89.2003 6.90434C89.7561 6.51544 90.457 6.32098 91.2787 6.32098ZM99.7854 6.32098C100.68 6.32098 101.477 6.49113 102.13 6.80711C102.806 7.1231 103.386 7.70646 103.894 8.50857H103.966C103.918 7.512 103.894 6.58836 103.894 5.66471V1.70274C103.894 1.38675 104.135 1.14369 104.45 1.14369C104.764 1.14369 105.005 1.38675 105.005 1.70274V18.693C105.005 18.9118 104.836 19.0819 104.619 19.0819C104.425 19.0819 104.256 18.9361 104.232 18.7173L103.99 17.1374H103.894C102.951 18.5715 101.574 19.2764 99.8096 19.2764C98.0696 19.2764 96.7887 18.7416 95.8462 17.6478C94.952 16.554 94.4687 14.9984 94.4687 12.9324C94.4687 10.7691 94.9037 9.11624 95.822 7.94952C96.7404 6.90434 98.0454 6.32098 99.7854 6.32098ZM99.7854 7.36617C98.4079 7.36617 97.3929 7.8523 96.6921 8.82456C96.0154 9.77252 95.677 11.158 95.677 13.0053C95.677 16.554 97.0546 18.3284 99.8096 18.3284C101.235 18.3284 102.25 17.9152 102.903 17.0888C103.58 16.2624 103.894 14.9012 103.894 13.0053V12.8108C103.894 10.8663 103.58 9.48084 102.903 8.65441C102.275 7.77938 101.235 7.36617 99.7854 7.36617ZM114.261 19.3493C112.449 19.3493 111.047 18.7902 110.008 17.6478C108.993 16.5297 108.486 14.9498 108.486 12.9324C108.486 10.9149 108.969 9.31069 109.96 8.11967C110.951 6.90434 112.256 6.29668 113.923 6.29668C115.373 6.29668 116.557 6.80711 117.379 7.82799C118.249 8.84887 118.66 10.2586 118.66 12.033V12.9567H109.67C109.694 14.6824 110.081 15.995 110.878 16.9186C111.676 17.8423 112.787 18.2555 114.261 18.2555C114.962 18.2555 115.615 18.2069 116.146 18.1097C116.533 18.0367 116.992 17.9152 117.548 17.7208C117.862 17.5992 118.201 17.8423 118.201 18.1826C118.201 18.377 118.08 18.5715 117.886 18.6444C117.306 18.8875 116.751 19.0333 116.243 19.1305C115.639 19.3007 114.986 19.3493 114.261 19.3493ZM113.923 7.34186C112.715 7.34186 111.748 7.73076 111.023 8.53288C110.298 9.31069 109.887 10.4774 109.742 11.9601H117.476C117.476 10.526 117.161 9.3593 116.533 8.55719C115.905 7.75507 115.035 7.34186 113.923 7.34186ZM131.42 19.1305C131.106 19.1305 130.864 18.8875 130.864 18.5715V10.9635C130.864 9.6996 130.598 8.77595 130.091 8.21689C129.535 7.65784 128.737 7.34186 127.626 7.34186C126.127 7.34186 125.04 7.70646 124.363 8.48427C123.687 9.23777 123.3 10.4774 123.3 12.1546V18.5229C123.3 18.8389 123.058 19.0819 122.744 19.0819C122.43 19.0819 122.188 18.8389 122.188 18.5229V7.07449C122.188 6.78281 122.406 6.56405 122.696 6.56405C122.962 6.56405 123.155 6.7585 123.203 7.00157L123.348 8.26551H123.421C124.242 6.95295 125.668 6.29668 127.747 6.29668C130.574 6.29668 132 7.82799 132 10.8906V18.5229C131.976 18.8632 131.71 19.1305 131.42 19.1305ZM40.528 0.949234C39.3922 0.949234 38.4738 1.82427 38.4738 2.91807V3.11252C38.4738 4.18201 39.4163 5.08135 40.528 5.08135C41.6397 5.08135 42.5822 4.18201 42.5822 3.11252V2.94237C42.5822 1.82427 41.6397 0.949234 40.528 0.949234ZM16.2885 1.38675C16.1194 1.21661 15.926 1.14369 15.7085 1.14369H0.821677C0.580007 1.14369 0.410839 1.21661 0.24167 1.38675C0.0725009 1.5569 0 1.77566 0 1.97011V11.9358C0 12.665 0.145002 13.4185 0.435005 14.1477C0.725009 14.8769 1.06335 15.5332 1.49835 16.0922C1.90919 16.6513 2.44086 17.2346 3.02087 17.7451C3.60088 18.2798 4.15672 18.7416 4.66423 19.0819C5.14756 19.4222 5.7034 19.7625 6.23508 20.0785C6.76675 20.3945 7.15342 20.6132 7.37093 20.7105C7.58843 20.832 7.78176 20.9049 7.9026 20.9778C7.99927 21.0265 8.1201 21.0508 8.24094 21.0508C8.36177 21.0508 8.48261 21.0265 8.57928 20.9778C8.72428 20.9292 8.89345 20.832 9.13511 20.7105C9.35262 20.5889 9.73929 20.3945 10.271 20.0785C10.8026 19.7625 11.3343 19.4222 11.8418 19.0819C12.3252 18.7416 12.9052 18.2798 13.4852 17.7451C14.0652 17.2103 14.5727 16.6756 15.0077 16.0922C15.4185 15.5332 15.781 14.8769 16.071 14.1477C16.361 13.4185 16.506 12.665 16.506 11.9358V1.97011C16.5302 1.77566 16.4577 1.5569 16.2885 1.38675ZM14.3793 12.033C14.3793 15.6547 8.2651 18.7659 8.2651 18.7659V3.28266H14.3793C14.3793 3.28266 14.3793 8.43565 14.3793 12.033Z"
-    />
-  </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/gear.ts b/libs/assets/src/svg/svgs/gear.ts
index 35349f78cce..261c6d262e1 100644
--- a/libs/assets/src/svg/svgs/gear.ts
+++ b/libs/assets/src/svg/svgs/gear.ts
@@ -1,20 +1,23 @@
 import { svgIcon } from "../icon-service";
 
 export const GearIcon = svgIcon`
-<svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M59.9995 37.9541C46.4641 37.9541 35.5465 48.6298 35.5465 61.7321C35.5465 74.8343 46.4641 85.51 59.9995 85.51C73.5349 85.51 84.4526 74.8343 84.4526 61.7321C84.4526 48.6298 73.5349 37.9541 59.9995 37.9541ZM33.1465 61.7321C33.1465 47.2444 45.1994 35.5541 59.9995 35.5541C74.7997 35.5541 86.8526 47.2444 86.8526 61.7321C86.8526 76.2197 74.7997 87.91 59.9995 87.91C45.1994 87.91 33.1465 76.2197 33.1465 61.7321Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M98.9992 8.4C94.36 8.4 90.5992 12.1608 90.5992 16.8C90.5992 21.4392 94.36 25.2 98.9992 25.2C103.638 25.2 107.399 21.4392 107.399 16.8C107.399 12.1608 103.638 8.4 98.9992 8.4ZM88.1992 16.8C88.1992 10.8353 93.0345 6 98.9992 6C104.964 6 109.799 10.8353 109.799 16.8C109.799 22.7647 104.964 27.6 98.9992 27.6C93.0345 27.6 88.1992 22.7647 88.1992 16.8Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M109.2 56.4C104.561 56.4 100.8 60.1608 100.8 64.8C100.8 69.4392 104.561 73.2 109.2 73.2C113.84 73.2 117.6 69.4392 117.6 64.8C117.6 60.1608 113.84 56.4 109.2 56.4ZM98.4004 64.8C98.4004 58.8353 103.236 54 109.2 54C115.165 54 120 58.8353 120 64.8C120 70.7647 115.165 75.6 109.2 75.6C103.236 75.6 98.4004 70.7647 98.4004 64.8Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M100.8 99C96.1608 99 92.4 102.761 92.4 107.4C92.4 112.039 96.1608 115.8 100.8 115.8C105.439 115.8 109.2 112.039 109.2 107.4C109.2 102.761 105.439 99 100.8 99ZM90 107.4C90 101.435 94.8353 96.6 100.8 96.6C106.765 96.6 111.6 101.435 111.6 107.4C111.6 113.365 106.765 118.2 100.8 118.2C94.8353 118.2 90 113.365 90 107.4Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M37.8 98.4C33.1608 98.4 29.4 102.161 29.4 106.8C29.4 111.439 33.1608 115.2 37.8 115.2C42.4392 115.2 46.2 111.439 46.2 106.8C46.2 102.161 42.4392 98.4 37.8 98.4ZM27 106.8C27 100.835 31.8353 96 37.8 96C43.7647 96 48.6 100.835 48.6 106.8C48.6 112.765 43.7647 117.6 37.8 117.6C31.8353 117.6 27 112.765 27 106.8Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M10.8 40.2C6.16081 40.2 2.4 43.9608 2.4 48.6C2.4 53.2392 6.16081 57 10.8 57C15.4392 57 19.2 53.2392 19.2 48.6C19.2 43.9608 15.4392 40.2 10.8 40.2ZM0 48.6C0 42.6353 4.83532 37.8 10.8 37.8C16.7647 37.8 21.6 42.6353 21.6 48.6C21.6 54.5647 16.7647 59.4 10.8 59.4C4.83532 59.4 0 54.5647 0 48.6Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M38.3996 3.60001C33.7604 3.60001 29.9996 7.36082 29.9996 12C29.9996 16.6392 33.7604 20.4 38.3996 20.4C43.0388 20.4 46.7996 16.6392 46.7996 12C46.7996 7.36082 43.0388 3.60001 38.3996 3.60001ZM27.5996 12C27.5996 6.03534 32.4349 1.20001 38.3996 1.20001C44.3643 1.20001 49.1996 6.03534 49.1996 12C49.1996 17.9647 44.3643 22.8 38.3996 22.8C32.4349 22.8 27.5996 17.9647 27.5996 12Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M42.217 21.3484C42.5229 21.221 42.8742 21.3656 43.0017 21.6715L49.7525 37.8734C49.8799 38.1793 49.7353 38.5306 49.4294 38.6581C49.1235 38.7855 48.7722 38.6409 48.6448 38.335L41.894 22.133C41.7665 21.8272 41.9112 21.4759 42.217 21.3484Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M92.7905 24.1445C93.0435 24.3585 93.075 24.7371 92.861 24.9901L78.0092 42.5422C77.7952 42.7951 77.4166 42.8267 77.1636 42.6126C76.9107 42.3986 76.8791 42.02 77.0932 41.767L91.9449 24.2149C92.159 23.962 92.5375 23.9304 92.7905 24.1445Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M20.4265 51.4253C20.523 51.1083 20.8582 50.9295 21.1752 51.026L34.9752 55.226C35.2923 55.3225 35.471 55.6577 35.3746 55.9747C35.2781 56.2917 34.9429 56.4705 34.6259 56.374L20.8259 52.174C20.5088 52.0776 20.3301 51.7424 20.4265 51.4253Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M49.4777 84.0684C49.7714 84.2219 49.8849 84.5845 49.7314 84.8781L42.9795 97.7892C42.8259 98.0829 42.4634 98.1964 42.1697 98.0429C41.8761 97.8893 41.7625 97.5268 41.9161 97.2331L48.668 84.322C48.8216 84.0284 49.1841 83.9148 49.4777 84.0684Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M77.1582 79.5058C77.4086 79.2888 77.7876 79.3159 78.0046 79.5663L95.5567 99.8187C95.7737 100.069 95.7466 100.448 95.4962 100.665C95.2458 100.882 94.8669 100.855 94.6499 100.605L77.0978 80.3522C76.8807 80.1018 76.9078 79.7229 77.1582 79.5058Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M85.0558 62.3473C85.0887 62.0176 85.3828 61.7771 85.7125 61.81L99.2141 63.1602C99.5438 63.1932 99.7844 63.4872 99.7514 63.8169C99.7184 64.1466 99.4244 64.3872 99.0947 64.3542L85.5931 63.0041C85.2634 62.9711 85.0228 62.6771 85.0558 62.3473Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M55.0583 45.4382C54.888 45.247 54.615 45.185 54.3788 45.2838L52.1688 46.2079C51.9281 46.3086 51.7801 46.5531 51.8024 46.8129L52.1362 50.6898C52.1819 51.2204 51.9902 51.744 51.6128 52.1197L50.2505 53.4761C49.894 53.8311 49.4052 54.0206 48.9027 53.9989L45.0074 53.8303C44.7569 53.8194 44.5261 53.9655 44.4286 54.1965L43.4934 56.4137C43.3921 56.6536 43.4573 56.9315 43.6545 57.1014L46.5356 59.5838C46.9324 59.9257 47.1606 60.4236 47.1606 60.9474V62.8948C47.1606 63.4058 46.9435 63.8927 46.5633 64.2341L43.7142 66.7927C43.5238 66.9636 43.4628 67.2365 43.5622 67.4723L44.4892 69.6698C44.5905 69.9098 44.835 70.0571 45.0945 70.0343L48.8457 69.7047C49.3746 69.6583 49.897 69.8477 50.2732 70.2223L51.6345 71.5776C51.9931 71.9346 52.1849 72.4261 52.1628 72.9317L51.994 76.7976C51.983 77.0488 52.1299 77.2803 52.3619 77.3773L54.5876 78.308C54.8286 78.4088 55.1071 78.3421 55.2763 78.143L57.6994 75.2918C58.0414 74.8894 58.5429 74.6575 59.071 74.6575H61.0298C61.5381 74.6575 62.0226 74.8723 62.3639 75.249L64.9399 78.0926C65.1106 78.281 65.3815 78.3414 65.616 78.2433L67.8309 77.3171C68.072 77.2163 68.2202 76.9709 68.1971 76.7106L67.8673 72.9892C67.8201 72.4571 68.0117 71.9316 68.3903 71.5547L69.7513 70.1996C70.1078 69.8447 70.5965 69.6551 71.0991 69.6769L74.9944 69.8455C75.2449 69.8563 75.4757 69.7103 75.5731 69.4793L76.5045 67.2715C76.6066 67.0293 76.5393 66.7488 76.3382 66.5794L73.4814 64.1727C73.0755 63.8307 72.8412 63.3269 72.8412 62.7961V60.856C72.8412 60.3457 73.0578 59.8594 73.4371 59.518L76.3646 56.8836C76.5546 56.7125 76.6154 56.4399 76.5161 56.2043L75.5887 54.006C75.4875 53.766 75.2429 53.6187 74.9834 53.6415L71.2322 53.9711C70.7034 54.0175 70.181 53.8281 69.8047 53.4535L68.4434 52.0982C68.0848 51.7411 67.8931 51.2496 67.9152 50.7441L68.084 46.8782C68.0949 46.627 67.9481 46.3955 67.716 46.2985L65.4903 45.3678C65.2493 45.267 64.9708 45.3337 64.8016 45.5328L62.3785 48.384C62.0365 48.7864 61.5351 49.0183 61.007 49.0183H59.0542C58.5406 49.0183 58.0516 48.799 57.71 48.4155L55.0583 45.4382ZM53.9158 44.1767C54.6246 43.8803 55.4434 44.0664 55.9544 44.6401L58.6061 47.6174C58.72 47.7452 58.883 47.8183 59.0542 47.8183H61.007C61.183 47.8183 61.3502 47.741 61.4642 47.6069L63.8872 44.7557C64.3947 44.1585 65.2303 43.9583 65.9532 44.2607L68.179 45.1914C68.8751 45.4825 69.3157 46.1768 69.2828 46.9306L69.114 50.7964C69.1067 50.965 69.1706 51.1288 69.2901 51.2478L70.6514 52.6031C70.7768 52.728 70.9509 52.7911 71.1272 52.7757L74.8784 52.4461C75.6569 52.3777 76.3906 52.8195 76.6944 53.5396L77.6217 55.7379C77.9198 56.4446 77.7374 57.2625 77.1673 57.7755L74.2398 60.41C74.1134 60.5238 74.0412 60.6859 74.0412 60.856V62.7961C74.0412 62.973 74.1193 63.1409 74.2546 63.2549L77.1114 65.6617C77.7145 66.1698 77.9166 67.0113 77.6101 67.7379L76.6788 69.9457C76.3864 70.6387 75.694 71.0769 74.9425 71.0444L71.0472 70.8758C70.8797 70.8685 70.7168 70.9317 70.598 71.05L69.2369 72.4051C69.1108 72.5307 69.0469 72.7059 69.0626 72.8833L69.3924 76.6046C69.4616 77.3857 69.0173 78.1217 68.2939 78.4242L66.079 79.3504C65.3753 79.6447 64.5626 79.4635 64.0505 78.8982L61.4745 76.0547C61.3608 75.9291 61.1993 75.8575 61.0298 75.8575H59.071C58.8949 75.8575 58.7278 75.9348 58.6138 76.0689L56.1907 78.9201C55.6832 79.5173 54.8477 79.7174 54.1247 79.4151L51.899 78.4844C51.2029 78.1933 50.7622 77.499 50.7951 76.7452L50.9639 72.8793C50.9713 72.7108 50.9074 72.547 50.7878 72.428L49.4265 71.0726C49.3011 70.9478 49.127 70.8846 48.9507 70.9001L45.1996 71.2297C44.421 71.298 43.6873 70.8562 43.3836 70.1362L42.4566 67.9387C42.1582 67.2314 42.3412 66.4127 42.9124 65.8998L45.7615 63.3412C45.8883 63.2274 45.9606 63.0651 45.9606 62.8948V60.9474C45.9606 60.7728 45.8846 60.6069 45.7523 60.4929L42.8712 58.0105C42.2794 57.5006 42.0841 56.6671 42.3877 55.9473L43.323 53.7301C43.6153 53.0371 44.3078 52.5989 45.0593 52.6314L48.9546 52.8C49.1221 52.8073 49.285 52.7441 49.4038 52.6258L50.7662 51.2694C50.892 51.1441 50.9558 50.9696 50.9406 50.7927L50.6069 46.9159C50.5398 46.1363 50.9839 45.4027 51.7058 45.1008L53.9158 44.1767ZM65.7734 59.49C64.5008 56.2102 60.7895 54.7187 57.5276 56.0511C54.2534 57.3885 52.7303 61.0753 54.0787 64.2677C55.4244 67.5297 59.1264 69.0401 62.327 67.6984C65.5088 66.3645 67.1209 62.6899 65.7734 59.49ZM64.6574 59.9312C63.6423 57.3035 60.6562 56.0694 57.9814 57.162C55.3169 58.2503 54.0985 61.2338 55.185 63.8029L55.1872 63.808L55.1872 63.808C56.2791 66.4579 59.2771 67.6758 61.863 66.5917C64.4656 65.5006 65.7472 62.5089 64.6645 59.9487C64.662 59.9429 64.6597 59.9371 64.6574 59.9312Z" fill="#CED4DC"/>
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="4.8 6 110.4 107.52">
+    <path class="tw-fill-illustration-bg-primary" d="M59.64 84.96c12.924 0 23.4-10.316 23.4-23.04 0-12.725-10.476-23.04-23.4-23.04-12.923 0-23.4 10.315-23.4 23.04 0 12.724 10.477 23.04 23.4 23.04Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M59.64 40.08c-12.278 0-22.2 9.795-22.2 21.84 0 12.044 9.922 21.84 22.2 21.84 12.278 0 22.2-9.796 22.2-21.84 0-12.045-9.922-21.84-22.2-21.84Zm-24.6 21.84c0-13.405 11.031-24.24 24.6-24.24s24.6 10.835 24.6 24.24c0 13.405-11.031 24.24-24.6 24.24s-24.6-10.835-24.6-24.24Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M96 28.8a8.64 8.64 0 0 0 8.639-8.64 8.64 8.64 0 1 0-17.28 0A8.64 8.64 0 0 0 96 28.8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M96 12.72a7.44 7.44 0 1 0 0 14.88 7.44 7.44 0 0 0 0-14.88Zm-9.84 7.44c0-5.434 4.405-9.84 9.84-9.84 5.434 0 9.84 4.406 9.84 9.84 0 5.435-4.406 9.84-9.84 9.84-5.435 0-9.84-4.405-9.84-9.84Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M105.359 72.72a8.64 8.64 0 0 0 8.64-8.64 8.64 8.64 0 1 0-17.28 0 8.64 8.64 0 0 0 8.64 8.64Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M105.36 56.64a7.44 7.44 0 1 0 0 14.881 7.44 7.44 0 0 0 0-14.88Zm-9.84 7.44c0-5.434 4.405-9.84 9.84-9.84 5.434 0 9.84 4.406 9.84 9.84 0 5.435-4.406 9.84-9.84 9.84-5.435 0-9.84-4.405-9.84-9.84Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M97.44 112.32a8.64 8.64 0 1 0 0-17.28 8.64 8.64 0 0 0 0 17.28Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M97.44 96.24a7.44 7.44 0 1 0 0 14.88 7.44 7.44 0 0 0 0-14.88Zm-9.84 7.44c0-5.435 4.405-9.84 9.84-9.84 5.434 0 9.84 4.405 9.84 9.84 0 5.434-4.406 9.84-9.84 9.84-5.435 0-9.84-4.406-9.84-9.84Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M39.119 111.599a8.64 8.64 0 1 0 0-17.28 8.64 8.64 0 0 0 0 17.28Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M39.12 95.52a7.44 7.44 0 1 0 0 14.88 7.44 7.44 0 0 0 0-14.88Zm-9.84 7.44c0-5.434 4.405-9.84 9.84-9.84 5.434 0 9.84 4.406 9.84 9.84 0 5.435-4.406 9.84-9.84 9.84-5.435 0-9.84-4.405-9.84-9.84Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M14.64 58.32a8.64 8.64 0 1 0 0-17.28 8.64 8.64 0 0 0 0 17.28Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M14.64 42.24a7.44 7.44 0 1 0 0 14.88 7.44 7.44 0 0 0 0-14.88ZM4.8 49.68c0-5.435 4.405-9.84 9.84-9.84 5.434 0 9.84 4.405 9.84 9.84 0 5.434-4.406 9.84-9.84 9.84-5.435 0-9.84-4.406-9.84-9.84Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M39.84 24.48a8.64 8.64 0 1 0 0-17.28 8.64 8.64 0 0 0 0 17.28Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M39.84 8.4a7.44 7.44 0 1 0 0 14.88 7.44 7.44 0 0 0 0-14.88ZM30 15.84C30 10.406 34.406 6 39.84 6s9.84 4.405 9.84 9.84c0 5.434-4.405 9.84-9.84 9.84-5.434 0-9.84-4.405-9.84-9.84Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M43.687 24.097a1.2 1.2 0 0 1 1.576.63l6.48 15.12a1.2 1.2 0 0 1-2.206.946l-6.48-15.12a1.2 1.2 0 0 1 .63-1.576ZM90.305 26.452a1.2 1.2 0 0 1 .123 1.692l-13.68 15.84a1.2 1.2 0 1 1-1.816-1.568l13.68-15.84a1.2 1.2 0 0 1 1.693-.124ZM22.844 52.239a1.2 1.2 0 0 1 1.477-.835l12.96 3.6a1.2 1.2 0 1 1-.642 2.312l-12.96-3.6a1.2 1.2 0 0 1-.835-1.477ZM51.228 82.475a1.2 1.2 0 0 1 .458 1.634l-6.48 11.52a1.2 1.2 0 1 1-2.092-1.177l6.48-11.52a1.2 1.2 0 0 1 1.634-.457ZM75.065 77.564a1.2 1.2 0 0 1 1.691.141l15.84 18.72a1.2 1.2 0 1 1-1.832 1.55l-15.84-18.72a1.2 1.2 0 0 1 .141-1.69ZM82.568 61.78a1.2 1.2 0 0 1 1.332-1.052l12.24 1.44a1.2 1.2 0 0 1-.28 2.384l-12.24-1.44a1.2 1.2 0 0 1-1.052-1.332Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M72.633 60.217a1.2 1.2 0 0 0-.397.892v1.668c0 .354.156.69.427.918l2.501 2.107c.403.339.537.9.333 1.384l-.788 1.868a1.2 1.2 0 0 1-1.158.733l-3.424-.149a1.2 1.2 0 0 0-.898.349l-1.17 1.165a1.2 1.2 0 0 0-.349.956l.289 3.26a1.2 1.2 0 0 1-.732 1.212l-1.874.784a1.2 1.2 0 0 1-1.352-.302l-2.262-2.497a1.2 1.2 0 0 0-.89-.394h-1.685a1.2 1.2 0 0 0-.915.423l-2.122 2.498a1.2 1.2 0 0 1-1.378.33l-1.884-.788a1.2 1.2 0 0 1-.736-1.16l.148-3.397a1.2 1.2 0 0 0-.352-.902l-1.17-1.165a1.2 1.2 0 0 0-.952-.345l-3.287.288a1.2 1.2 0 0 1-1.21-.729l-.784-1.857a1.2 1.2 0 0 1 .304-1.36l2.501-2.245a1.2 1.2 0 0 0 .398-.893v-1.676a1.2 1.2 0 0 0-.416-.909l-2.526-2.176a1.2 1.2 0 0 1-.323-1.376l.792-1.877a1.2 1.2 0 0 1 1.158-.732l3.424.148a1.2 1.2 0 0 0 .898-.349l1.172-1.166c.251-.25.379-.6.348-.953L52 48.402a1.2 1.2 0 0 1 .732-1.21l1.869-.782a1.2 1.2 0 0 1 1.359.31l2.33 2.616a1.2 1.2 0 0 0 .897.402h1.68a1.2 1.2 0 0 0 .914-.423l2.123-2.497a1.2 1.2 0 0 1 1.377-.33l1.884.788a1.2 1.2 0 0 1 .736 1.159l-.148 3.397a1.2 1.2 0 0 0 .352.902l1.17 1.166c.251.25.6.376.952.345l3.287-.29a1.2 1.2 0 0 1 1.21.73l.784 1.858a1.2 1.2 0 0 1-.302 1.359l-2.573 2.315Zm-14.677-3.025c-2.704 1.105-3.952 4.141-2.843 6.764 1.11 2.692 4.16 3.934 6.794 2.83 2.634-1.104 3.951-4.141 2.842-6.764-1.04-2.692-4.09-3.934-6.793-2.83Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M54.138 45.303a2.4 2.4 0 0 1 2.718.618l2.33 2.617h1.68l2.123-2.498a2.4 2.4 0 0 1 2.755-.66l1.884.788a2.4 2.4 0 0 1 1.472 2.32l-.148 3.396 1.17 1.165 3.287-.289a2.4 2.4 0 0 1 2.421 1.458l.784 1.859a2.4 2.4 0 0 1-.606 2.717l-2.572 2.315v1.668l2.501 2.107a2.4 2.4 0 0 1 .665 2.769l-.788 1.868a2.4 2.4 0 0 1-2.315 1.465l-3.424-.149-1.17 1.165.29 3.26a2.4 2.4 0 0 1-1.465 2.425l-1.874.784a2.4 2.4 0 0 1-2.705-.603L60.89 75.37h-1.685l-2.123 2.498a2.4 2.4 0 0 1-2.755.66l-1.884-.788a2.4 2.4 0 0 1-1.472-2.32l.148-3.396-1.17-1.165-3.287.289a2.4 2.4 0 0 1-2.421-1.458l-.784-1.858a2.4 2.4 0 0 1 .608-2.718l2.501-2.246v-1.676l-2.526-2.176a2.4 2.4 0 0 1-.645-2.751l.792-1.878a2.4 2.4 0 0 1 2.315-1.465l3.425.149 1.17-1.166-.292-3.401a2.4 2.4 0 0 1 1.465-2.42l1.869-.782Zm.926 2.214-1.869.782.293 3.4a2.4 2.4 0 0 1-.698 1.907l-1.171 1.166a2.4 2.4 0 0 1-1.797.697l-3.424-.148-.792 1.878 2.526 2.176a2.4 2.4 0 0 1 .833 1.818v1.676a2.4 2.4 0 0 1-.796 1.785L45.668 66.9l.783 1.858 3.287-.289a2.4 2.4 0 0 1 1.904.69l1.17 1.165a2.4 2.4 0 0 1 .704 1.806l-.148 3.397 1.884.787 2.123-2.497a2.4 2.4 0 0 1 1.829-.846h1.685a2.4 2.4 0 0 1 1.78.789l2.261 2.496 1.874-.783-.29-3.26a2.4 2.4 0 0 1 .698-1.912l1.17-1.165a2.4 2.4 0 0 1 1.797-.697l3.424.149.788-1.868-2.502-2.108a2.4 2.4 0 0 1-.853-1.835v-1.669a2.4 2.4 0 0 1 .794-1.783l2.573-2.315-.784-1.859-3.287.289a2.4 2.4 0 0 1-1.903-.69l-1.17-1.165a2.4 2.4 0 0 1-.705-1.806l.148-3.397-1.884-.788-2.123 2.498a2.4 2.4 0 0 1-1.828.846h-1.68a2.4 2.4 0 0 1-1.792-.804l-2.331-2.617Zm10.798 12.055c-1.301-3.338-5.073-4.834-8.36-3.49-3.313 1.352-4.865 5.091-3.496 8.336 1.364 3.302 5.117 4.836 8.365 3.474 3.21-1.345 4.858-5.06 3.49-8.32Zm-2.232.882c-.786-2.033-3.107-3.014-5.22-2.151-2.094.855-3.037 3.187-2.191 5.186l.004.01a3.98 3.98 0 0 0 5.22 2.18c2.052-.86 3.038-3.209 2.2-5.19a1.065 1.065 0 0 1-.013-.035Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/index.ts b/libs/assets/src/svg/svgs/index.ts
index a5a4c215a29..40a91f78d4d 100644
--- a/libs/assets/src/svg/svgs/index.ts
+++ b/libs/assets/src/svg/svgs/index.ts
@@ -7,66 +7,49 @@ export * from "./bitwarden-logo.icon";
 export * from "./browser-extension";
 export { default as BusinessUnitPortalLogo } from "./business-unit-portal";
 export * from "./carousel-icon";
-export * from "./create-passkey-failed.icon";
-export * from "./create-passkey.icon";
+export * from "./credit-card.icon";
 export * from "./deactivated-org";
-export * from "./device-verification.icon";
 export * from "./devices.icon";
-export * from "./devices";
-export * from "./email.icon";
+export * from "./domain.icon";
 export * from "./empty-trash";
-export * from "./expired-send.icon";
-export * from "./extension-bitwarden-logo.icon";
+export * from "./favorites.icon";
 export * from "./gear";
 export * from "./generator";
+export * from "./item-types";
 export * from "./lock.icon";
 export * from "./login-cards";
-export * from "./no-access";
 export * from "./no-credentials.icon";
 export * from "./no-folders";
 export * from "./no-results";
 export * from "./no-send.icon";
-export * from "./partner-trust";
 export * from "./party";
 export { default as PasswordManagerLogo } from "./password-manager";
 export { default as ProviderPortalLogo } from "./provider-portal";
-export * from "./recovery.icon";
 export * from "./registration-check-email.icon";
-export * from "./registration-expired-link.icon";
-export * from "./registration-lock-alt.icon";
 export * from "./registration-user-add.icon";
 export * from "./report-breach.icon";
 export * from "./report-exposed-passwords.icon";
-export * from "./report-inactive-two-factor.icon";
-export * from "./report-member-access.icon";
-export * from "./report-reused-passwords.icon";
 export * from "./report-unsecured-websites.icon";
-export * from "./report-weak-passwords.icon";
 export * from "./restricted-view";
-export * from "./search";
 export * from "./secrets-manager-alt";
 export { default as SecretsManagerLogo } from "./secrets-manager";
-export * from "./secure-devices";
-export * from "./secure-user";
-export * from "./security-handshake";
 export * from "./security";
 export * from "./send";
 export * from "./settings";
 export * from "./shield";
 export * from "./sso-key.icon";
-export * from "./subscription-hidden";
-export * from "./totp.icon";
 export * from "./two-factor-auth-authenticator.icon";
 export * from "./two-factor-auth-duo.icon";
 export * from "./two-factor-auth-email.icon";
+export * from "./two-factor-auth-security-key-failed.icon";
 export * from "./two-factor-auth-security-key.icon";
 export * from "./two-factor-auth-webauthn.icon";
 export * from "./two-factor-auth-yubico.icon";
 export * from "./two-factor-timeout.icon";
+export * from "./unlocked.icon";
 export * from "./user-lock.icon";
 export * from "./user-verification-biometrics-fingerprint.icon";
 export * from "./vault-open";
 export * from "./vault.icon";
 export * from "./vault";
 export * from "./wave.icon";
-export * from "./webauthn.icon";
diff --git a/libs/assets/src/svg/svgs/item-types.ts b/libs/assets/src/svg/svgs/item-types.ts
new file mode 100644
index 00000000000..50ed51bd018
--- /dev/null
+++ b/libs/assets/src/svg/svgs/item-types.ts
@@ -0,0 +1,23 @@
+import { svgIcon } from "../icon-service";
+
+export const ItemTypes = svgIcon`
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 18.75 150 112.5">
+    <path class="tw-fill-illustration-bg-secondary" d="M0 28.125a9.375 9.375 0 0 1 9.375-9.375h50a9.375 9.375 0 0 1 9.375 9.375v31.25a9.375 9.375 0 0 1-9.375 9.375h-50A9.375 9.375 0 0 1 0 59.375v-31.25Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M59.375 21.875h-50a6.25 6.25 0 0 0-6.25 6.25v31.25a6.25 6.25 0 0 0 6.25 6.25h50a6.25 6.25 0 0 0 6.25-6.25v-31.25a6.25 6.25 0 0 0-6.25-6.25Zm-50-3.125A9.375 9.375 0 0 0 0 28.125v31.25a9.375 9.375 0 0 0 9.375 9.375h50a9.375 9.375 0 0 0 9.375-9.375v-31.25a9.375 9.375 0 0 0-9.375-9.375h-50Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M0 90.625a9.375 9.375 0 0 1 9.375-9.375h50a9.375 9.375 0 0 1 9.375 9.375v31.25a9.375 9.375 0 0 1-9.375 9.375h-50A9.375 9.375 0 0 1 0 121.875v-31.25Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M59.375 84.375h-50a6.25 6.25 0 0 0-6.25 6.25v31.25a6.25 6.25 0 0 0 6.25 6.25h50a6.25 6.25 0 0 0 6.25-6.25v-31.25a6.25 6.25 0 0 0-6.25-6.25Zm-50-3.125A9.375 9.375 0 0 0 0 90.625v31.25a9.375 9.375 0 0 0 9.375 9.375h50a9.375 9.375 0 0 0 9.375-9.375v-31.25a9.375 9.375 0 0 0-9.375-9.375h-50Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M81.25 28.125a9.375 9.375 0 0 1 9.375-9.375h50A9.375 9.375 0 0 1 150 28.125v31.25a9.375 9.375 0 0 1-9.375 9.375h-50a9.375 9.375 0 0 1-9.375-9.375v-31.25Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M140.625 21.875h-50a6.25 6.25 0 0 0-6.25 6.25v31.25a6.25 6.25 0 0 0 6.25 6.25h50a6.25 6.25 0 0 0 6.25-6.25v-31.25a6.25 6.25 0 0 0-6.25-6.25Zm-50-3.125a9.375 9.375 0 0 0-9.375 9.375v31.25a9.375 9.375 0 0 0 9.375 9.375h50A9.375 9.375 0 0 0 150 59.375v-31.25a9.375 9.375 0 0 0-9.375-9.375h-50Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M81.25 90.625a9.375 9.375 0 0 1 9.375-9.375h50A9.375 9.375 0 0 1 150 90.625v31.25a9.375 9.375 0 0 1-9.375 9.375h-50a9.375 9.375 0 0 1-9.375-9.375v-31.25Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M140.625 84.375h-50a6.25 6.25 0 0 0-6.25 6.25v31.25a6.25 6.25 0 0 0 6.25 6.25h50a6.25 6.25 0 0 0 6.25-6.25v-31.25a6.25 6.25 0 0 0-6.25-6.25Zm-50-3.125a9.375 9.375 0 0 0-9.375 9.375v31.25a9.375 9.375 0 0 0 9.375 9.375h50a9.375 9.375 0 0 0 9.375-9.375v-31.25a9.375 9.375 0 0 0-9.375-9.375h-50Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M84.375 31.25h62.5v6.25h-62.5v-6.25ZM90.625 54.688c0-.863.7-1.563 1.563-1.563h9.374a1.563 1.563 0 1 1 0 3.125h-9.374c-.863 0-1.563-.7-1.563-1.563Z"/>
+    <path class="tw-fill-illustration-outline" d="M92.188 95.313c0-.863.7-1.563 1.562-1.563h43.75a1.562 1.562 0 0 1 0 3.125H93.75c-.863 0-1.563-.7-1.563-1.563ZM92.188 106.25c0-.863.7-1.562 1.562-1.562h43.75a1.562 1.562 0 1 1 0 3.124H93.75a1.562 1.562 0 0 1-1.563-1.562ZM92.188 117.188c0-.863.7-1.563 1.562-1.563h20.312a1.563 1.563 0 0 1 0 3.125H93.75c-.863 0-1.563-.7-1.563-1.562ZM39.063 95.313c0-.863.7-1.563 1.562-1.563h18.75a1.563 1.563 0 0 1 0 3.125h-18.75c-.863 0-1.563-.7-1.563-1.563ZM39.063 101.562c0-.862.7-1.562 1.562-1.562h7.813a1.563 1.563 0 0 1 0 3.125h-7.813c-.863 0-1.563-.7-1.563-1.563Z"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M107.812 54.688c0-.863.7-1.563 1.563-1.563h14.063a1.563 1.563 0 0 1 0 3.125h-14.063c-.863 0-1.563-.7-1.563-1.563Z"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M32.813 97.656a8.594 8.594 0 1 1-17.189 0 8.594 8.594 0 0 1 17.188 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M24.219 103.125a5.468 5.468 0 1 0 0-10.937 5.468 5.468 0 0 0 0 10.937Zm0 3.125a8.594 8.594 0 1 0 0-17.188 8.594 8.594 0 0 0 0 17.188Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M40.82 115.663c.903 2.158 1.367 3.877 1.367 6.212 0 .863-.7 1.563-1.562 1.563H7.812c-.862 0-1.562-.7-1.562-1.563 0-2.335.465-4.054 1.368-6.212a17.77 17.77 0 0 1 3.895-5.768 17.974 17.974 0 0 1 5.83-3.854 18.125 18.125 0 0 1 6.876-1.353c2.36 0 4.696.459 6.876 1.353 2.18.893 4.161 2.203 5.83 3.854a17.77 17.77 0 0 1 3.895 5.768Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M38.964 120.312c-.15-1.105-.478-2.131-1.027-3.442a14.634 14.634 0 0 0-3.21-4.753 14.865 14.865 0 0 0-4.817-3.185 15.012 15.012 0 0 0-11.382 0 14.865 14.865 0 0 0-4.817 3.185 14.634 14.634 0 0 0-3.21 4.753c-.55 1.311-.877 2.337-1.027 3.442h29.49Zm3.224 1.563c0-2.335-.465-4.054-1.368-6.212a17.77 17.77 0 0 0-3.895-5.768 17.974 17.974 0 0 0-5.83-3.854 18.125 18.125 0 0 0-6.876-1.353c-2.36 0-4.697.459-6.877 1.353a17.974 17.974 0 0 0-5.83 3.854 17.77 17.77 0 0 0-3.894 5.768c-.903 2.158-1.368 3.877-1.368 6.212 0 .863.7 1.563 1.563 1.563h32.812c.863 0 1.563-.7 1.563-1.563Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" fill-rule="evenodd" d="M21.875 59.375c5.784 0 10.833-3.142 13.535-7.813h2.358c.829 0 1.624-.329 2.21-.915l2.21-2.21 2.93 2.345c.57.456 1.381.456 1.952 0L50 48.438l2.21 2.21c.586.585 1.38.914 2.21.914h1.89c.95 0 1.848-.431 2.44-1.172l4.532-5.664a1.562 1.562 0 0 0 0-1.952L58.75 37.11a3.125 3.125 0 0 0-2.44-1.172H35.41c-2.702-4.67-7.751-7.813-13.535-7.813-8.63 0-15.625 6.996-15.625 15.625 0 8.63 6.996 15.625 15.625 15.625Zm-3.125-12.5a3.125 3.125 0 1 0 0-6.25 3.125 3.125 0 0 0 0 6.25Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M33.607 48.438h4.161l4.188-4.188 4.138 3.31 4.138-3.31 4.187 4.188h1.892l3.75-4.688-3.75-4.688H33.606l-.902-1.56a12.494 12.494 0 0 0-10.83-6.252c-6.904 0-12.5 5.596-12.5 12.5s5.596 12.5 12.5 12.5c4.623 0 8.664-2.508 10.83-6.252l.902-1.56Zm27.234-5.664-.001.002.001-.002ZM25 43.75a6.25 6.25 0 1 1-12.5 0 6.25 6.25 0 0 1 12.5 0Zm10.41 7.813c-2.702 4.67-7.751 7.812-13.535 7.812-8.63 0-15.625-6.996-15.625-15.625 0-8.63 6.996-15.625 15.625-15.625 5.784 0 10.833 3.142 13.535 7.813h20.9c.95 0 1.848.431 2.44 1.172l4.532 5.664c.456.57.456 1.381 0 1.952L58.75 50.39a3.125 3.125 0 0 1-2.44 1.172h-1.892c-.828 0-1.623-.329-2.21-.915L50 48.437l-2.93 2.345a1.562 1.562 0 0 1-1.952 0l-2.93-2.344-2.21 2.21a3.125 3.125 0 0 1-2.21.914H35.41ZM21.875 43.75a3.125 3.125 0 1 1-6.25 0 3.125 3.125 0 0 1 6.25 0Z" clip-rule="evenodd"/>
+  </svg>
+`;
diff --git a/libs/assets/src/svg/svgs/lock.icon.ts b/libs/assets/src/svg/svgs/lock.icon.ts
index 5d5d23bcdd1..9d73ad6294c 100644
--- a/libs/assets/src/svg/svgs/lock.icon.ts
+++ b/libs/assets/src/svg/svgs/lock.icon.ts
@@ -1,17 +1,15 @@
 import { svgIcon } from "../icon-service";
 
 export const LockIcon = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100" fill="none">
-    <path class="tw-fill-art-primary" fill-rule="evenodd" d="M27.5 48.218a9 9 0 0 1 9-9h47a9 9 0 0 1 9 9v7.5h-2v-7.5a7 7 0 0 0-7-7h-47a7 7 0 0 0-7 7v7.5h-2v-7.5Zm2 30.75v3.75a7 7 0 0 0 7 7h47a7 7 0 0 0 7-7v-3.75h2v3.75a9 9 0 0 1-9 9h-47a9 9 0 0 1-9-9v-3.75h2Z" clip-rule="evenodd"/>
-    <path class="tw-fill-art-primary" fill-rule="evenodd" d="M60 10.718c-11.144 0-20 7.942-20 17.414v11.586h-2V28.132C38 17.317 48.007 8.718 60 8.718c11.991 0 22 8.552 22 19.414v11.586h-2V28.132c0-9.516-8.855-17.414-20-17.414ZM32.028 61.28a1 1 0 0 1 1 1v5.678a1 1 0 1 1-2 0v-5.679a1 1 0 0 1 1-1Z" clip-rule="evenodd"/>
-    <path class="tw-fill-art-primary" fill-rule="evenodd" d="M38.452 65.897a1 1 0 0 1-.647 1.258l-5.472 1.755a1 1 0 1 1-.61-1.904l5.471-1.755a1 1 0 0 1 1.258.646Z" clip-rule="evenodd"/>
-    <path class="tw-fill-art-primary" fill-rule="evenodd" d="M31.442 67.147a1 1 0 0 1 1.396.225l3.356 4.646a1 1 0 0 1-1.622 1.171l-3.355-4.646a1 1 0 0 1 .225-1.396Z" clip-rule="evenodd"/>
-    <path class="tw-fill-art-primary" fill-rule="evenodd" d="M32.607 67.143a1 1 0 0 1 .236 1.394l-3.304 4.646a1 1 0 0 1-1.63-1.159l3.304-4.646a1 1 0 0 1 1.394-.235Z" clip-rule="evenodd"/>
-    <path class="tw-fill-art-primary" fill-rule="evenodd" d="M25.656 65.895a1 1 0 0 1 1.26-.644l5.42 1.755a1 1 0 1 1-.616 1.903l-5.42-1.755a1 1 0 0 1-.644-1.26ZM50.508 61.28a1 1 0 0 1 1 1v5.678a1 1 0 1 1-2 0v-5.679a1 1 0 0 1 1-1Z" clip-rule="evenodd"/>
-    <path class="tw-fill-art-primary" fill-rule="evenodd" d="M56.88 65.895a1 1 0 0 1-.644 1.26l-5.42 1.754a1 1 0 1 1-.616-1.903l5.42-1.755a1 1 0 0 1 1.26.644Z" clip-rule="evenodd"/>
-    <path class="tw-fill-art-primary" fill-rule="evenodd" d="M49.922 67.147a1 1 0 0 1 1.397.225l3.355 4.646a1 1 0 1 1-1.621 1.171l-3.356-4.646a1 1 0 0 1 .225-1.396Z" clip-rule="evenodd"/>
-    <path class="tw-fill-art-primary" fill-rule="evenodd" d="M51.093 67.147a1 1 0 0 1 .226 1.396l-3.356 4.646a1 1 0 0 1-1.621-1.17l3.355-4.647a1 1 0 0 1 1.396-.225Z" clip-rule="evenodd"/>
-    <path class="tw-fill-art-primary" fill-rule="evenodd" d="M44.136 65.895a1 1 0 0 1 1.26-.644l5.42 1.755a1 1 0 1 1-.616 1.903l-5.42-1.755a1 1 0 0 1-.644-1.26ZM62.568 72.603a1 1 0 0 1 1-1h10.84a1 1 0 1 1 0 2h-10.84a1 1 0 0 1-1-1ZM81.049 72.603a1 1 0 0 1 1-1h10.84a1 1 0 1 1 0 2H82.05a1 1 0 0 1-1-1Z" clip-rule="evenodd"/>
-    <path class="tw-fill-art-accent" fill-rule="evenodd" d="M17.5 67.468c0-7.042 5.708-12.75 12.75-12.75h59.5c7.041 0 12.75 5.708 12.75 12.75s-5.709 12.75-12.75 12.75h-59.5c-7.042 0-12.75-5.708-12.75-12.75Zm12.75-10.75c-5.937 0-10.75 4.813-10.75 10.75s4.813 10.75 10.75 10.75h59.5c5.937 0 10.75-4.813 10.75-10.75s-4.813-10.75-10.75-10.75h-59.5Z" clip-rule="evenodd"/>
-  </svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 80 73.33">
+  <path class="tw-fill-illustration-bg-primary" d="M11.667 31.666c0-5.523 3.805-10 8.5-10h39.666c4.695 0 8.5 4.477 8.5 10v31.667c0 5.523-3.805 10-8.5 10H20.167c-4.695 0-8.5-4.477-8.5-10V31.666Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M59.833 23.333H20.167c-3.912 0-7.084 3.73-7.084 8.333v31.667c0 4.602 3.172 8.333 7.084 8.333h39.666c3.912 0 7.084-3.73 7.084-8.333V31.666c0-4.602-3.172-8.333-7.084-8.333Zm-39.666-1.667c-4.695 0-8.5 4.477-8.5 10v31.667c0 5.523 3.805 10 8.5 10h39.666c4.695 0 8.5-4.477 8.5-10V31.666c0-5.523-3.805-10-8.5-10H20.167Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-tertiary" d="M55.833 22.5v-5.834C55.833 7.922 48.745.833 40 .833c-8.744 0-15.833 7.089-15.833 15.833V22.5h5v-5.834c0-5.983 4.85-10.833 10.833-10.833 5.983 0 10.833 4.85 10.833 10.833V22.5h5Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M23.333 16.667C23.333 7.462 30.795 0 40 0c9.205 0 16.667 7.462 16.667 16.667v6.666H50v-6.666c0-5.523-4.477-10-10-10s-10 4.477-10 10v6.666h-6.667v-6.666ZM40 1.667c-8.284 0-15 6.715-15 15v5h3.333v-5C28.333 10.223 33.557 5 40 5s11.667 5.223 11.667 11.667v5H55v-5c0-8.285-6.716-15-15-15Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-secondary" d="M13.333 55.833h53.334V62.5H13.333v-6.667Z"/>
+  <path class="tw-fill-illustration-bg-primary" d="M25 18.333h3.333v3.333H25v-3.333Zm26.667 0H55v3.333h-3.333v-3.333Z"/>
+  <path class="tw-fill-illustration-tertiary" d="M0 47.5c0-5.523 4.477-10 10-10h60c5.523 0 10 4.477 10 10s-4.477 10-10 10H10c-5.523 0-10-4.477-10-10Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M70 39.167H10a8.333 8.333 0 1 0 0 16.666h60a8.333 8.333 0 1 0 0-16.666ZM10 37.5c-5.523 0-10 4.477-10 10s4.477 10 10 10h60c5.523 0 10-4.477 10-10s-4.477-10-10-10H10Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M16.667 42.5c.46 0 .833.389.833.868v3.48l3.117-1.658c.424-.225.942-.078 1.158.328.216.407.048.919-.375 1.144l-3.365 1.789 2.69 2.885c.327.35.32.89-.017 1.203-.337.314-.875.284-1.202-.067l-2.84-3.045-2.839 3.045c-.327.351-.865.38-1.201.067-.337-.314-.345-.853-.018-1.203l2.69-2.885-3.364-1.79c-.423-.224-.591-.736-.375-1.143.216-.406.734-.553 1.157-.328l3.118 1.658v-3.48c0-.48.373-.868.833-.868ZM30 42.5c.46 0 .834.389.834.868v3.48l3.116-1.658c.424-.225.942-.078 1.158.328.216.407.048.919-.375 1.144l-3.365 1.789 2.69 2.885c.328.35.32.89-.017 1.203-.336.314-.874.284-1.201-.067L30 49.427l-2.84 3.045c-.326.351-.864.38-1.2.067-.338-.314-.345-.853-.018-1.203l2.69-2.885-3.365-1.79c-.423-.224-.591-.736-.375-1.143.216-.406.734-.553 1.158-.328l3.117 1.658v-3.48c0-.48.373-.868.833-.868Zm14.167.868c0-.48-.373-.868-.834-.868-.46 0-.833.389-.833.868v3.48l-3.117-1.658c-.423-.225-.942-.078-1.158.328-.216.407-.048.919.376 1.144l3.364 1.789-2.69 2.885c-.327.35-.32.89.017 1.203.337.314.875.284 1.202-.067l2.84-3.045 2.839 3.045c.327.351.865.38 1.202.067.336-.314.344-.853.017-1.203l-2.69-2.885 3.364-1.79c.424-.224.592-.736.376-1.143-.216-.406-.735-.553-1.158-.328l-3.117 1.657v-3.479Zm6.666 8.299c0-.46.374-.834.834-.834h6.666a.833.833 0 0 1 0 1.667h-6.666a.833.833 0 0 1-.834-.833Zm10.834-.834a.833.833 0 0 0 0 1.667h6.666a.833.833 0 0 0 0-1.667h-6.666Z" clip-rule="evenodd"/>
+</svg>
 `;
diff --git a/libs/assets/src/svg/svgs/login-cards.ts b/libs/assets/src/svg/svgs/login-cards.ts
index 0eea164a512..3a43b1a0121 100644
--- a/libs/assets/src/svg/svgs/login-cards.ts
+++ b/libs/assets/src/svg/svgs/login-cards.ts
@@ -1,11 +1,21 @@
 import { svgIcon } from "../icon-service";
 
 export const LoginCards = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="none">
-<path class="tw-fill-art-primary" fill-rule="evenodd" d="M134.152 32.493c0-.69.559-1.25 1.25-1.25h1.493a8.707 8.707 0 0 1 8.707 8.707v79.047a8.707 8.707 0 0 1-8.707 8.707H22.054c-4.81 0-8.707-3.906-8.707-8.713a1.25 1.25 0 1 1 2.5 0 6.212 6.212 0 0 0 6.207 6.213h114.841a6.207 6.207 0 0 0 6.207-6.207V39.95a6.207 6.207 0 0 0-6.207-6.207h-1.493a1.25 1.25 0 0 1-1.25-1.25Z" clip-rule="evenodd"/>
-<path class="tw-fill-art-primary" fill-rule="evenodd" d="M13.105 24.795a6.207 6.207 0 0 0-6.207 6.207v80.538a6.207 6.207 0 0 0 6.207 6.207h114.841a6.207 6.207 0 0 0 6.208-6.207V31.002a6.207 6.207 0 0 0-6.208-6.207H13.106Zm-8.707 6.207a8.707 8.707 0 0 1 8.707-8.707h114.841a8.708 8.708 0 0 1 8.708 8.707v80.538a8.708 8.708 0 0 1-8.708 8.707H13.106a8.707 8.707 0 0 1-8.708-8.707V31.002Z" clip-rule="evenodd"/>
-<path class="tw-fill-art-primary" fill-rule="evenodd" d="M120.964 75.915H20.766c-.819 0-1.483.664-1.483 1.483v8.949c0 .819.664 1.483 1.483 1.483h100.198c.819 0 1.483-.664 1.483-1.483v-8.95c0-.818-.664-1.482-1.483-1.482Zm-100.198-1.5a2.983 2.983 0 0 0-2.983 2.983v8.949a2.983 2.983 0 0 0 2.983 2.983h100.198a2.983 2.983 0 0 0 2.983-2.983v-8.95a2.983 2.983 0 0 0-2.983-2.982H20.766ZM120.964 96.794H20.766c-.819 0-1.483.664-1.483 1.483v8.948c0 .819.664 1.483 1.483 1.483h100.198c.819 0 1.483-.664 1.483-1.483v-8.948c0-.82-.664-1.483-1.483-1.483Zm-100.198-1.5a2.983 2.983 0 0 0-2.983 2.983v8.948a2.983 2.983 0 0 0 2.983 2.983h100.198a2.983 2.983 0 0 0 2.983-2.983v-8.948a2.983 2.983 0 0 0-2.983-2.983H20.766Z" clip-rule="evenodd"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" d="M22.795 81.712a.75.75 0 0 1 .75-.75H87.68a.75.75 0 0 1 0 1.5H23.545a.75.75 0 0 1-.75-.75ZM26.618 100.354a.75.75 0 0 0-1.5 0v1.426l-1.34-.439a.75.75 0 0 0-.466 1.426l1.353.443-.845 1.183a.75.75 0 0 0 1.221.872l.827-1.158.827 1.158a.75.75 0 0 0 1.22-.872l-.845-1.183 1.353-.443a.75.75 0 0 0-.466-1.426l-1.34.439v-1.426Zm9.584 0a.75.75 0 0 0-1.5 0v1.426l-1.339-.439a.75.75 0 0 0-.466 1.426l1.353.443-.845 1.183a.75.75 0 0 0 1.22.872l.827-1.158.827 1.158a.75.75 0 0 0 1.22-.872l-.844-1.183 1.353-.443a.75.75 0 0 0-.467-1.426l-1.339.439v-1.426Zm8.834-.75a.75.75 0 0 1 .75.75v1.426l1.339-.439a.75.75 0 0 1 .467 1.426l-1.353.443.845 1.183a.75.75 0 0 1-1.22.872l-.828-1.159-.827 1.159a.75.75 0 1 1-1.22-.872l.844-1.183-1.353-.443a.75.75 0 0 1 .467-1.426l1.339.439v-1.426a.75.75 0 0 1 .75-.75Zm10.334.75a.75.75 0 0 0-1.5 0v1.426l-1.339-.439a.75.75 0 0 0-.466 1.426l1.353.443-.845 1.183a.75.75 0 1 0 1.22.872l.828-1.159.827 1.159a.75.75 0 0 0 1.22-.872l-.845-1.183 1.353-.443a.75.75 0 0 0-.467-1.426l-1.339.439v-1.426Zm8.835-.75a.75.75 0 0 1 .75.75v1.426l1.338-.439a.75.75 0 0 1 .467 1.426l-1.352.443.845 1.183a.75.75 0 0 1-1.221.872l-.827-1.159-.828 1.159a.75.75 0 0 1-1.22-.872L63 103.21l-1.353-.443a.75.75 0 0 1 .467-1.426l1.34.439v-1.426a.75.75 0 0 1 .75-.75Zm10.334.75a.75.75 0 0 0-1.5 0v1.426l-1.34-.439a.75.75 0 0 0-.466 1.426l1.353.443-.845 1.183a.75.75 0 1 0 1.221.872l.827-1.158.827 1.158a.75.75 0 0 0 1.22-.872l-.844-1.183 1.352-.443a.75.75 0 0 0-.466-1.426l-1.34.439v-1.426ZM53.215 50.395c0-9.566 7.755-17.314 17.313-17.314 9.56 0 17.308 7.749 17.314 17.313 0 5.31-2.399 10.061-6.16 13.236l-.742.626-.418-.876c-1.785-3.736-5.584-6.324-9.994-6.324s-8.214 2.583-9.992 6.323l-.418.878-.743-.627c-3.761-3.175-6.16-7.92-6.16-13.236Zm13.8 5.66a12.594 12.594 0 0 0-7.373 5.801 15.759 15.759 0 0 1-4.927-11.462c0-8.736 7.083-15.813 15.813-15.813s15.808 7.077 15.814 15.814c0 4.51-1.895 8.58-4.928 11.462a12.623 12.623 0 0 0-7.373-5.802 6.659 6.659 0 0 0 3.149-5.66 6.663 6.663 0 0 0-6.662-6.662 6.663 6.663 0 0 0-6.66 6.662 6.659 6.659 0 0 0 3.147 5.66Zm3.513-10.822a5.163 5.163 0 0 0-5.16 5.162 5.163 5.163 0 0 0 5.16 5.16 5.163 5.163 0 0 0 5.162-5.16 5.163 5.163 0 0 0-5.162-5.162Z" clip-rule="evenodd"/>
-<path class="tw-fill-art-primary" fill-rule="evenodd" d="M70.528 34.57c-8.743 0-15.83 7.081-15.83 15.816s7.087 15.817 15.83 15.817c8.744 0 15.83-7.082 15.83-15.817S79.272 34.57 70.528 34.57Zm-17.33 15.816c0-9.564 7.76-17.317 17.33-17.317 9.571 0 17.33 7.753 17.33 17.317 0 9.565-7.759 17.317-17.33 17.317-9.57 0-17.33-7.752-17.33-17.317Z" clip-rule="evenodd"/>
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="6.25 6.25 137.5 137.5">
+    <path class="tw-fill-illustration-bg-secondary" d="M18.75 53.125a9.375 9.375 0 0 1 9.375-9.375h106.25a9.375 9.375 0 0 1 9.375 9.375v81.25a9.375 9.375 0 0 1-9.375 9.375H28.125a9.375 9.375 0 0 1-9.375-9.375v-81.25Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M134.375 46.875H28.125a6.25 6.25 0 0 0-6.25 6.25v81.25a6.25 6.25 0 0 0 6.25 6.25h106.25a6.25 6.25 0 0 0 6.25-6.25v-81.25a6.25 6.25 0 0 0-6.25-6.25ZM28.125 43.75a9.375 9.375 0 0 0-9.375 9.375v81.25a9.375 9.375 0 0 0 9.375 9.375h106.25a9.375 9.375 0 0 0 9.375-9.375v-81.25a9.375 9.375 0 0 0-9.375-9.375H28.125Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M6.25 15.625a9.375 9.375 0 0 1 9.375-9.375H112.5a9.375 9.375 0 0 1 9.375 9.375v89.063a9.374 9.374 0 0 1-9.375 9.374H15.625c-5.178 0-9.375-4.197-9.375-9.374V15.625Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M112.5 9.375H15.625a6.25 6.25 0 0 0-6.25 6.25v89.063a6.25 6.25 0 0 0 6.25 6.25H112.5a6.25 6.25 0 0 0 6.25-6.25V15.625a6.25 6.25 0 0 0-6.25-6.25ZM15.625 6.25a9.375 9.375 0 0 0-9.375 9.375v89.063c0 5.177 4.197 9.374 9.375 9.374H112.5a9.374 9.374 0 0 0 9.375-9.374V15.625A9.375 9.375 0 0 0 112.5 6.25H15.625Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M14.063 60.938c0-1.726 1.399-3.126 3.124-3.126h93.751c1.725 0 3.124 1.4 3.124 3.126v15.624a3.125 3.125 0 0 1-3.124 3.126h-93.75a3.125 3.125 0 0 1-3.125-3.126V60.938Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M110.938 60.938h-93.75v15.624h93.75V60.938Zm-93.75-3.126a3.125 3.125 0 0 0-3.125 3.126v15.624c0 1.726 1.399 3.126 3.124 3.126h93.751c1.725 0 3.124-1.4 3.124-3.126V60.938a3.125 3.125 0 0 0-3.124-3.126h-93.75Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M14.063 87.5c0-1.726 1.399-3.125 3.124-3.125h93.751c1.725 0 3.124 1.4 3.124 3.125v15.625a3.125 3.125 0 0 1-3.124 3.125h-93.75a3.125 3.125 0 0 1-3.125-3.125V87.5Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M110.938 87.5h-93.75v15.625h93.75V87.5Zm-93.75-3.125a3.125 3.125 0 0 0-3.125 3.125v15.625c0 1.726 1.399 3.125 3.124 3.125h93.751a3.125 3.125 0 0 0 3.124-3.125V87.5a3.125 3.125 0 0 0-3.124-3.125h-93.75ZM142.187 60.938h-21.875v-3.126h21.876l-.001 3.126Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M26.57 89.957c.862 0 1.562.7 1.562 1.563v2.187l2.05-.671a1.562 1.562 0 0 1 .973 2.97l-2.078.68 1.301 1.822a1.562 1.562 0 0 1-2.543 1.817l-1.265-1.773-1.266 1.772a1.561 1.561 0 1 1-2.543-1.815l1.301-1.823-2.078-.68a1.562 1.562 0 1 1 .972-2.97l2.05.671V91.52c0-.862.7-1.562 1.563-1.562Zm14.062 0c.863 0 1.562.7 1.562 1.563v2.187l2.05-.671a1.562 1.562 0 0 1 .973 2.97l-2.078.68 1.302 1.822a1.562 1.562 0 0 1-2.543 1.817l-1.266-1.773-1.266 1.772a1.561 1.561 0 1 1-2.543-1.815l1.301-1.823-2.078-.68a1.562 1.562 0 1 1 .973-2.97l2.05.671V91.52c0-.862.7-1.562 1.563-1.562Zm14.062 0c.863 0 1.563.7 1.563 1.563v2.187l2.05-.671a1.562 1.562 0 0 1 .973 2.97l-2.078.68 1.302 1.822a1.562 1.562 0 0 1-2.544 1.817l-1.266-1.773-1.265 1.772a1.561 1.561 0 1 1-2.543-1.815l1.301-1.823-2.078-.68a1.562 1.562 0 1 1 .972-2.97l2.05.671V91.52c0-.862.7-1.562 1.563-1.562Zm14.063 0c.863 0 1.562.7 1.562 1.563v2.187l2.05-.671a1.562 1.562 0 0 1 .973 2.97l-2.078.68 1.302 1.822a1.562 1.562 0 0 1-2.543 1.817l-1.266-1.773-1.266 1.772a1.561 1.561 0 1 1-2.543-1.815l1.302-1.823-2.079-.68a1.562 1.562 0 1 1 .973-2.97l2.05.671V91.52c0-.862.7-1.562 1.563-1.562Zm14.062 0c.863 0 1.563.7 1.563 1.563v2.187l2.05-.671a1.562 1.562 0 0 1 .973 2.97l-2.078.68 1.302 1.822a1.562 1.562 0 0 1-2.544 1.817l-1.265-1.773-1.266 1.772a1.561 1.561 0 1 1-2.543-1.815l1.301-1.823-2.078-.68a1.562 1.562 0 1 1 .973-2.97l2.05.671V91.52c0-.862.7-1.562 1.562-1.562Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M84.375 32.813c0 11.218-9.094 20.312-20.313 20.312-11.218 0-20.312-9.094-20.312-20.313 0-11.218 9.094-20.312 20.313-20.312 11.218 0 20.312 9.094 20.312 20.313Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M64.063 50c9.492 0 17.187-7.695 17.187-17.188 0-9.492-7.695-17.187-17.188-17.187-9.492 0-17.187 7.695-17.187 17.188C46.875 42.305 54.57 50 64.063 50Zm0 3.125c11.218 0 20.312-9.094 20.312-20.313 0-11.218-9.094-20.312-20.313-20.312-11.218 0-20.312 9.094-20.312 20.313 0 11.218 9.094 20.312 20.313 20.312Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M73.438 31.25a9.375 9.375 0 1 1-18.75 0 9.375 9.375 0 1 1 18.75 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M64.063 37.5a6.25 6.25 0 1 0 0-12.5 6.25 6.25 0 0 0 0 12.5Zm0 3.125a9.375 9.375 0 1 0 0-18.75 9.375 9.375 0 1 0 0 18.75Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" fill-rule="evenodd" d="M49.076 46.524c.275-.325.559-.643.852-.952a21.056 21.056 0 0 1 6.844-4.818 20.165 20.165 0 0 1 8.072-1.691c2.77 0 5.513.574 8.072 1.691a21.055 21.055 0 0 1 6.843 4.818l.059.062c-3.725 4.571-9.4 7.491-15.755 7.491a20.26 20.26 0 0 1-14.987-6.6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M49.076 46.524a20.26 20.26 0 0 0 14.986 6.601c6.357 0 12.031-2.92 15.756-7.49l-.059-.063a21.055 21.055 0 0 0-6.843-4.818 20.165 20.165 0 0 0-8.072-1.691c-2.77 0-5.513.574-8.072 1.691a21.056 21.056 0 0 0-6.844 4.818c-.293.309-.577.627-.852.952Zm26.262-.739a17.701 17.701 0 0 0-3.672-2.167 17.04 17.04 0 0 0-6.822-1.43 17.04 17.04 0 0 0-6.822 1.43 17.774 17.774 0 0 0-4.459 2.804A17.104 17.104 0 0 0 64.063 50c4.313 0 8.255-1.587 11.275-4.215ZM21.875 68.75c0-.863.7-1.563 1.563-1.563h43.75a1.563 1.563 0 0 1 0 3.126h-43.75c-.863 0-1.563-.7-1.563-1.563Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/no-access.ts b/libs/assets/src/svg/svgs/no-access.ts
deleted file mode 100644
index 6c9dfae939e..00000000000
--- a/libs/assets/src/svg/svgs/no-access.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const NoAccess = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" width="154" height="130" fill="none">
-  <path class="tw-stroke-secondary-600" d="M60.795 112.1h55.135a4 4 0 0 0 4-4V59.65M32.9 51.766V6a4 4 0 0 1 4-4h79.03a4 4 0 0 1 4 4v19.992"  stroke-width="4"/>
-  <path class="tw-stroke-secondary-600" d="M46.997 21.222h13.806M69.832 21.222h13.806M93.546 21.222h13.806M46.997 44.188h13.806M69.832 44.188h13.806M93.546 44.188h13.806M50.05 67.02h10.753M69.832 67.02h13.806M93.546 67.02h13.806M46.997 90.118h13.806M69.832 90.118h13.806M93.546 90.118h13.806" stroke-width="2" stroke-linecap="round"/>
-  <path class="tw-stroke-secondary-600" d="M30.914 89.366c10.477 0 18.97-8.493 18.97-18.97 0-10.476-8.493-18.97-18.97-18.97-10.476 0-18.969 8.494-18.969 18.97 0 10.477 8.493 18.97 18.97 18.97ZM2.313 117.279c2.183-16.217 15.44-27.362 29.623-27.362 14.07 0 25.942 11.022 27.898 27.33.167 1.39-.988 2.753-2.719 2.753H5c-1.741 0-2.87-1.366-2.687-2.721Z" stroke-width="4"/>
-  <path class="tw-stroke-danger-600" d="m147.884 50.361-15.89-27.522c-2.31-4-8.083-4-10.392 0l-15.891 27.523c-2.309 4 .578 9 5.196 9h31.781c4.619 0 7.505-5 5.196-9Z" stroke-width="4"/>
-  <path class="tw-stroke-danger-600" d="M126.798 29.406v16.066" stroke-width="4" stroke-linecap="round"/>
-  <path class="tw-fill-danger-600" d="M126.798 54.727a2.635 2.635 0 1 0 0-5.27 2.635 2.635 0 0 0 0 5.27Z" />
-</svg>
-`;
diff --git a/libs/assets/src/svg/svgs/no-credentials.icon.ts b/libs/assets/src/svg/svgs/no-credentials.icon.ts
index a825de2f95b..bfecfd4834c 100644
--- a/libs/assets/src/svg/svgs/no-credentials.icon.ts
+++ b/libs/assets/src/svg/svgs/no-credentials.icon.ts
@@ -1,27 +1,13 @@
 import { svgIcon } from "../icon-service";
 
 export const NoCredentialsIcon = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" width="119" height="114" viewBox="0 0 119 114" fill="none">
-    <g clip-path="url(#clip0_201_7924)">
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M35.2098 52.2486C35.9068 52.2486 36.4719 52.8137 36.4719 53.5107V58.2685C36.4719 58.9655 35.9068 59.5306 35.2098 59.5306C34.5128 59.5306 33.9478 58.9655 33.9478 58.2685V53.5107C33.9478 52.8137 34.5128 52.2486 35.2098 52.2486Z" />
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M40.9963 56.4125C41.2091 57.0762 40.8437 57.7868 40.18 57.9997L35.5951 59.4703C34.9314 59.6832 34.2208 59.3177 34.0079 58.654C33.795 57.9903 34.1605 57.2797 34.8242 57.0668L39.409 55.5962C40.0727 55.3833 40.7834 55.7487 40.9963 56.4125Z" />
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M34.471 57.2455C35.036 56.8374 35.8249 56.9647 36.233 57.5297L39.0445 61.4225C39.4526 61.9876 39.3254 62.7765 38.7603 63.1846C38.1952 63.5927 37.4063 63.4654 36.9982 62.9004L34.1868 59.0076C33.7787 58.4425 33.9059 57.6536 34.471 57.2455Z" />
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M35.94 57.2401C36.508 57.6441 36.6411 58.432 36.2371 59.0001L33.4689 62.8928C33.065 63.4609 32.277 63.5939 31.709 63.19C31.141 62.786 31.0079 61.9981 31.4119 61.43L34.1801 57.5373C34.584 56.9692 35.3719 56.8362 35.94 57.2401Z" />
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M29.4665 56.4091C29.6812 55.746 30.3929 55.3825 31.056 55.5972L35.5976 57.0679C36.2607 57.2826 36.6242 57.9942 36.4095 58.6573C36.1947 59.3205 35.4831 59.684 34.82 59.4692L30.2784 57.9986C29.6153 57.7839 29.2518 57.0723 29.4665 56.4091Z" />
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M50.6932 52.2487C51.3902 52.2487 51.9553 52.8137 51.9553 53.5107V58.2686C51.9553 58.9656 51.3902 59.5306 50.6932 59.5306C49.9962 59.5306 49.4312 58.9656 49.4312 58.2686V53.5107C49.4312 52.8137 49.9962 52.2487 50.6932 52.2487Z" />
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M56.4353 56.4088C56.6501 57.072 56.2866 57.7836 55.6234 57.9983L51.0819 59.4689C50.4187 59.6837 49.7071 59.3202 49.4924 58.657C49.2777 57.9939 49.6412 57.2823 50.3043 57.0676L54.8458 55.5969C55.509 55.3822 56.2206 55.7457 56.4353 56.4088Z" />
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M49.9544 57.2452C50.5194 56.8371 51.3083 56.9643 51.7164 57.5294L54.5279 61.4221C54.936 61.9872 54.8087 62.7761 54.2437 63.1842C53.6786 63.5923 52.8897 63.4651 52.4816 62.9L49.6702 59.0072C49.2621 58.4422 49.3893 57.6533 49.9544 57.2452Z" />
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M51.4331 57.2452C51.9982 57.6533 52.1254 58.4422 51.7173 59.0072L48.9059 62.9C48.4978 63.4651 47.7089 63.5923 47.1438 63.1842C46.5788 62.7761 46.4515 61.9872 46.8596 61.4221L49.6711 57.5294C50.0792 56.9643 50.8681 56.8371 51.4331 57.2452Z" />
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M44.9514 56.4088C45.1661 55.7457 45.8777 55.3822 46.5409 55.5969L51.0824 57.0676C51.7455 57.2823 52.109 57.9939 51.8943 58.657C51.6796 59.3202 50.968 59.6837 50.3048 59.4689L45.7633 57.9983C45.1001 57.7836 44.7366 57.072 44.9514 56.4088Z" />
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M60.5229 62.3772C60.5229 61.6802 61.088 61.1151 61.785 61.1151H70.7935C71.4905 61.1151 72.0556 61.6802 72.0556 62.3772C72.0556 63.0742 71.4905 63.6392 70.7935 63.6392H61.785C61.088 63.6392 60.5229 63.0742 60.5229 62.3772Z" />
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M75.9663 62.3772C75.9663 61.6802 76.5314 61.1151 77.2284 61.1151H86.2369C86.9339 61.1151 87.4989 61.6802 87.4989 62.3772C87.4989 63.0742 86.9339 63.6392 86.2369 63.6392H77.2284C76.5314 63.6392 75.9663 63.0742 75.9663 62.3772Z" />
-      <path class="tw-fill-art-accent" fill-rule="evenodd" clip-rule="evenodd" d="M20.1396 57.9313C20.1396 50.6126 26.0726 44.6796 33.3914 44.6796H86.3982C93.7169 44.6796 99.6499 50.6126 99.6499 57.9313C99.6499 65.25 93.7169 71.183 86.3982 71.183H33.3914C26.0726 71.183 20.1396 65.25 20.1396 57.9313ZM33.3914 47.2037C27.4667 47.2037 22.6638 52.0066 22.6638 57.9313C22.6638 63.856 27.4667 68.6589 33.3914 68.6589H86.3982C92.3229 68.6589 97.1258 63.856 97.1258 57.9313C97.1258 52.0066 92.3229 47.2037 86.3982 47.2037H33.3914Z"/>
-      <path class="tw-fill-art-primary" fill-rule="evenodd" clip-rule="evenodd" d="M40.8279 11.8469C41.4764 12.1023 41.7952 12.835 41.5398 13.4836L37.3784 24.0525C37.123 24.701 36.3902 25.0198 35.7417 24.7644C35.0931 24.509 34.7744 23.7762 35.0298 23.1277L38.0204 15.5323C35.2016 16.9889 32.4865 18.7508 29.92 20.8232C9.44808 37.3546 6.25361 67.3517 22.785 87.8236C27.3496 93.4763 32.9382 97.8098 39.0683 100.775C39.6957 101.079 39.9583 101.834 39.6547 102.461C39.3512 103.089 38.5964 103.351 37.969 103.048C31.5107 99.9231 25.6247 95.3579 20.8212 89.4094C3.414 67.8529 6.77771 36.2666 28.3342 18.8594C31.1318 16.6003 34.0994 14.6905 37.1838 13.1248L29.3343 10.0341C28.6857 9.77875 28.367 9.04598 28.6223 8.39742C28.8777 7.74886 29.6105 7.43012 30.259 7.68548L40.8279 11.8469ZM84.1129 15.392C84.4739 14.7958 85.2499 14.6051 85.8462 14.9661C90.6935 17.901 95.1212 21.7125 98.8842 26.3725C116.291 47.929 112.928 79.5153 91.3711 96.9224C90.3117 97.7779 89.2278 98.5834 88.1224 99.339L96.3064 101.382C96.9827 101.551 97.394 102.236 97.2252 102.912C97.0564 103.588 96.3713 104 95.6951 103.831L84.6746 101.08C83.9984 100.911 83.587 100.226 83.7558 99.5498L86.5067 88.5294C86.6755 87.8531 87.3606 87.4417 88.0368 87.6105C88.7131 87.7794 89.1245 88.4644 88.9557 89.1407L86.9784 97.0621C87.9316 96.4005 88.8679 95.6994 89.7853 94.9586C110.257 78.4273 113.452 48.4302 96.9203 27.9583C93.3439 23.5293 89.1393 19.9108 84.5388 17.1253C83.9426 16.7643 83.7519 15.9883 84.1129 15.392Z" />
-    </g>
-    <defs>
-      <clipPath id="clip0_201_7924">
-        <rect width="119" height="114" fill="white"/>
-      </clipPath>
-    </defs>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 1.49 96 94.02">
+    <path class="tw-fill-illustration-bg-primary" d="M79 48.5c0 17.12-13.88 31-31 31-17.12 0-31-13.88-31-31 0-17.12 13.88-31 31-31 17.12 0 31 13.88 31 31Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M48 18.5c-16.569 0-30 13.431-30 30 0 16.569 13.431 30 30 30 16.569 0 30-13.431 30-30 0-16.569-13.431-30-30-30Zm-32 30c0-17.673 14.327-32 32-32 17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32-17.673 0-32-14.327-32-32Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M0 48.5c0-6.627 5.373-12 12-12h72c6.627 0 12 5.373 12 12s-5.373 12-12 12H12c-6.627 0-12-5.373-12-12Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M84 38.5H12c-5.523 0-10 4.477-10 10s4.477 10 10 10h72c5.523 0 10-4.477 10-10s-4.477-10-10-10Zm-72-2c-6.627 0-12 5.373-12 12s5.373 12 12 12h72c6.627 0 12-5.373 12-12s-5.373-12-12-12H12Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M20 42.5c.552 0 1 .467 1 1.042v4.175l3.74-1.989c.508-.27 1.13-.094 1.39.394.259.488.057 1.102-.45 1.372l-4.038 2.147 3.228 3.462c.392.42.383 1.067-.02 1.444-.405.376-1.05.34-1.443-.08L20 50.813l-3.408 3.654c-.392.42-1.038.456-1.441.08-.404-.377-.414-1.023-.021-1.444l3.228-3.462-4.038-2.147c-.508-.27-.71-.884-.45-1.372.26-.488.881-.664 1.39-.394l3.74 1.99v-4.176c0-.575.448-1.042 1-1.042Zm16 0c.552 0 1 .467 1 1.042v4.175l3.74-1.989c.508-.27 1.13-.094 1.39.394.259.488.057 1.102-.45 1.372l-4.038 2.147 3.228 3.462c.392.42.383 1.067-.02 1.444-.405.376-1.05.34-1.443-.08L36 50.813l-3.408 3.654c-.392.42-1.038.456-1.441.08-.404-.377-.414-1.023-.021-1.444l3.228-3.462-4.038-2.147c-.508-.27-.71-.884-.45-1.372.26-.488.881-.664 1.39-.394l3.74 1.99v-4.176c0-.575.447-1.042 1-1.042Zm17 1.042c0-.575-.448-1.042-1-1.042-.553 0-1 .467-1 1.042v4.175l-3.74-1.989c-.509-.27-1.13-.094-1.39.394s-.058 1.102.45 1.372l4.038 2.147-3.228 3.462c-.393.42-.383 1.067.02 1.444.404.376 1.05.34 1.442-.08L52 50.813l3.407 3.654c.393.42 1.038.456 1.442.08.404-.377.413-1.023.02-1.444l-3.227-3.462 4.037-2.147c.508-.27.71-.884.45-1.372-.259-.488-.88-.664-1.389-.394L53 47.717v-4.175Zm8 9.958a1 1 0 0 1 1-1h8a1 1 0 1 1 0 2h-8a1 1 0 0 1-1-1Zm13-1a1 1 0 1 0 0 2h8a1 1 0 0 0 0-2h-8Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M58.327 92.299c11.605-2.736 21.09-9.736 27.192-18.952a1 1 0 1 1 1.667 1.104c-6.37 9.624-16.28 16.937-28.4 19.795-19.671 4.637-39.367-3.824-49.937-19.72a1 1 0 1 1 1.666-1.107c10.121 15.221 28.98 23.32 47.812 18.88Zm28.545-68.44a1 1 0 0 1-1.386-.278C75.364 8.359 56.505.26 37.674 4.7 25.348 7.607 15.413 15.322 9.385 25.394a1 1 0 1 1-1.716-1.027C13.963 13.85 24.342 5.79 37.215 2.754c19.67-4.638 39.367 3.824 49.936 19.72a1 1 0 0 1-.279 1.386Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M24 73.5a1 1 0 0 0-1-1H9a1 1 0 0 0-1 1v14a1 1 0 1 0 2 0v-13h13a1 1 0 0 0 1-1ZM72 23.5a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1v-14a1 1 0 1 0-2 0v13H73a1 1 0 0 0-1 1ZM22.618 64.5a29.913 29.913 0 0 1-2.122-4h55.008a29.913 29.913 0 0 1-2.122 4H22.618Z" clip-rule="evenodd"/>
   </svg>
   `;
diff --git a/libs/assets/src/svg/svgs/no-folders.ts b/libs/assets/src/svg/svgs/no-folders.ts
index ea06a9827e9..c8858ca83e5 100644
--- a/libs/assets/src/svg/svgs/no-folders.ts
+++ b/libs/assets/src/svg/svgs/no-folders.ts
@@ -1,19 +1,15 @@
 import { svgIcon } from "../icon-service";
 
 export const NoFolders = svgIcon`
-<svg width="147" height="91" viewBox="0 0 147 91" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path class="tw-stroke-art-accent" d="M64.8263 1.09473V9.90589" stroke-width="1.25" stroke-linecap="round"/>
-  <path class="tw-stroke-art-accent" d="M42.1936 6.09082L46.6564 13.7215" stroke-width="1.25" stroke-linecap="round"/>
-  <path class="tw-stroke-art-accent" d="M53.8507 2.4209L55.4006 11.0982" stroke-width="1.25" stroke-linecap="round"/>
-  <path class="tw-stroke-art-accent" d="M76.1821 2.50293L73.8719 11.0139" stroke-width="1.25" stroke-linecap="round"/>
-  <path class="tw-stroke-art-accent" d="M87.4594 6.09082L82.9966 13.7215" stroke-width="1.25" stroke-linecap="round"/>
-  <path class="tw-stroke-art-primary" d="M100.358 89.3406H28.3419C26.1377 89.3406 24.3422 87.8759 24.3422 86.0715V24.5211C24.3422 22.7167 26.127 21.252 28.3419 21.252H61.6082C63.8124 21.252 65.608 22.7167 65.608 24.5211V28.5013C65.608 30.5073 67.3928 32.1313 69.6077 32.1313H82.105" stroke-width="2.5" stroke-miterlimit="10"/>
-  <path class="tw-stroke-art-primary" d="M82.344 41.7686H40.1042C37.9646 41.7686 36.1475 42.7663 35.8465 44.1036L26.3203 86.2411C25.9547 87.8757 27.9653 89.3404 30.5781 89.3404H107.906C110.045 89.3404 111.862 88.3427 112.163 87.0053L116.904 62.5844" stroke-width="2.5" stroke-miterlimit="10"/>
-  <path class="tw-stroke-art-accent" d="M28.1209 36.6897V27.0451C28.1209 25.9523 29.0068 25.0664 30.0996 25.0664H40.7775" stroke-width="1.25" stroke-linecap="round"/>
-  <path class="tw-stroke-art-primary" d="M105.433 64.0751C119.875 65.725 132.919 55.3558 134.569 40.9147C136.219 26.4737 125.849 13.4294 111.408 11.7794C96.9673 10.1295 83.923 20.4988 82.2731 34.9398C80.6232 49.3809 90.9924 62.4252 105.433 64.0751Z" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
-  <path class="tw-stroke-art-accent" d="M105.834 60.5706C118.253 61.9895 129.484 52.9549 130.92 40.3912M85.9456 35.2528C87.381 22.6891 98.6125 13.6544 111.032 15.0734" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-  <path class="tw-stroke-art-primary" d="M122.014 60.6246L125.553 65.0773L138.676 81.5851C139.806 83.0073 141.876 83.2437 143.298 82.1132L143.558 81.906C144.98 80.7755 145.217 78.7062 144.086 77.2841L130.964 60.7762L127.424 56.3235" stroke-width="2.19854" stroke-linecap="round" stroke-linejoin="round"/>
-  <path class="tw-stroke-art-primary" d="M101.309 31.3349C101.309 31.3349 101.415 28.8033 103.894 26.6553C105.382 25.3511 107.153 25.0059 108.747 24.9675C110.199 24.9291 111.51 25.1976 112.254 25.6196C113.6 26.31 116.186 27.9594 116.186 31.5267C116.186 35.2858 113.919 36.9735 111.368 38.8531C108.818 40.7326 109.185 43.1796 109.185 45.2509" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
-  <path class="tw-fill-art-primary" d="M109.191 51.7764C110.02 51.7764 110.691 51.1049 110.691 50.2764C110.691 49.448 110.02 48.7764 109.191 48.7764C108.363 48.7764 107.691 49.448 107.691 50.2764C107.691 51.1049 108.363 51.7764 109.191 51.7764Z" />
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="2 12.5 93.63 72">
+    <path class="tw-fill-illustration-bg-secondary" d="M2 21.5a6 6 0 0 1 6-6h17.24a6 6 0 0 1 4.556 2.095L34 22.5h52a4 4 0 0 1 4 4v36c0 12.15-9.85 22-22 22H7a5 5 0 0 1-5-5v-58Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="m33.08 24.5-4.803-5.603A4 4 0 0 0 25.24 17.5H8a4 4 0 0 0-4 4v58a3 3 0 0 0 3 3h61c11.046 0 20-8.954 20-20v-36a2 2 0 0 0-2-2H33.08Zm.92-2-4.204-4.905A6 6 0 0 0 25.24 15.5H8a6 6 0 0 0-6 6v58a5 5 0 0 0 5 5h61c12.15 0 22-9.85 22-22v-36a4 4 0 0 0-4-4H34Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M11.02 40.3a6 6 0 0 1 5.88-4.8H91.1a4 4 0 0 1 3.92 4.8L86.98 79.7a6 6 0 0 1-5.88 4.8H6.9a4 4 0 0 1-3.92-4.8l8.042-39.4Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M91.101 37.5H16.9a4 4 0 0 0-3.919 3.2L4.94 80.1a2 2 0 0 0 1.959 2.4H81.1a4 4 0 0 0 3.92-3.2l8.04-39.4a2 2 0 0 0-1.96-2.4Zm-74.202-2a6 6 0 0 0-5.879 4.8L2.98 79.7a4 4 0 0 0 3.919 4.8H81.1a6 6 0 0 0 5.879-4.8l8.04-39.4a4 4 0 0 0-3.919-4.8H16.9Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M84 32.5c0 11.046-8.954 20-20 20s-20-8.954-20-20 8.954-20 20-20 20 8.954 20 20Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M64 50.5c9.941 0 18-8.059 18-18s-8.059-18-18-18-18 8.059-18 18 8.059 18 18 18Zm0 2c11.046 0 20-8.954 20-20s-8.954-20-20-20-20 8.954-20 20 8.954 20 20 20Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M79 32.5c0 8.284-6.716 15-15 15-8.284 0-15-6.716-15-15 0-8.284 6.716-15 15-15 8.284 0 15 6.716 15 15Z"/>
+    <path class="tw-fill-illustration-outline" d="M95.004 61.587 78.5 46l-2 2 15.587 16.504a2 2 0 0 0 2.868.04l.09-.089a2 2 0 0 0-.041-2.868Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M61.573 34.578a.948.948 0 0 0 .948.922h.53a.948.948 0 0 0 .949-.948V33.5c2.817-.04 5-1.603 5-4.5 0-3.072-2.037-4.5-5-4.5-2.59 0-4.918 1.71-5.04 4.18-.023.47.39.82.862.82h.23c.523 0 .93-.435 1.086-.935.404-1.3 1.633-2.065 2.862-2.065 1.5 0 2.75.888 2.75 2.5 0 2.387-2.564 2.82-4.52 2.888a.73.73 0 0 0-.71.742l.053 1.948ZM62.75 40c1.104 0 2-.672 2-1.5s-.896-1.5-2-1.5c-1.105 0-2 .672-2 1.5s.895 1.5 2 1.5Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/no-results.ts b/libs/assets/src/svg/svgs/no-results.ts
index ce45fce7f3c..5f914ad213c 100644
--- a/libs/assets/src/svg/svgs/no-results.ts
+++ b/libs/assets/src/svg/svgs/no-results.ts
@@ -1,18 +1,16 @@
 import { svgIcon } from "../icon-service";
 
 export const NoResults = svgIcon`
-<svg width="98" height="96" viewBox="0 0 98 96" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path class="tw-stroke-art-primary" d="M8.8545 86.7919L56.9901 86.7919C60.2321 86.7919 62.8603 84.1637 62.8603 80.9217L62.8603 32.2678C62.8603 30.7472 62.2702 29.2859 61.2143 28.1916L47.5536 14.0345C46.4473 12.8881 44.9225 12.2405 43.3293 12.2405L8.85451 12.2405C5.61249 12.2405 2.98431 14.8687 2.98431 18.1107L2.98431 80.9217C2.98431 84.1637 5.61248 86.7919 8.8545 86.7919Z" stroke-width="1.76106"/>
-    <path class="tw-fill-background tw-stroke-art-primary" d="M18.8335 76.8125L66.9691 76.8125C70.2111 76.8125 72.8393 74.1844 72.8393 70.9423L72.8393 21.8271C72.8393 20.3144 72.2554 18.8601 71.2093 17.7675L57.5349 3.48471C56.4276 2.32814 54.8959 1.67408 53.2947 1.67408L18.8335 1.67407C15.5915 1.67407 12.9633 4.30225 12.9633 7.54427L12.9633 70.9423C12.9633 74.1844 15.5915 76.8125 18.8335 76.8125Z" stroke-width="1.76106"/>
-    <path class="tw-stroke-art-primary" d="M54.3484 2.26123L54.3484 14.0016C54.3484 17.2436 56.9766 19.8718 60.2186 19.8718L72.546 19.8718" stroke-width="1.76106"/>
-    <path class="tw-stroke-art-accent" d="M20.0914 15.9861L43.5722 15.9861" stroke-width="0.880529" stroke-linecap="round" stroke-dasharray="11.74 4.7"/>
-    <path class="tw-stroke-art-accent"  d="M20.0914 30.8945L51.2034 30.8945" stroke-width="0.880529" stroke-linecap="round" stroke-dasharray="11.74 4.7"/>
-    <path class="tw-stroke-art-accent" d="M20.0914 45.803L45.9203 45.803" stroke-width="0.880529" stroke-linecap="round" stroke-dasharray="11.74 4.7"/>
-    <path class="tw-stroke-art-accent" d="M20.0914 60.7112L45.9203 60.7112" stroke-width="0.880529" stroke-linecap="round" stroke-dasharray="11.74 4.7"/>
-    <path class="tw-fill-background tw-stroke-art-primary" d="M85.4233 53.9449C81.9863 66.772 68.6684 74.3484 55.6768 70.8674C42.6853 67.3863 34.9398 54.1659 38.3768 41.3388C41.8138 28.5117 55.1318 20.9353 68.1234 24.4163C81.1149 27.8974 88.8604 41.1178 85.4233 53.9449Z" stroke-width="1.76106" stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-stroke-art-accent" d="M55.1859 41.5395C55.1859 41.5395 55.2828 39.2314 57.5434 37.273C58.8998 36.084 60.5145 35.7692 61.9678 35.7343C63.2919 35.6993 64.4868 35.9441 65.1649 36.3288C66.3921 36.9583 68.7497 38.462 68.7497 41.7144C68.7497 45.1416 66.6828 46.6804 64.3576 48.394C62.0324 50.1076 62.3667 52.3385 62.3667 54.227" stroke-width="1.76106" stroke-linecap="round" stroke-linejoin="round"/>
-    <path class="tw-fill-art-accent tw-stroke-secondary-600" d="M62.2727 59.2015C62.759 59.2015 63.1533 58.8073 63.1533 58.321C63.1533 57.8347 62.759 57.4404 62.2727 57.4404C61.7864 57.4404 61.3922 57.8347 61.3922 58.321C61.3922 58.8073 61.7864 59.2015 62.2727 59.2015Z"/>
-    <path class="tw-fill-secondary-300 tw-stroke-art-primary" d="M96.0333 89.0621L95.4703 89.5329C94.2269 90.5728 92.3758 90.4078 91.3359 89.1644L78.2766 73.5488L74.79 69.3798C74.4843 69.0105 74.6096 68.4514 75.0271 68.2155C76.7198 67.2592 78.097 65.9974 78.8894 65.1364C79.1502 64.853 79.6089 64.8477 79.856 65.1431L83.3425 69.3121L96.4018 84.9277C97.4418 86.1712 97.2768 88.0222 96.0333 89.0621Z" stroke-width="1.76106" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
-
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="4 4.5 91.63 88">
+    <path class="tw-fill-illustration-bg-secondary" d="M62 12.5a2 2 0 0 1 2 2v76a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2v-76a2 2 0 0 1 2-2h56Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M62 90.5v-76H6v76h56Zm2-76a2 2 0 0 0-2-2H6a2 2 0 0 0-2 2v76a2 2 0 0 0 2 2h56a2 2 0 0 0 2-2v-76Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M72 82.5v-76a2 2 0 0 0-2-2H27.328c-.53 0-1.034.206-1.41.581L12.585 18.416A1.993 1.993 0 0 0 12 19.828V82.5a2 2 0 0 0 2 2h56a2 2 0 0 0 2-2Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M70 82.5v-76H27.328L14 19.828V82.5h56ZM27.333 6.495ZM72 6.5v76a2 2 0 0 1-2 2H14a2 2 0 0 1-2-2V19.828c0-.53.209-1.037.584-1.412L25.919 5.081c.375-.375.879-.581 1.41-.581H70a2 2 0 0 1 2 2Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M84 48.5c0 11.046-8.954 20-20 20s-20-8.954-20-20 8.954-20 20-20 20 8.954 20 20Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M64 66.5c9.941 0 18-8.059 18-18s-8.059-18-18-18-18 8.059-18 18 8.059 18 18 18Zm0 2c11.046 0 20-8.954 20-20s-8.954-20-20-20-20 8.954-20 20 8.954 20 20 20Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M79 48.5c0 8.284-6.716 15-15 15-8.284 0-15-6.716-15-15 0-8.284 6.716-15 15-15 8.284 0 15 6.716 15 15Z"/>
+    <path class="tw-fill-illustration-outline" d="M95.004 77.587 78.5 62l-2 2 15.587 16.504a2 2 0 0 0 2.868.04l.09-.089a2 2 0 0 0-.041-2.868Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M28 5.5a1 1 0 0 1 1 1v15H14a1 1 0 1 1 0-2h13v-13a1 1 0 0 1 1-1Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" fill-rule="evenodd" d="M20 28.5a1 1 0 1 0 0 2h10a1 1 0 1 0 0-2H20Zm14 0a1 1 0 1 0 0 2h10a1 1 0 1 0 0-2H34Zm16.983 4.815A1 1 0 0 0 50 32.5H40a1 1 0 1 0 0 2h9.717c.405-.413.827-.808 1.266-1.185ZM44.025 49.5c.033.676.1 1.343.199 2H40a1 1 0 1 1 0-2h4.025Zm.199-4a20.086 20.086 0 0 0-.2 2H37a1 1 0 1 1 0-2h7.224Zm3.775-9c-.48.638-.922 1.306-1.323 2H38a1 1 0 1 1 0-2h9.998ZM64 28.5c-3.13 0-6.09.719-8.728 2H54a1 1 0 1 1 0-2h10Zm-16 0a1 1 0 1 0 0 2h2a1 1 0 1 0 0-2h-2Zm-11 5a1 1 0 0 0-1-1h-2a1 1 0 1 0 0 2h2a1 1 0 0 0 1-1Zm-3 5a1 1 0 1 0 0-2h-4a1 1 0 1 0 0 2h4Zm0 8a1 1 0 0 1-1 1h-6a1 1 0 1 1 0-2h6a1 1 0 0 1 1 1Zm2 5a1 1 0 1 0 0-2H20a1 1 0 1 0 0 2h16Zm-5-18a1 1 0 0 0-1-1H20a1 1 0 1 0 0 2h10a1 1 0 0 0 1-1Zm-5 5a1 1 0 1 0 0-2h-6a1 1 0 1 0 0 2h6Zm-2 8a1 1 0 0 1-1 1h-3a1 1 0 1 1 0-2h3a1 1 0 0 1 1 1Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/no-send.icon.ts b/libs/assets/src/svg/svgs/no-send.icon.ts
index 85106930961..a246c0177f8 100644
--- a/libs/assets/src/svg/svgs/no-send.icon.ts
+++ b/libs/assets/src/svg/svgs/no-send.icon.ts
@@ -1,13 +1,19 @@
 import { svgIcon } from "../icon-service";
 
 export const NoSendsIcon = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" width="120" height="125" fill="none">
-    <path class="tw-stroke-art-primary" stroke-width="3" d="M13.425 11.994H5.99a4.311 4.311 0 0 0-4.311 4.312v62.09a4.311 4.311 0 0 0 4.311 4.311h40.09"/>
-    <path class="tw-stroke-art-primary tw-fill-background" stroke-width="3" d="M66.27 75.142h-49.9a3.234 3.234 0 0 1-3.233-3.234V9.818a3.234 3.234 0 0 1 3.234-3.233h35.764a3.233 3.233 0 0 1 2.293.953l14.134 14.216c.602.605.94 1.425.94 2.28v47.874a3.233 3.233 0 0 1-3.233 3.234Z"/>
-    <path class="tw-stroke-art-accent" stroke-width="2" d="M47.021 35.586c0-3.818-2.728-6.915-6.095-6.915-3.367 0-6.096 3.097-6.096 6.915"/>
-    <path class="tw-stroke-art-accent" stroke-width="2" d="M47.38 35.335H34.058a3.593 3.593 0 0 0-3.593 3.592v9.817a3.593 3.593 0 0 0 3.593 3.593H47.38a3.593 3.593 0 0 0 3.593-3.593v-9.817a3.593 3.593 0 0 0-3.593-3.592Z"/>
-    <path class="tw-stroke-art-primary" stroke-linecap="round" stroke-width="2" d="M40.72 44.34v2.618"/>
-    <path class="tw-stroke-art-primary" stroke-linecap="round" stroke-width="4" d="M40.72 42.7v-.373"/>
-    <path class="tw-stroke-art-primary" fill="rgb(var(--color-background-alt))" stroke-width="3" d="M89.326 64.022s1.673-.73 2.252.572c.512 1.138-.822 2.033-.822 2.033L56.757 88.133a3.886 3.886 0 0 0-1.583 2.188l-4.732 16.705a2.665 2.665 0 0 0 .059 1.611 2.596 2.596 0 0 0 1.891 1.663c.331.07.673.071 1.004.004.402-.077.78-.25 1.102-.503l10.11-7.88a3.138 3.138 0 0 1 1.92-.663 3.08 3.08 0 0 1 1.905.662l13.926 10.948a2.556 2.556 0 0 0 3.162 0 2.71 2.71 0 0 0 .727-.879l31.777-61.762c.231-.448.33-.952.284-1.455a2.606 2.606 0 0 0-1.721-2.226 2.499 2.499 0 0 0-1.457-.06l-81.18 20.418c-.465.12-.888.364-1.223.708a2.672 2.672 0 0 0-.632 2.676c.146.46.417.865.78 1.174L46.2 83.1a4.463 4.463 0 0 0 2.565 1.572 4.489 4.489 0 0 0 2.984-.413l37.578-20.237Z"/>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="9 4 83.89 91">
+    <path class="tw-fill-illustration-bg-secondary" d="M67 12a2 2 0 0 1 2 2v76a2 2 0 0 1-2 2H11a2 2 0 0 1-2-2V14a2 2 0 0 1 2-2h56Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M67 90V14H11v76h56Zm2-76a2 2 0 0 0-2-2H11a2 2 0 0 0-2 2v76a2 2 0 0 0 2 2h56a2 2 0 0 0 2-2V14Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M77 82V6a2 2 0 0 0-2-2H32.328c-.53 0-1.034.206-1.41.581L17.585 17.916A1.993 1.993 0 0 0 17 19.328V82a2 2 0 0 0 2 2h56a2 2 0 0 0 2-2Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M75 82V6H32.328L19 19.328V82h56ZM32.333 5.995ZM77 6v76a2 2 0 0 1-2 2H19a2 2 0 0 1-2-2V19.328c0-.53.209-1.037.584-1.412L30.919 4.581c.375-.375.879-.581 1.41-.581H75a2 2 0 0 1 2 2Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M33 5a1 1 0 0 1 1 1v15H19a1 1 0 1 1 0-2h13V6a1 1 0 0 1 1-1Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M37 35a3 3 0 0 1 3-3h14a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3H40a3 3 0 0 1-3-3V35Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M54 34H40a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V35a1 1 0 0 0-1-1Zm-14-2a3 3 0 0 0-3 3v10a3 3 0 0 0 3 3h14a3 3 0 0 0 3-3V35a3 3 0 0 0-3-3H40Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M46 38a1 1 0 1 1 2 0v4a1 1 0 1 1-2 0v-4Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M42 31a5 5 0 0 1 10 0v1h-2v-1a3 3 0 1 0-6 0v1h-2v-1Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M62 92.058V78l12 6.4-8.658 9.004A1.942 1.942 0 0 1 62 92.058Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="m61 76.333 14.637 7.807-9.574 9.957A2.942 2.942 0 0 1 61 92.057V76.333Zm2 3.333v12.391a.942.942 0 0 0 1.621.653l7.742-8.05L63 79.666Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M42.55 65.971 88.334 44.54c1.76-.824 3.746.587 3.546 2.52l-4.604 44.648c-.197 1.91-2.386 2.895-3.946 1.773L62.5 78.5l-19.82-7.944c-2.03-.813-2.11-3.657-.13-4.585Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M90.886 46.957a1.5 1.5 0 0 0-2.128-1.512L42.974 66.878c-1.188.556-1.14 2.262.078 2.75l19.164 7.681 12.867-14.613a1 1 0 1 1 1.501 1.321L63.98 78.333l19.934 14.336a1.5 1.5 0 0 0 2.367-1.064l4.605-44.648ZM62.015 79.383l-19.707-7.898c-2.842-1.139-2.955-5.12-.182-6.419L87.91 43.634c2.464-1.154 5.244.822 4.965 3.529L88.271 91.81c-.276 2.675-3.341 4.053-5.525 2.482L62.015 79.383Z" clip-rule="evenodd"/>
   </svg>
   `;
diff --git a/libs/assets/src/svg/svgs/partner-trust.ts b/libs/assets/src/svg/svgs/partner-trust.ts
deleted file mode 100644
index 22249874118..00000000000
--- a/libs/assets/src/svg/svgs/partner-trust.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const PartnerTrustIcon = svgIcon`
-<svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M69 43.6511C70.1025 44.1328 71.32 44.4 72.6 44.4C77.5706 44.4 81.6 40.3706 81.6 35.4C81.6 30.4294 77.5706 26.4 72.6 26.4C67.6295 26.4 63.6 30.4294 63.6 35.4C63.6 36.0164 63.662 36.6184 63.7801 37.2" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M69 44.8416C70.1522 44.553 71.3559 44.4 72.5943 44.4C80.1533 44.4 86.4194 50.0998 87.5598 57.5529C87.7996 59.1204 86.9541 60 85.3451 60C79.7231 60 75.6474 60 71.4 60" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M51 43.6511C49.8976 44.1328 48.68 44.4 47.4 44.4C42.4295 44.4 38.4 40.3706 38.4 35.4C38.4 30.4294 42.4295 26.4 47.4 26.4C52.3706 26.4 56.4 30.4294 56.4 35.4C56.4 36.0164 56.338 36.6184 56.22 37.2" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M51 44.8416C49.8478 44.553 48.6441 44.4 47.4057 44.4C39.8467 44.4 33.5806 50.0998 32.4402 57.5529C32.2004 59.1204 33.0459 60 34.6549 60C40.2769 60 44.3526 60 48.6 60" stroke="#CED4DC" stroke-width="2"/>
-    <circle cx="60" cy="45.6" r="9" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M72.7451 70.2C62.3773 70.2 57.2682 70.2 46.6437 70.2C45.3864 70.2 44.8665 68.8141 45.0289 67.7529C46.1693 60.2998 52.4354 54.6 59.9943 54.6C67.5533 54.6 73.8194 60.2998 74.9598 67.7529C75.1996 69.3204 74.3541 70.2 72.7451 70.2Z" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M73.557 103.195C74.3197 104.319 74.3197 105.443 73.557 106.272C73.1462 106.745 72.3835 107.041 71.738 107.041C71.6242 107.041 71.5013 107.032 71.3801 107.011C71.3345 108.505 70.5896 109.217 70.0948 109.467C69.7427 109.703 69.3318 109.822 68.9212 109.822C68.8703 109.822 68.8204 109.82 68.7714 109.816C68.7035 109.811 68.6373 109.803 68.5729 109.792C68.5559 110.332 68.3591 110.827 67.9823 111.242C67.6302 111.833 66.926 112.129 66.2808 112.129C66.1045 112.129 65.9874 112.129 65.8112 112.07C65.7753 112.058 65.7381 112.044 65.6997 112.028C65.5215 112.624 65.0169 113.105 64.227 113.431C63.9924 113.49 63.8162 113.49 63.5815 113.49C62.4417 113.49 60.9477 112.633 60.0352 112.028M55.5 88.7567C53.6867 88.9991 51.6246 89.9258 50.4378 90.4744C50.2985 90.5095 50.1797 90.5655 50.0693 90.6176L50.0687 90.6179C49.9937 90.6534 49.9223 90.6871 49.851 90.711C49.5281 90.5373 49.0708 90.3955 48.4995 90.2184C47.5139 89.9127 46.1886 89.5016 44.6287 88.6402C44.3941 88.5219 44.0419 88.581 43.8657 88.8769L37.6461 99.5268C37.4699 99.8226 37.5287 100.178 37.822 100.355L46.8 105.019" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M73.7624 103.371C73.6448 103.371 73.4683 103.313 73.3507 103.195L67.7625 97.9108C63.1743 96.7365 61.8803 93.9181 61.4097 92.8024C61.0567 92.8612 60.5273 92.9199 59.645 92.9199C59.2332 93.2135 58.1744 94.0355 56.7039 94.7988C55.3509 95.5034 53.998 95.2098 53.4098 94.2117C53.0568 93.5658 52.998 92.8024 53.351 92.1566C55.7039 87.5766 58.4685 86.6372 60.3509 86.6372C61.4685 86.6372 62.1744 86.9895 62.2332 86.9895L69.2919 90.1015L75.7624 87.1656C75.8801 87.1069 76.0565 87.1069 76.233 87.1656C76.4095 87.2243 76.5271 87.3418 76.5859 87.4592L82.6447 97.8521C82.7623 98.1457 82.6447 98.4393 82.4094 98.6154L74.0565 103.313C73.9389 103.371 73.8801 103.371 73.7624 103.371Z" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M46.6097 107.206C47.0221 108.443 48.394 109.005 49.044 109.195C49.217 109.923 49.5794 110.391 49.9178 110.692C50.5086 111.164 51.1584 111.342 51.7491 111.342C51.9248 111.342 52.0796 111.321 52.2135 111.291C52.2516 111.368 52.2936 111.444 52.3399 111.519C52.8716 112.346 53.8168 112.818 55.2346 112.937C55.3143 112.937 55.3897 112.919 55.4573 112.887C56.0276 113.588 56.9845 114 57.893 114C58.7791 114 59.488 113.527 59.7243 112.759C60.0787 111.223 59.9606 109.628 59.7243 108.742C59.5602 108.031 59.1935 106.763 57.6392 106.673C57.4017 106.121 56.803 105.205 55.4709 105.08C55.1879 105.053 54.9235 105.086 54.6774 105.164C54.4496 104.62 54.0132 103.917 53.2851 103.662C52.7534 103.485 51.9264 103.662 51.1584 104.134C51.1181 104.161 51.0782 104.187 51.0387 104.215C50.6899 103.795 50.1003 103.263 49.3271 103.189C48.6182 103.13 48.0275 103.485 47.4367 104.193C46.5506 105.316 46.3143 106.32 46.6097 107.206Z" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M51.9 104.4C51.5709 104.603 49.9229 105.531 49.5 106.8C49.2 107.7 49.5 108.9 49.8 109.5" stroke="#CED4DC" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M54.6703 105.317C54.1767 105.571 53.0709 106.485 52.597 108.109C52.1231 109.734 52.3995 110.816 52.597 111.155" stroke="#CED4DC" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M57.2 107.263C56.7063 107.517 56.051 108.431 55.7104 109.598C55.3697 110.766 55.5129 112.179 55.7104 112.517" stroke="#CED4DC" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M65.5675 111.739C64.0108 110.96 61.2866 108.431 61.2866 108.431" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M68.2914 109.598C66.1686 108.591 62.4538 105.317 62.4538 105.317" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M71.4049 106.874C68.9991 105.775 64.789 102.204 64.789 102.204" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M86.9971 91.8C95.5145 86.0616 101.962 77.753 105.392 68.094C108.822 58.435 109.055 47.9345 106.056 38.134C103.057 28.3336 96.9838 19.7494 88.7289 13.6419C80.474 7.53438 70.4717 4.22518 60.1907 4.20014C49.9096 4.1751 39.8913 7.43554 31.6065 13.5028C23.3217 19.5701 17.2069 28.1245 14.1599 37.9102C11.1128 47.696 11.294 58.1975 14.6768 67.8731C18.0596 77.5486 24.4658 85.8885 32.955 91.6684" stroke="#CED4DC" stroke-width="2" stroke-linecap="round"/>
-    <path d="M84.6771 88.2C92.4374 82.9725 98.3114 75.4037 101.437 66.6048C104.562 57.8059 104.774 48.2403 102.042 39.3125C99.3091 30.3847 93.7761 22.5649 86.255 17.0012C78.7338 11.4375 69.6207 8.42293 60.2535 8.40012C50.8863 8.37731 41.7585 11.3474 34.2101 16.8745C26.6618 22.4015 21.0905 30.1942 18.3143 39.1086C15.5381 48.023 15.7032 57.5895 18.7853 66.4035C21.8674 75.2176 27.7042 82.8149 35.4388 88.0801" stroke="#CED4DC" stroke-linecap="round"/>
-</svg>
-`;
diff --git a/libs/assets/src/svg/svgs/party.ts b/libs/assets/src/svg/svgs/party.ts
index 6fb587a7c14..efa5331f4fc 100644
--- a/libs/assets/src/svg/svgs/party.ts
+++ b/libs/assets/src/svg/svgs/party.ts
@@ -1,30 +1,25 @@
 import { svgIcon } from "../icon-service";
 
 export const Party = svgIcon`
-  <svg width="90" height="89" viewBox="0 0 90 89" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path class="tw-fill-illustration-tertiary" d="M58.4596 65.7743L7.72887 86.9121C6.14906 87.5704 4.32819 87.2102 3.11801 86C1.90783 84.7898 1.54761 82.9689 2.20587 81.3891L23.3437 30.6584C24.9201 26.8749 29.1011 24.8949 33.0271 26.0727L34.4564 26.5015C47.9795 30.5585 58.5595 41.1384 62.6165 54.6616L63.0453 56.0909C64.2231 60.0169 62.2431 64.1979 58.4596 65.7743Z" />
-    <path class="tw-fill-illustration-bg-tertiary" fill-rule="evenodd" clip-rule="evenodd" d="M26.7218 78.9986C23.7051 76.7004 20.7338 74.1105 17.8708 71.2476C15.0079 68.3846 12.418 65.4133 10.1198 62.3967L11.0125 60.2543C13.421 63.5125 16.1857 66.734 19.2851 69.8334C22.3844 72.9327 25.6059 75.6974 28.8641 78.106L26.7218 78.9986ZM18.2831 82.5147C16.2281 80.7619 14.1998 78.8905 12.2139 76.9046C10.2279 74.9186 8.35655 72.8904 6.60371 70.8354L5.74316 72.9007C7.3385 74.7346 9.02504 76.5442 10.7996 78.3188C12.5742 80.0934 14.3838 81.7799 16.2178 83.3753L18.2831 82.5147ZM38.0519 74.2777C33.6361 71.6409 29.2069 68.2051 25.0601 64.0583C20.9133 59.9115 17.4775 55.4823 14.8407 51.0666L15.8077 48.7457C18.4319 53.4237 22.0191 58.1889 26.4743 62.6441C30.9295 67.0993 35.6947 70.6865 40.3728 73.3107L38.0519 74.2777ZM20.1695 38.2775C21.8284 44.3268 25.9054 51.1409 31.9414 57.177C37.9775 63.213 44.7916 67.2901 50.8409 68.9489L54.0834 67.5979C53.0546 67.4469 51.9666 67.2041 50.8243 66.8641C45.3003 65.2204 39.0089 61.416 33.3557 55.7627C27.7024 50.1095 23.898 43.8181 22.2543 38.2941C21.9144 37.1519 21.6715 36.0638 21.5205 35.035L20.1695 38.2775Z"/>
-    <path class="tw-fill-illustration-bg-secondary" d="M49.7753 39.3432C57.9763 47.5442 62.0918 56.7251 58.9676 59.8492C55.8434 62.9734 46.6626 58.8579 38.4615 50.6569C30.2605 42.4558 26.145 33.275 29.2692 30.1508C32.3934 27.0266 41.5742 31.1421 49.7753 39.3432Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M56.7934 52.3181C55.2526 48.881 52.3347 44.731 48.361 40.7574C44.3874 36.7837 40.2374 33.8658 36.8003 32.325C35.0749 31.5516 33.6291 31.1703 32.5336 31.1131C31.4375 31.0558 30.9236 31.3248 30.6834 31.565C30.4432 31.8052 30.1742 32.3191 30.2315 33.4152C30.2887 34.5107 30.67 35.9565 31.4434 37.6819C32.9842 41.119 35.9021 45.269 39.8758 49.2426C43.8494 53.2163 47.9994 56.1342 51.4365 57.675C53.1619 58.4484 54.6077 58.8297 55.7032 58.8869C56.7993 58.9442 57.3132 58.6752 57.5534 58.435C57.7936 58.1948 58.0626 57.6809 58.0053 56.5848C57.9481 55.4893 57.5668 54.0435 56.7934 52.3181ZM58.9676 59.8492C62.0918 56.7251 57.9763 47.5442 49.7753 39.3432C41.5742 31.1421 32.3934 27.0266 29.2692 30.1508C26.145 33.275 30.2605 42.4558 38.4615 50.6569C46.6626 58.8579 55.8434 62.9734 58.9676 59.8492Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M32.7398 27.0305C29.3046 26 25.6462 27.7324 24.2668 31.043L3.12897 81.7738C2.62658 82.9795 2.9015 84.3692 3.82515 85.2929C4.74879 86.2165 6.13853 86.4915 7.34428 85.9891L58.075 64.8512C61.3856 63.4718 63.118 59.8135 62.0875 56.3783L61.6587 54.9489C57.6983 41.7478 47.3703 31.4197 34.1691 27.4593L32.7398 27.0305ZM22.4206 30.2738C24.1941 26.0173 28.8978 23.7899 33.3144 25.1149L34.7438 25.5437C48.5889 29.6972 59.4208 40.5291 63.5743 54.3742L64.0031 55.8036C65.3281 60.2202 63.1007 64.9239 58.8442 66.6974L8.11351 87.8352C6.15966 88.6493 3.90765 88.2038 2.41093 86.7071C0.914216 85.2104 0.468712 82.9584 1.28282 81.0045L22.4206 30.2738Z" />
-    <path class="tw-fill-illustration-outline" d="M44.382 0.584344C44.4617 0.242133 44.7668 0 45.1182 0C45.4695 0 45.7746 0.242133 45.8543 0.584344L45.8917 0.744718C46.4103 2.97018 48.148 4.70786 50.3734 5.22646L50.5338 5.26383C50.876 5.34358 51.1182 5.64862 51.1182 6C51.1182 6.35138 50.876 6.65642 50.5338 6.73617L50.3734 6.77354C48.148 7.29214 46.4103 9.02982 45.8917 11.2553L45.8543 11.4157C45.7746 11.7579 45.4695 12 45.1182 12C44.7668 12 44.4617 11.7579 44.382 11.4157L44.3446 11.2553C43.826 9.02982 42.0883 7.29214 39.8629 6.77354L39.7025 6.73617C39.3603 6.65642 39.1182 6.35138 39.1182 6C39.1182 5.64862 39.3603 5.34358 39.7025 5.26383L39.8629 5.22646C42.0883 4.70786 43.826 2.97018 44.3446 0.744717L44.382 0.584344Z" />
-    <path class="tw-fill-illustration-outline" d="M82.382 15.5843C82.4617 15.2421 82.7668 15 83.1182 15C83.4695 15 83.7746 15.2421 83.8543 15.5843L83.8917 15.7447C84.4103 17.9702 86.148 19.7079 88.3734 20.2265L88.5338 20.2638C88.876 20.3436 89.1182 20.6486 89.1182 21C89.1182 21.3514 88.876 21.6564 88.5338 21.7362L88.3734 21.7735C86.148 22.2921 84.4103 24.0298 83.8917 26.2553L83.8543 26.4157C83.7746 26.7579 83.4695 27 83.1182 27C82.7668 27 82.4617 26.7579 82.382 26.4157L82.3446 26.2553C81.826 24.0298 80.0883 22.2921 77.8629 21.7735L77.7025 21.7362C77.3603 21.6564 77.1182 21.3514 77.1182 21C77.1182 20.6486 77.3603 20.3436 77.7025 20.2638L77.8629 20.2265C80.0883 19.7079 81.826 17.9702 82.3446 15.7447L82.382 15.5843Z" />
-    <path class="tw-fill-illustration-outline" d="M69.382 76.5843C69.4617 76.2421 69.7668 76 70.1182 76C70.4695 76 70.7746 76.2421 70.8543 76.5843L70.8917 76.7447C71.4103 78.9702 73.148 80.7079 75.3734 81.2265L75.5338 81.2638C75.876 81.3436 76.1182 81.6486 76.1182 82C76.1182 82.3514 75.876 82.6564 75.5338 82.7362L75.3734 82.7735C73.148 83.2921 71.4103 85.0298 70.8917 87.2553L70.8543 87.4157C70.7746 87.7579 70.4695 88 70.1182 88C69.7668 88 69.4617 87.7579 69.382 87.4157L69.3446 87.2553C68.826 85.0298 67.0883 83.2921 64.8629 82.7735L64.7025 82.7362C64.3603 82.6564 64.1182 82.3514 64.1182 82C64.1182 81.6486 64.3603 81.3436 64.7025 81.2638L64.8629 81.2265C67.0883 80.7079 68.826 78.9702 69.3446 76.7447L69.382 76.5843Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M77.7251 48.364C74.9915 45.6303 70.5593 45.6303 67.8256 48.364C67.4351 48.7545 66.802 48.7545 66.4114 48.364C66.0209 47.9735 66.0209 47.3403 66.4114 46.9498C69.9261 43.4351 75.6246 43.4351 79.1394 46.9498C79.5299 47.3403 79.5299 47.9735 79.1394 48.364C78.7488 48.7545 78.1157 48.7545 77.7251 48.364Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M82.243 38.3173C76.5502 35.0305 69.2707 36.981 65.9839 42.6739C65.7078 43.1522 65.0962 43.316 64.6179 43.0399C64.1396 42.7637 63.9757 42.1522 64.2519 41.6739C68.091 35.0244 76.5936 32.7461 83.243 36.5852C83.7213 36.8614 83.8852 37.4729 83.609 37.9512C83.3329 38.4295 82.7213 38.5934 82.243 38.3173Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M21.1182 14C24.9842 14 28.1182 17.134 28.1182 21C28.1182 21.5523 28.5659 22 29.1182 22C29.6704 22 30.1182 21.5523 30.1182 21C30.1182 16.0294 26.0887 12 21.1182 12C20.5659 12 20.1182 12.4477 20.1182 13C20.1182 13.5523 20.5659 14 21.1182 14Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M26.5636 5.93701C30.1861 7.2874 32.028 11.3187 30.6776 14.9412C30.4847 15.4587 30.7478 16.0346 31.2653 16.2275C31.7828 16.4204 32.3587 16.1573 32.5516 15.6398C34.2878 10.9823 31.9197 5.79919 27.2622 4.06299C26.7447 3.87008 26.1688 4.13321 25.9759 4.65071C25.783 5.1682 26.0461 5.7441 26.5636 5.93701Z" />
-    <path class="tw-fill-illustration-bg-secondary" d="M62.1182 17C62.1182 19.2091 60.3273 21 58.1182 21C55.909 21 54.1182 19.2091 54.1182 17C54.1182 14.7909 55.909 13 58.1182 13C60.3273 13 62.1182 14.7909 62.1182 17Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M58.1182 19C59.2227 19 60.1182 18.1046 60.1182 17C60.1182 15.8954 59.2227 15 58.1182 15C57.0136 15 56.1182 15.8954 56.1182 17C56.1182 18.1046 57.0136 19 58.1182 19ZM58.1182 21C60.3273 21 62.1182 19.2091 62.1182 17C62.1182 14.7909 60.3273 13 58.1182 13C55.909 13 54.1182 14.7909 54.1182 17C54.1182 19.2091 55.909 21 58.1182 21Z" />
-    <path class="tw-fill-illustration-bg-secondary" d="M68.1182 29C68.1182 30.6569 66.775 32 65.1182 32C63.4613 32 62.1182 30.6569 62.1182 29C62.1182 27.3431 63.4613 26 65.1182 26C66.775 26 68.1182 27.3431 68.1182 29Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M65.1182 30C65.6704 30 66.1182 29.5523 66.1182 29C66.1182 28.4477 65.6704 28 65.1182 28C64.5659 28 64.1182 28.4477 64.1182 29C64.1182 29.5523 64.5659 30 65.1182 30ZM65.1182 32C66.775 32 68.1182 30.6569 68.1182 29C68.1182 27.3431 66.775 26 65.1182 26C63.4613 26 62.1182 27.3431 62.1182 29C62.1182 30.6569 63.4613 32 65.1182 32Z" />
-    <path class="tw-fill-illustration-bg-secondary" d="M57.1182 78C57.1182 79.6569 55.775 81 54.1182 81C52.4613 81 51.1182 79.6569 51.1182 78C51.1182 76.3431 52.4613 75 54.1182 75C55.775 75 57.1182 76.3431 57.1182 78Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M54.1182 79C54.6704 79 55.1182 78.5523 55.1182 78C55.1182 77.4477 54.6704 77 54.1182 77C53.5659 77 53.1182 77.4477 53.1182 78C53.1182 78.5523 53.5659 79 54.1182 79ZM54.1182 81C55.775 81 57.1182 79.6569 57.1182 78C57.1182 76.3431 55.775 75 54.1182 75C52.4613 75 51.1182 76.3431 51.1182 78C51.1182 79.6569 52.4613 81 54.1182 81Z" />
-    <path class="tw-fill-illustration-tertiary" d="M85.1182 60C85.1182 62.7614 82.8796 65 80.1182 65C77.3567 65 75.1182 62.7614 75.1182 60C75.1182 57.2386 77.3567 55 80.1182 55C82.8796 55 85.1182 57.2386 85.1182 60Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M80.1182 63C81.775 63 83.1182 61.6569 83.1182 60C83.1182 58.3431 81.775 57 80.1182 57C78.4613 57 77.1182 58.3431 77.1182 60C77.1182 61.6569 78.4613 63 80.1182 63ZM80.1182 65C82.8796 65 85.1182 62.7614 85.1182 60C85.1182 57.2386 82.8796 55 80.1182 55C77.3567 55 75.1182 57.2386 75.1182 60C75.1182 62.7614 77.3567 65 80.1182 65Z" />
-    <path class="tw-fill-illustration-tertiary" d="M52.1182 23.5C52.1182 25.433 50.5512 27 48.6182 27C46.6852 27 45.1182 25.433 45.1182 23.5C45.1182 21.567 46.6852 20 48.6182 20C50.5512 20 52.1182 21.567 52.1182 23.5Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M48.6182 25C49.4466 25 50.1182 24.3284 50.1182 23.5C50.1182 22.6716 49.4466 22 48.6182 22C47.7897 22 47.1182 22.6716 47.1182 23.5C47.1182 24.3284 47.7897 25 48.6182 25ZM48.6182 27C50.5512 27 52.1182 25.433 52.1182 23.5C52.1182 21.567 50.5512 20 48.6182 20C46.6852 20 45.1182 21.567 45.1182 23.5C45.1182 25.433 46.6852 27 48.6182 27Z" />
-    <path class="tw-fill-illustration-bg-tertiary" d="M81.1182 7C81.1182 10.866 77.9842 14 74.1182 14C70.2522 14 67.1182 10.866 67.1182 7C67.1182 3.13401 70.2522 0 74.1182 0C77.9842 0 81.1182 3.13401 81.1182 7Z" />
-    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M74.1182 12C76.8796 12 79.1182 9.76142 79.1182 7C79.1182 4.23858 76.8796 2 74.1182 2C71.3567 2 69.1182 4.23858 69.1182 7C69.1182 9.76142 71.3567 12 74.1182 12ZM74.1182 14C77.9842 14 81.1182 10.866 81.1182 7C81.1182 3.13401 77.9842 0 74.1182 0C70.2522 0 67.1182 3.13401 67.1182 7C67.1182 10.866 70.2522 14 74.1182 14Z" />
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="3.76 4 88.24 88.24">
+    <path class="tw-fill-illustration-tertiary" d="M61.342 69.774 10.61 90.912a4.223 4.223 0 0 1-5.523-5.523l21.138-50.73a8 8 0 0 1 9.683-4.586l1.43.428a42 42 0 0 1 28.16 28.16l.428 1.43a8 8 0 0 1-4.585 9.683Z"/>
+    <path class="tw-fill-illustration-bg-tertiary" fill-rule="evenodd" d="M29.603 82.999a87.777 87.777 0 0 1-8.85-7.751A87.763 87.763 0 0 1 13 66.397l.893-2.143a85.302 85.302 0 0 0 8.273 9.58c3.099 3.099 6.32 5.863 9.579 8.272l-2.143.893Zm-8.438 3.516a104.44 104.44 0 0 1-6.07-5.61 104.496 104.496 0 0 1-5.61-6.07l-.86 2.066a106.756 106.756 0 0 0 5.056 5.418 106.754 106.754 0 0 0 5.418 5.056l2.066-.86Zm19.768-8.237c-4.415-2.637-8.845-6.073-12.991-10.22-4.147-4.147-7.583-8.576-10.22-12.991l.967-2.321c2.625 4.678 6.212 9.443 10.667 13.898s9.22 8.042 13.898 10.667l-2.32.967Zm-17.882-36c1.659 6.049 5.736 12.863 11.772 18.899 6.036 6.036 12.85 10.113 18.9 11.772l3.242-1.351a23.334 23.334 0 0 1-3.26-.734c-5.523-1.644-11.815-5.448-17.468-11.101-5.653-5.654-9.458-11.945-11.101-17.469a23.344 23.344 0 0 1-.734-3.259l-1.351 3.243Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M52.657 43.343c8.2 8.201 12.316 17.382 9.192 20.506-3.124 3.124-12.305-.991-20.506-9.192-8.2-8.201-12.316-17.382-9.192-20.506 3.124-3.124 12.305.991 20.506 9.192Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M59.675 56.318c-1.54-3.437-4.459-7.587-8.432-11.56-3.974-3.974-8.124-6.892-11.561-8.433-1.726-.773-3.171-1.155-4.267-1.212-1.096-.057-1.61.212-1.85.452-.24.24-.51.754-.452 1.85.057 1.096.439 2.541 1.212 4.267 1.54 3.437 4.459 7.587 8.432 11.56 3.974 3.974 8.124 6.892 11.561 8.433 1.726.773 3.171 1.155 4.267 1.212 1.096.057 1.61-.212 1.85-.452.24-.24.51-.754.452-1.85-.057-1.096-.439-2.541-1.212-4.267Zm2.174 7.531c3.124-3.124-.991-12.305-9.192-20.506-8.201-8.2-17.382-12.316-20.506-9.192-3.124 3.124.991 12.305 9.192 20.506 8.201 8.2 17.382 12.316 20.506 9.192Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M35.622 31.03a7 7 0 0 0-8.473 4.013L6.01 85.773a3.223 3.223 0 0 0 4.215 4.216l50.731-21.138a7 7 0 0 0 4.012-8.473l-.428-1.429a41 41 0 0 0-27.49-27.49l-1.43-.428Zm-10.32 3.244a9 9 0 0 1 10.894-5.16l1.43.43a43 43 0 0 1 28.83 28.83l.43 1.43a9 9 0 0 1-5.16 10.894l-50.73 21.137a5.224 5.224 0 0 1-6.831-6.83l21.138-50.731Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M47.264 4.584a.756.756 0 0 1 1.472 0l.038.16a6 6 0 0 0 4.481 4.482l.16.038a.756.756 0 0 1 0 1.472l-.16.037a6 6 0 0 0-4.482 4.482l-.037.16a.756.756 0 0 1-1.472 0l-.038-.16a6 6 0 0 0-4.481-4.482l-.16-.037a.756.756 0 0 1 0-1.472l.16-.038a6 6 0 0 0 4.482-4.481l.037-.16ZM85.264 19.584a.756.756 0 0 1 1.472 0l.037.16a6 6 0 0 0 4.482 4.483l.16.037a.756.756 0 0 1 0 1.472l-.16.037a6 6 0 0 0-4.481 4.482l-.038.16a.756.756 0 0 1-1.472 0l-.037-.16a6 6 0 0 0-4.482-4.482l-.16-.037a.756.756 0 0 1 0-1.472l.16-.037a6 6 0 0 0 4.481-4.482l.038-.16ZM72.264 80.584a.756.756 0 0 1 1.472 0l.037.16a6 6 0 0 0 4.482 4.483l.16.037a.756.756 0 0 1 0 1.472l-.16.037a6 6 0 0 0-4.481 4.482l-.038.16a.756.756 0 0 1-1.472 0l-.037-.16a6 6 0 0 0-4.482-4.481l-.16-.038a.756.756 0 0 1 0-1.472l.16-.037a6 6 0 0 0 4.481-4.482l.038-.16Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M80.607 52.364a7 7 0 0 0-9.9 0 1 1 0 0 1-1.414-1.414 9 9 0 0 1 12.728 0 1 1 0 0 1-1.414 1.414ZM85.125 42.317c-5.693-3.286-12.972-1.336-16.259 4.357a1 1 0 1 1-1.732-1c3.839-6.65 12.342-8.928 18.991-5.089a1 1 0 1 1-1 1.732ZM24 18a7 7 0 0 1 7 7 1 1 0 1 0 2 0 9 9 0 0 0-9-9 1 1 0 1 0 0 2ZM29.445 9.937a7 7 0 0 1 4.114 9.004 1 1 0 1 0 1.874.699 9 9 0 0 0-5.29-11.577 1 1 0 0 0-.698 1.874Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M65 21a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M61 23a2 2 0 1 0 0-4 2 2 0 0 0 0 4Zm0 2a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M71 33a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M68 34a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm0 2a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M60 82a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M57 83a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm0 2a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M88 64a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M83 67a3 3 0 1 0 0-6 3 3 0 0 0 0 6Zm0 2a5 5 0 1 0 0-10 5 5 0 0 0 0 10Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M55 27.5a3.5 3.5 0 1 1-7 0 3.5 3.5 0 0 1 7 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M51.5 29a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Zm0 2a3.5 3.5 0 1 0 0-7 3.5 3.5 0 0 0 0 7Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M84 11a7 7 0 1 1-14 0 7 7 0 0 1 14 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M77 16a5 5 0 1 0 0-10 5 5 0 0 0 0 10Zm0 2a7 7 0 1 0 0-14 7 7 0 0 0 0 14Z" clip-rule="evenodd"/>
   </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/password-manager.ts b/libs/assets/src/svg/svgs/password-manager.ts
index 5c8ef852025..17b6f148be3 100644
--- a/libs/assets/src/svg/svgs/password-manager.ts
+++ b/libs/assets/src/svg/svgs/password-manager.ts
@@ -1,7 +1,17 @@
 import { svgIcon } from "../icon-service";
 
 const PasswordManagerLogo = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" width="200" height="49" fill="none"><g class="tw-fill-text-alt2" clip-path="url(#password-manager-logo-clip)"><path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/><path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM195.312 44.882v-7.738h1.118l.089 1.412c.176-.353.407-.647.691-.883a2.845 2.845 0 0 1 1.03-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.295 0-.579.039-.854.117a2.184 2.184 0 0 0-.75.383 1.82 1.82 0 0 0-.515.72c-.127.305-.191.687-.191 1.148v4.252h-1.236ZM190.187 45.058c-.687 0-1.295-.166-1.824-.5-.53-.333-.947-.804-1.251-1.412-.294-.608-.441-1.32-.441-2.133 0-.814.147-1.525.441-2.133.304-.608.721-1.08 1.251-1.413.539-.333 1.157-.5 1.853-.5.746 0 1.368.167 1.869.5.5.334.877.78 1.132 1.34.255.558.383 1.171.383 1.838v.294c0 .098-.005.216-.015.353h-5.987v-.956h4.795c-.019-.755-.24-1.329-.662-1.721-.411-.402-.926-.603-1.544-.603a2.214 2.214 0 0 0-1.986 1.192c-.216.392-.324.882-.324 1.47v.412c0 .648.108 1.192.324 1.633.216.432.495.755.838.971.353.216.736.324 1.148.324.549 0 .981-.103 1.294-.31.314-.215.545-.519.692-.911h1.221a2.97 2.97 0 0 1-.618 1.162 2.929 2.929 0 0 1-1.089.81c-.431.195-.931.293-1.5.293ZM181.836 48.295c-.697 0-1.31-.088-1.839-.265-.52-.167-.927-.427-1.221-.78-.285-.353-.427-.79-.427-1.309 0-.245.044-.5.132-.765.099-.265.26-.52.486-.765.235-.245.564-.466.986-.662l.941.5c-.559.216-.922.466-1.089.75-.166.285-.25.56-.25.824 0 .324.094.594.28.81.196.215.466.377.809.485.343.108.74.162 1.192.162.441 0 .819-.059 1.132-.177.324-.108.569-.27.736-.485.177-.206.265-.451.265-.736 0-.412-.133-.735-.397-.97-.265-.226-.78-.359-1.545-.398a14.992 14.992 0 0 1-1.501-.162 6.92 6.92 0 0 1-1-.235 3.296 3.296 0 0 1-.647-.324 4.326 4.326 0 0 1-.456-.368v-.338l1.456-1.398 1.162.383-1.589 1.31.192-.56c.108.079.211.152.309.22.098.07.23.133.397.192.176.05.417.098.721.147.314.05.725.093 1.235.133.707.049 1.27.166 1.692.353.422.186.726.446.912.78.187.323.28.72.28 1.191 0 .412-.118.804-.353 1.177-.226.373-.589.677-1.089.912-.49.245-1.128.368-1.912.368Zm-.015-5.826c-.628 0-1.162-.117-1.604-.353a2.505 2.505 0 0 1-.985-.986 2.942 2.942 0 0 1-.339-1.412c0-.52.113-.986.339-1.397.235-.412.569-.74 1-.986.441-.245.971-.368 1.589-.368.637 0 1.172.123 1.603.368.432.245.761.574.986.986.226.412.338.877.338 1.397s-.112.99-.338 1.412a2.5 2.5 0 0 1-.986.986c-.431.236-.966.353-1.603.353Zm0-1.015c.549 0 .976-.142 1.28-.426.304-.295.456-.731.456-1.31 0-.579-.152-1.01-.456-1.294-.304-.285-.731-.427-1.28-.427-.52 0-.946.142-1.28.427-.324.284-.485.715-.485 1.294 0 .579.157 1.015.47 1.31.324.284.756.426 1.295.426Zm1.295-3.266-.368-1.044h3.03v.927l-2.662.117ZM173.115 45.058c-.588 0-1.079-.108-1.471-.323a2.247 2.247 0 0 1-.883-.883 2.523 2.523 0 0 1-.294-1.192c0-.51.128-.941.383-1.294.264-.363.632-.638 1.103-.824.471-.186 1.02-.28 1.648-.28h1.927c0-.5-.059-.916-.177-1.25-.118-.333-.309-.584-.574-.75-.264-.167-.617-.25-1.059-.25-.441 0-.819.112-1.133.338-.313.216-.51.54-.588.971h-1.265c.059-.51.23-.937.515-1.28a2.63 2.63 0 0 1 1.074-.794c.441-.187.907-.28 1.397-.28.697 0 1.27.128 1.721.383.452.245.785.593 1.001 1.044.216.442.323.966.323 1.574v4.914h-1.103l-.073-1.324a2.782 2.782 0 0 1-.383.588 2.46 2.46 0 0 1-.53.471 2.575 2.575 0 0 1-.706.324 2.89 2.89 0 0 1-.853.117Zm.177-1.044c.323 0 .622-.074.897-.22a2.26 2.26 0 0 0 .706-.59c.206-.254.363-.539.471-.852.108-.314.162-.643.162-.986v-.147h-1.824c-.461 0-.839.059-1.133.176-.285.118-.491.285-.618.5a1.309 1.309 0 0 0-.191.707c0 .284.058.534.176.75.118.206.289.368.515.485.235.118.515.177.839.177ZM162.197 44.882v-7.738h1.118l.059 1.22c.226-.44.55-.784.971-1.03.432-.244.927-.367 1.486-.367.569 0 1.064.108 1.486.324.422.216.75.544.986.986.235.44.353 1 .353 1.677v4.928h-1.236v-4.796c0-.687-.172-1.201-.515-1.545-.333-.343-.785-.515-1.353-.515-.383 0-.736.094-1.06.28a1.964 1.964 0 0 0-.779.794c-.187.353-.28.785-.28 1.295v4.487h-1.236ZM156.507 45.058c-.588 0-1.078-.108-1.471-.323a2.245 2.245 0 0 1-.882-.883 2.513 2.513 0 0 1-.295-1.192c0-.51.128-.941.383-1.294.265-.363.632-.638 1.103-.824.471-.186 1.02-.28 1.648-.28h1.927c0-.5-.059-.916-.177-1.25a1.397 1.397 0 0 0-.573-.75c-.265-.167-.618-.25-1.059-.25-.442 0-.819.112-1.133.338-.314.216-.51.54-.589.971h-1.265c.059-.51.231-.937.515-1.28a2.63 2.63 0 0 1 1.074-.794c.441-.187.907-.28 1.398-.28.696 0 1.27.128 1.721.383a2.29 2.29 0 0 1 1 1.044c.216.442.324.966.324 1.574v4.914h-1.104l-.073-1.324a2.743 2.743 0 0 1-.383.588 2.455 2.455 0 0 1-.529.471 2.603 2.603 0 0 1-.706.324c-.255.078-.54.117-.854.117Zm.177-1.044c.324 0 .623-.074.897-.22a2.26 2.26 0 0 0 .706-.59c.206-.254.363-.539.471-.852.108-.314.162-.643.162-.986v-.147h-1.824c-.461 0-.839.059-1.133.176-.284.118-.49.285-.618.5a1.318 1.318 0 0 0-.191.707c0 .284.059.534.176.75.118.206.29.368.515.485.236.118.515.177.839.177ZM142.043 44.882V34.584h1.442l3.501 7.253 3.472-7.253h1.457v10.298h-1.236v-8.077l-3.237 6.724h-.927l-3.236-6.665v8.018h-1.236ZM132.059 45.059c-.686 0-1.294-.177-1.824-.53a3.562 3.562 0 0 1-1.236-1.442c-.294-.618-.441-1.314-.441-2.089 0-.784.147-1.476.441-2.074a3.456 3.456 0 0 1 1.236-1.427c.53-.353 1.143-.53 1.839-.53.608 0 1.128.123 1.56.368.441.245.789.588 1.044 1.03V34.29h1.236v10.592h-1.118l-.103-1.236a2.948 2.948 0 0 1-.589.692 2.803 2.803 0 0 1-.868.53c-.333.127-.725.19-1.177.19Zm.162-1.074c.491 0 .917-.118 1.28-.353.363-.246.643-.589.839-1.03.196-.451.294-.981.294-1.59 0-.607-.098-1.132-.294-1.573-.196-.451-.476-.795-.839-1.03-.363-.245-.789-.368-1.28-.368-.461 0-.873.123-1.236.368-.362.235-.647.579-.853 1.03-.206.441-.309.966-.309 1.574 0 .608.103 1.138.309 1.589.206.441.491.784.853 1.03.363.235.775.353 1.236.353ZM123.408 44.882v-7.738h1.118l.088 1.412a2.69 2.69 0 0 1 .692-.883 2.84 2.84 0 0 1 1.029-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.294 0-.578.039-.853.117a2.166 2.166 0 0 0-.75.383 1.81 1.81 0 0 0-.515.72c-.128.305-.191.687-.191 1.148v4.252h-1.236ZM117.955 45.058c-.716 0-1.349-.166-1.898-.5a3.377 3.377 0 0 1-1.28-1.412c-.304-.608-.456-1.32-.456-2.133 0-.824.152-1.535.456-2.133a3.471 3.471 0 0 1 1.295-1.413c.559-.333 1.196-.5 1.912-.5.726 0 1.358.167 1.898.5.549.334.976.805 1.28 1.413.304.598.456 1.309.456 2.133 0 .814-.157 1.525-.471 2.133a3.377 3.377 0 0 1-1.28 1.412c-.549.334-1.187.5-1.912.5Zm0-1.059c.451 0 .858-.108 1.221-.324.363-.225.647-.558.853-1 .216-.451.324-1.005.324-1.662 0-.667-.103-1.221-.309-1.663-.206-.44-.491-.77-.854-.985a2.192 2.192 0 0 0-1.206-.339 2.24 2.24 0 0 0-1.206.339c-.363.215-.652.544-.868.985-.216.442-.324.996-.324 1.663 0 .657.103 1.211.309 1.662.216.442.5.775.853 1 .363.216.765.324 1.207.324ZM104.913 44.882l-2.281-7.738h1.236l1.692 6.164 1.795-6.164h1.397l1.81 6.149 1.677-6.15h1.25l-2.28 7.739h-1.265l-1.883-6.444-1.883 6.444h-1.265ZM98.892 45.058c-.696 0-1.275-.103-1.736-.309-.45-.215-.794-.51-1.03-.882a3.06 3.06 0 0 1-.426-1.324h1.265c.04.265.127.51.265.735.147.216.358.393.632.53.275.137.623.206 1.045.206.333 0 .618-.05.853-.147.236-.108.412-.255.53-.442.127-.186.191-.402.191-.647 0-.323-.074-.574-.221-.75-.137-.186-.343-.324-.618-.412a4.496 4.496 0 0 0-1-.22 6.681 6.681 0 0 1-1.147-.25 2.896 2.896 0 0 1-.854-.427 1.708 1.708 0 0 1-.515-.663 2.304 2.304 0 0 1-.176-.941c0-.422.113-.794.338-1.118.226-.324.545-.574.957-.75.421-.187.916-.28 1.485-.28.834 0 1.491.191 1.972.574.49.382.779.927.868 1.633h-1.221a1.207 1.207 0 0 0-.5-.853c-.285-.206-.663-.31-1.133-.31-.5 0-.878.094-1.133.28a.87.87 0 0 0-.383.736c0 .225.054.431.162.618.118.176.314.328.589.456.274.117.642.206 1.103.264.579.07 1.069.182 1.471.339.402.147.706.377.912.691.216.314.319.74.309 1.28 0 .51-.122.942-.368 1.295a2.222 2.222 0 0 1-1 .809c-.422.186-.917.28-1.486.28ZM91.407 45.058c-.696 0-1.275-.103-1.736-.309-.45-.215-.794-.51-1.03-.882a3.06 3.06 0 0 1-.426-1.324h1.265c.04.265.127.51.265.735.147.216.358.393.632.53.275.137.623.206 1.045.206.333 0 .618-.05.853-.147.236-.108.412-.255.53-.442.127-.186.191-.402.191-.647 0-.323-.073-.574-.22-.75-.138-.186-.344-.324-.618-.412a4.496 4.496 0 0 0-1-.22 6.681 6.681 0 0 1-1.148-.25 2.896 2.896 0 0 1-.854-.427 1.71 1.71 0 0 1-.515-.663 2.304 2.304 0 0 1-.176-.941c0-.422.113-.794.338-1.118.226-.324.545-.574.957-.75.421-.187.916-.28 1.485-.28.834 0 1.491.191 1.972.574.49.382.78.927.868 1.633h-1.221a1.207 1.207 0 0 0-.5-.853c-.285-.206-.663-.31-1.133-.31-.5 0-.878.094-1.133.28a.87.87 0 0 0-.383.736c0 .225.054.431.162.618.118.176.314.328.589.456.274.117.642.206 1.103.264.579.07 1.07.182 1.471.339.402.147.706.377.912.691.216.314.319.74.31 1.28 0 .51-.123.942-.369 1.295a2.228 2.228 0 0 1-1 .809c-.422.186-.917.28-1.486.28ZM82.922 45.058c-.588 0-1.079-.108-1.471-.323a2.246 2.246 0 0 1-.883-.883 2.522 2.522 0 0 1-.294-1.192c0-.51.127-.941.382-1.294.265-.363.633-.638 1.104-.824.47-.186 1.02-.28 1.647-.28h1.928c0-.5-.06-.916-.177-1.25a1.402 1.402 0 0 0-.574-.75c-.264-.167-.618-.25-1.059-.25-.441 0-.819.112-1.133.338-.313.216-.51.54-.588.971h-1.265c.059-.51.23-.937.515-1.28a2.635 2.635 0 0 1 1.074-.794c.441-.187.907-.28 1.397-.28.697 0 1.27.128 1.721.383a2.29 2.29 0 0 1 1 1.044c.217.442.324.966.324 1.574v4.914h-1.103l-.073-1.324a2.74 2.74 0 0 1-.383.588 2.46 2.46 0 0 1-.53.471 2.591 2.591 0 0 1-.706.324c-.255.078-.54.117-.853.117Zm.177-1.044c.323 0 .622-.074.897-.22.275-.148.51-.344.706-.59.206-.254.363-.539.47-.852.109-.314.163-.643.163-.986v-.147H83.51c-.46 0-.838.059-1.132.176-.285.118-.49.285-.618.5a1.314 1.314 0 0 0-.191.707c0 .284.058.534.176.75.118.206.29.368.515.485.235.118.515.177.839.177ZM72.351 44.882V34.584h3.31c.824 0 1.5.137 2.03.412.53.274.922.647 1.177 1.118.255.46.383.986.383 1.574 0 .579-.128 1.103-.383 1.574-.255.47-.647.844-1.176 1.118-.52.275-1.197.412-2.03.412h-2.075v4.09h-1.236Zm1.236-5.134h2.06c.863 0 1.466-.187 1.81-.56.352-.382.529-.882.529-1.5 0-.647-.177-1.152-.53-1.515-.343-.373-.946-.56-1.81-.56h-2.059v4.135Z"/></g><defs><clipPath id="password-manager-logo-clip"><path class="tw-fill-text-alt2" d="M0 0h200v48.819H0z"/></clipPath></defs></svg>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 49" fill="none">
+    <g class="tw-fill-text-alt2" clip-path="url(#password-manager-logo-clip)">
+      <path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/>
+      <path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM195.312 44.882v-7.738h1.118l.089 1.412c.176-.353.407-.647.691-.883a2.845 2.845 0 0 1 1.03-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.295 0-.579.039-.854.117a2.184 2.184 0 0 0-.75.383 1.82 1.82 0 0 0-.515.72c-.127.305-.191.687-.191 1.148v4.252h-1.236ZM190.187 45.058c-.687 0-1.295-.166-1.824-.5-.53-.333-.947-.804-1.251-1.412-.294-.608-.441-1.32-.441-2.133 0-.814.147-1.525.441-2.133.304-.608.721-1.08 1.251-1.413.539-.333 1.157-.5 1.853-.5.746 0 1.368.167 1.869.5.5.334.877.78 1.132 1.34.255.558.383 1.171.383 1.838v.294c0 .098-.005.216-.015.353h-5.987v-.956h4.795c-.019-.755-.24-1.329-.662-1.721-.411-.402-.926-.603-1.544-.603a2.214 2.214 0 0 0-1.986 1.192c-.216.392-.324.882-.324 1.47v.412c0 .648.108 1.192.324 1.633.216.432.495.755.838.971.353.216.736.324 1.148.324.549 0 .981-.103 1.294-.31.314-.215.545-.519.692-.911h1.221a2.97 2.97 0 0 1-.618 1.162 2.929 2.929 0 0 1-1.089.81c-.431.195-.931.293-1.5.293ZM181.836 48.295c-.697 0-1.31-.088-1.839-.265-.52-.167-.927-.427-1.221-.78-.285-.353-.427-.79-.427-1.309 0-.245.044-.5.132-.765.099-.265.26-.52.486-.765.235-.245.564-.466.986-.662l.941.5c-.559.216-.922.466-1.089.75-.166.285-.25.56-.25.824 0 .324.094.594.28.81.196.215.466.377.809.485.343.108.74.162 1.192.162.441 0 .819-.059 1.132-.177.324-.108.569-.27.736-.485.177-.206.265-.451.265-.736 0-.412-.133-.735-.397-.97-.265-.226-.78-.359-1.545-.398a14.992 14.992 0 0 1-1.501-.162 6.92 6.92 0 0 1-1-.235 3.296 3.296 0 0 1-.647-.324 4.326 4.326 0 0 1-.456-.368v-.338l1.456-1.398 1.162.383-1.589 1.31.192-.56c.108.079.211.152.309.22.098.07.23.133.397.192.176.05.417.098.721.147.314.05.725.093 1.235.133.707.049 1.27.166 1.692.353.422.186.726.446.912.78.187.323.28.72.28 1.191 0 .412-.118.804-.353 1.177-.226.373-.589.677-1.089.912-.49.245-1.128.368-1.912.368Zm-.015-5.826c-.628 0-1.162-.117-1.604-.353a2.505 2.505 0 0 1-.985-.986 2.942 2.942 0 0 1-.339-1.412c0-.52.113-.986.339-1.397.235-.412.569-.74 1-.986.441-.245.971-.368 1.589-.368.637 0 1.172.123 1.603.368.432.245.761.574.986.986.226.412.338.877.338 1.397s-.112.99-.338 1.412a2.5 2.5 0 0 1-.986.986c-.431.236-.966.353-1.603.353Zm0-1.015c.549 0 .976-.142 1.28-.426.304-.295.456-.731.456-1.31 0-.579-.152-1.01-.456-1.294-.304-.285-.731-.427-1.28-.427-.52 0-.946.142-1.28.427-.324.284-.485.715-.485 1.294 0 .579.157 1.015.47 1.31.324.284.756.426 1.295.426Zm1.295-3.266-.368-1.044h3.03v.927l-2.662.117ZM173.115 45.058c-.588 0-1.079-.108-1.471-.323a2.247 2.247 0 0 1-.883-.883 2.523 2.523 0 0 1-.294-1.192c0-.51.128-.941.383-1.294.264-.363.632-.638 1.103-.824.471-.186 1.02-.28 1.648-.28h1.927c0-.5-.059-.916-.177-1.25-.118-.333-.309-.584-.574-.75-.264-.167-.617-.25-1.059-.25-.441 0-.819.112-1.133.338-.313.216-.51.54-.588.971h-1.265c.059-.51.23-.937.515-1.28a2.63 2.63 0 0 1 1.074-.794c.441-.187.907-.28 1.397-.28.697 0 1.27.128 1.721.383.452.245.785.593 1.001 1.044.216.442.323.966.323 1.574v4.914h-1.103l-.073-1.324a2.782 2.782 0 0 1-.383.588 2.46 2.46 0 0 1-.53.471 2.575 2.575 0 0 1-.706.324 2.89 2.89 0 0 1-.853.117Zm.177-1.044c.323 0 .622-.074.897-.22a2.26 2.26 0 0 0 .706-.59c.206-.254.363-.539.471-.852.108-.314.162-.643.162-.986v-.147h-1.824c-.461 0-.839.059-1.133.176-.285.118-.491.285-.618.5a1.309 1.309 0 0 0-.191.707c0 .284.058.534.176.75.118.206.289.368.515.485.235.118.515.177.839.177ZM162.197 44.882v-7.738h1.118l.059 1.22c.226-.44.55-.784.971-1.03.432-.244.927-.367 1.486-.367.569 0 1.064.108 1.486.324.422.216.75.544.986.986.235.44.353 1 .353 1.677v4.928h-1.236v-4.796c0-.687-.172-1.201-.515-1.545-.333-.343-.785-.515-1.353-.515-.383 0-.736.094-1.06.28a1.964 1.964 0 0 0-.779.794c-.187.353-.28.785-.28 1.295v4.487h-1.236ZM156.507 45.058c-.588 0-1.078-.108-1.471-.323a2.245 2.245 0 0 1-.882-.883 2.513 2.513 0 0 1-.295-1.192c0-.51.128-.941.383-1.294.265-.363.632-.638 1.103-.824.471-.186 1.02-.28 1.648-.28h1.927c0-.5-.059-.916-.177-1.25a1.397 1.397 0 0 0-.573-.75c-.265-.167-.618-.25-1.059-.25-.442 0-.819.112-1.133.338-.314.216-.51.54-.589.971h-1.265c.059-.51.231-.937.515-1.28a2.63 2.63 0 0 1 1.074-.794c.441-.187.907-.28 1.398-.28.696 0 1.27.128 1.721.383a2.29 2.29 0 0 1 1 1.044c.216.442.324.966.324 1.574v4.914h-1.104l-.073-1.324a2.743 2.743 0 0 1-.383.588 2.455 2.455 0 0 1-.529.471 2.603 2.603 0 0 1-.706.324c-.255.078-.54.117-.854.117Zm.177-1.044c.324 0 .623-.074.897-.22a2.26 2.26 0 0 0 .706-.59c.206-.254.363-.539.471-.852.108-.314.162-.643.162-.986v-.147h-1.824c-.461 0-.839.059-1.133.176-.284.118-.49.285-.618.5a1.318 1.318 0 0 0-.191.707c0 .284.059.534.176.75.118.206.29.368.515.485.236.118.515.177.839.177ZM142.043 44.882V34.584h1.442l3.501 7.253 3.472-7.253h1.457v10.298h-1.236v-8.077l-3.237 6.724h-.927l-3.236-6.665v8.018h-1.236ZM132.059 45.059c-.686 0-1.294-.177-1.824-.53a3.562 3.562 0 0 1-1.236-1.442c-.294-.618-.441-1.314-.441-2.089 0-.784.147-1.476.441-2.074a3.456 3.456 0 0 1 1.236-1.427c.53-.353 1.143-.53 1.839-.53.608 0 1.128.123 1.56.368.441.245.789.588 1.044 1.03V34.29h1.236v10.592h-1.118l-.103-1.236a2.948 2.948 0 0 1-.589.692 2.803 2.803 0 0 1-.868.53c-.333.127-.725.19-1.177.19Zm.162-1.074c.491 0 .917-.118 1.28-.353.363-.246.643-.589.839-1.03.196-.451.294-.981.294-1.59 0-.607-.098-1.132-.294-1.573-.196-.451-.476-.795-.839-1.03-.363-.245-.789-.368-1.28-.368-.461 0-.873.123-1.236.368-.362.235-.647.579-.853 1.03-.206.441-.309.966-.309 1.574 0 .608.103 1.138.309 1.589.206.441.491.784.853 1.03.363.235.775.353 1.236.353ZM123.408 44.882v-7.738h1.118l.088 1.412a2.69 2.69 0 0 1 .692-.883 2.84 2.84 0 0 1 1.029-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.294 0-.578.039-.853.117a2.166 2.166 0 0 0-.75.383 1.81 1.81 0 0 0-.515.72c-.128.305-.191.687-.191 1.148v4.252h-1.236ZM117.955 45.058c-.716 0-1.349-.166-1.898-.5a3.377 3.377 0 0 1-1.28-1.412c-.304-.608-.456-1.32-.456-2.133 0-.824.152-1.535.456-2.133a3.471 3.471 0 0 1 1.295-1.413c.559-.333 1.196-.5 1.912-.5.726 0 1.358.167 1.898.5.549.334.976.805 1.28 1.413.304.598.456 1.309.456 2.133 0 .814-.157 1.525-.471 2.133a3.377 3.377 0 0 1-1.28 1.412c-.549.334-1.187.5-1.912.5Zm0-1.059c.451 0 .858-.108 1.221-.324.363-.225.647-.558.853-1 .216-.451.324-1.005.324-1.662 0-.667-.103-1.221-.309-1.663-.206-.44-.491-.77-.854-.985a2.192 2.192 0 0 0-1.206-.339 2.24 2.24 0 0 0-1.206.339c-.363.215-.652.544-.868.985-.216.442-.324.996-.324 1.663 0 .657.103 1.211.309 1.662.216.442.5.775.853 1 .363.216.765.324 1.207.324ZM104.913 44.882l-2.281-7.738h1.236l1.692 6.164 1.795-6.164h1.397l1.81 6.149 1.677-6.15h1.25l-2.28 7.739h-1.265l-1.883-6.444-1.883 6.444h-1.265ZM98.892 45.058c-.696 0-1.275-.103-1.736-.309-.45-.215-.794-.51-1.03-.882a3.06 3.06 0 0 1-.426-1.324h1.265c.04.265.127.51.265.735.147.216.358.393.632.53.275.137.623.206 1.045.206.333 0 .618-.05.853-.147.236-.108.412-.255.53-.442.127-.186.191-.402.191-.647 0-.323-.074-.574-.221-.75-.137-.186-.343-.324-.618-.412a4.496 4.496 0 0 0-1-.22 6.681 6.681 0 0 1-1.147-.25 2.896 2.896 0 0 1-.854-.427 1.708 1.708 0 0 1-.515-.663 2.304 2.304 0 0 1-.176-.941c0-.422.113-.794.338-1.118.226-.324.545-.574.957-.75.421-.187.916-.28 1.485-.28.834 0 1.491.191 1.972.574.49.382.779.927.868 1.633h-1.221a1.207 1.207 0 0 0-.5-.853c-.285-.206-.663-.31-1.133-.31-.5 0-.878.094-1.133.28a.87.87 0 0 0-.383.736c0 .225.054.431.162.618.118.176.314.328.589.456.274.117.642.206 1.103.264.579.07 1.069.182 1.471.339.402.147.706.377.912.691.216.314.319.74.309 1.28 0 .51-.122.942-.368 1.295a2.222 2.222 0 0 1-1 .809c-.422.186-.917.28-1.486.28ZM91.407 45.058c-.696 0-1.275-.103-1.736-.309-.45-.215-.794-.51-1.03-.882a3.06 3.06 0 0 1-.426-1.324h1.265c.04.265.127.51.265.735.147.216.358.393.632.53.275.137.623.206 1.045.206.333 0 .618-.05.853-.147.236-.108.412-.255.53-.442.127-.186.191-.402.191-.647 0-.323-.073-.574-.22-.75-.138-.186-.344-.324-.618-.412a4.496 4.496 0 0 0-1-.22 6.681 6.681 0 0 1-1.148-.25 2.896 2.896 0 0 1-.854-.427 1.71 1.71 0 0 1-.515-.663 2.304 2.304 0 0 1-.176-.941c0-.422.113-.794.338-1.118.226-.324.545-.574.957-.75.421-.187.916-.28 1.485-.28.834 0 1.491.191 1.972.574.49.382.78.927.868 1.633h-1.221a1.207 1.207 0 0 0-.5-.853c-.285-.206-.663-.31-1.133-.31-.5 0-.878.094-1.133.28a.87.87 0 0 0-.383.736c0 .225.054.431.162.618.118.176.314.328.589.456.274.117.642.206 1.103.264.579.07 1.07.182 1.471.339.402.147.706.377.912.691.216.314.319.74.31 1.28 0 .51-.123.942-.369 1.295a2.228 2.228 0 0 1-1 .809c-.422.186-.917.28-1.486.28ZM82.922 45.058c-.588 0-1.079-.108-1.471-.323a2.246 2.246 0 0 1-.883-.883 2.522 2.522 0 0 1-.294-1.192c0-.51.127-.941.382-1.294.265-.363.633-.638 1.104-.824.47-.186 1.02-.28 1.647-.28h1.928c0-.5-.06-.916-.177-1.25a1.402 1.402 0 0 0-.574-.75c-.264-.167-.618-.25-1.059-.25-.441 0-.819.112-1.133.338-.313.216-.51.54-.588.971h-1.265c.059-.51.23-.937.515-1.28a2.635 2.635 0 0 1 1.074-.794c.441-.187.907-.28 1.397-.28.697 0 1.27.128 1.721.383a2.29 2.29 0 0 1 1 1.044c.217.442.324.966.324 1.574v4.914h-1.103l-.073-1.324a2.74 2.74 0 0 1-.383.588 2.46 2.46 0 0 1-.53.471 2.591 2.591 0 0 1-.706.324c-.255.078-.54.117-.853.117Zm.177-1.044c.323 0 .622-.074.897-.22.275-.148.51-.344.706-.59.206-.254.363-.539.47-.852.109-.314.163-.643.163-.986v-.147H83.51c-.46 0-.838.059-1.132.176-.285.118-.49.285-.618.5a1.314 1.314 0 0 0-.191.707c0 .284.058.534.176.75.118.206.29.368.515.485.235.118.515.177.839.177ZM72.351 44.882V34.584h3.31c.824 0 1.5.137 2.03.412.53.274.922.647 1.177 1.118.255.46.383.986.383 1.574 0 .579-.128 1.103-.383 1.574-.255.47-.647.844-1.176 1.118-.52.275-1.197.412-2.03.412h-2.075v4.09h-1.236Zm1.236-5.134h2.06c.863 0 1.466-.187 1.81-.56.352-.382.529-.882.529-1.5 0-.647-.177-1.152-.53-1.515-.343-.373-.946-.56-1.81-.56h-2.059v4.135Z"/
+    </g>
+    <defs>
+      <clipPath id="password-manager-logo-clip">
+        <path class="tw-fill-text-alt2" d="M0 0h200v48.819H0z"/>
+      </clipPath>
+    </defs>
+  </svg>
 `;
 
 export default PasswordManagerLogo;
diff --git a/libs/assets/src/svg/svgs/provider-portal.ts b/libs/assets/src/svg/svgs/provider-portal.ts
index 54e4b219385..51c04e1553b 100644
--- a/libs/assets/src/svg/svgs/provider-portal.ts
+++ b/libs/assets/src/svg/svgs/provider-portal.ts
@@ -1,7 +1,17 @@
 import { svgIcon } from "../icon-service";
 
 const ProviderPortalLogo = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" width="200" height="46" fill="none"><g class="tw-fill-text-alt2" clip-path="url(#provider-portal-logo-clip)"><path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/><path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM97.887 45.44V34.658h3.543c.842 0 1.536.139 2.08.416.544.277.945.652 1.202 1.124.267.473.4 1.007.4 1.603 0 .585-.128 1.114-.385 1.586-.257.473-.657.853-1.202 1.14-.544.278-1.242.416-2.095.416h-2.249v4.499h-1.294Zm1.294-5.591h2.218c.863 0 1.474-.18 1.834-.54.369-.37.554-.873.554-1.51 0-.646-.185-1.15-.554-1.51-.36-.369-.971-.554-1.834-.554h-2.218v4.114ZM106.731 45.44V37.8h1.171l.108 1.463a2.767 2.767 0 0 1 1.078-1.201c.483-.298 1.079-.447 1.787-.447v1.355h-.354c-.452 0-.868.083-1.248.247-.38.154-.683.421-.909.801-.226.38-.339.904-.339 1.571v3.852h-1.294ZM115.523 45.626c-.719 0-1.366-.165-1.941-.493a3.63 3.63 0 0 1-1.371-1.387c-.328-.606-.493-1.315-.493-2.126 0-.811.17-1.515.509-2.11a3.602 3.602 0 0 1 1.371-1.402 3.924 3.924 0 0 1 1.956-.493c.719 0 1.366.164 1.941.493a3.5 3.5 0 0 1 1.356 1.402c.339.595.508 1.299.508 2.11 0 .812-.169 1.52-.508 2.126a3.595 3.595 0 0 1-1.387 1.386c-.575.33-1.222.494-1.941.494Zm0-1.11c.442 0 .853-.108 1.233-.323.38-.216.688-.54.924-.97.236-.432.354-.966.354-1.603s-.118-1.17-.354-1.602c-.226-.431-.529-.755-.909-.97a2.424 2.424 0 0 0-1.217-.324c-.441 0-.852.108-1.232.324-.38.215-.688.539-.925.97-.236.431-.354.965-.354 1.602 0 .637.118 1.17.354 1.602.237.432.54.755.909.97.38.216.786.324 1.217.324ZM122.97 45.44l-2.896-7.64h1.356l2.295 6.393 2.311-6.393h1.325l-2.896 7.64h-1.495ZM129.587 36.105a.907.907 0 0 1-.647-.246.906.906 0 0 1-.247-.647c0-.247.082-.452.247-.617a.906.906 0 0 1 .647-.246c.246 0 .457.082.631.246a.81.81 0 0 1 .262.617.878.878 0 0 1-.262.647.887.887 0 0 1-.631.246Zm-.647 9.336V37.8h1.294v7.64h-1.294ZM135.953 45.626c-.76 0-1.428-.175-2.003-.524a3.643 3.643 0 0 1-1.325-1.433c-.308-.606-.462-1.294-.462-2.064s.159-1.453.478-2.05a3.526 3.526 0 0 1 1.325-1.416c.565-.35 1.232-.524 2.002-.524.627 0 1.181.128 1.664.385.483.257.858.616 1.125 1.078v-4.73h1.294v11.093h-1.171l-.123-1.264c-.247.37-.601.704-1.063 1.002-.462.298-1.043.447-1.741.447Zm.139-1.125c.513 0 .965-.118 1.355-.354a2.46 2.46 0 0 0 .925-1.017c.226-.431.339-.935.339-1.51s-.113-1.078-.339-1.51a2.359 2.359 0 0 0-.925-1c-.39-.247-.842-.37-1.355-.37-.504 0-.955.123-1.356.37-.39.235-.698.57-.924 1-.216.432-.324.935-.324 1.51s.108 1.079.324 1.51c.226.431.534.77.924 1.017.401.236.852.354 1.356.354ZM145.596 45.626c-.73 0-1.377-.165-1.941-.493a3.67 3.67 0 0 1-1.341-1.402c-.318-.596-.477-1.3-.477-2.11 0-.802.159-1.5.477-2.096a3.427 3.427 0 0 1 1.325-1.402c.575-.339 1.238-.508 1.987-.508.74 0 1.377.17 1.911.508.544.329.96.765 1.247 1.31a3.699 3.699 0 0 1 .416 2.095v.385h-6.085c.031.585.165 1.073.401 1.463a2.5 2.5 0 0 0 .909.863c.37.195.76.293 1.171.293.534 0 .98-.123 1.34-.37.359-.246.621-.58.786-1.001H149a3.472 3.472 0 0 1-1.186 1.771c-.575.462-1.315.694-2.218.694Zm0-6.917c-.617 0-1.166.19-1.649.57-.472.37-.744.914-.816 1.632h4.806c-.031-.688-.267-1.227-.708-1.617-.442-.39-.986-.585-1.633-.585ZM150.931 45.44V37.8h1.171l.108 1.463a2.767 2.767 0 0 1 1.078-1.201c.483-.298 1.078-.447 1.787-.447v1.355h-.354c-.452 0-.868.083-1.248.247-.38.154-.683.421-.909.801-.226.38-.339.904-.339 1.571v3.852h-1.294ZM160.681 45.44V34.658h3.544c.842 0 1.535.139 2.079.416.545.277.945.652 1.202 1.124.267.473.4 1.007.4 1.603 0 .585-.128 1.114-.385 1.586-.256.473-.657.853-1.201 1.14-.545.278-1.243.416-2.095.416h-2.25v4.499h-1.294Zm1.294-5.591h2.219c.862 0 1.474-.18 1.833-.54.37-.37.555-.873.555-1.51 0-.646-.185-1.15-.555-1.51-.359-.369-.971-.554-1.833-.554h-2.219v4.114ZM172.556 45.626c-.719 0-1.366-.165-1.941-.493a3.63 3.63 0 0 1-1.371-1.387c-.329-.606-.493-1.315-.493-2.126 0-.811.169-1.515.508-2.11a3.602 3.602 0 0 1 1.371-1.402 3.93 3.93 0 0 1 1.957-.493c.719 0 1.366.164 1.941.493a3.49 3.49 0 0 1 1.355 1.402c.339.595.509 1.299.509 2.11 0 .812-.17 1.52-.509 2.126a3.6 3.6 0 0 1-1.386 1.386c-.575.33-1.222.494-1.941.494Zm0-1.11c.441 0 .852-.108 1.232-.323.38-.216.688-.54.925-.97.236-.432.354-.966.354-1.603s-.118-1.17-.354-1.602c-.226-.431-.529-.755-.909-.97a2.427 2.427 0 0 0-1.217-.324c-.442 0-.853.108-1.233.324-.38.215-.688.539-.924.97-.236.431-.354.965-.354 1.602 0 .637.118 1.17.354 1.602.236.432.539.755.909.97.38.216.785.324 1.217.324ZM178.191 45.44V37.8h1.171l.108 1.463a2.767 2.767 0 0 1 1.078-1.201c.483-.298 1.078-.447 1.787-.447v1.355h-.354c-.452 0-.868.083-1.248.247-.38.154-.683.421-.909.801-.226.38-.339.904-.339 1.571v3.852h-1.294ZM186.807 45.44c-.699 0-1.248-.169-1.649-.508-.4-.339-.6-.95-.6-1.833v-4.206h-1.325V37.8h1.325l.169-1.834h1.125V37.8h2.249v1.093h-2.249V43.1c0 .483.097.811.292.986.196.164.54.246 1.033.246h.801v1.11h-1.171ZM192.287 45.626c-.637 0-1.166-.108-1.587-.324-.421-.216-.734-.503-.94-.863a2.324 2.324 0 0 1-.308-1.17c0-.781.298-1.382.894-1.803.595-.421 1.407-.632 2.434-.632h2.064v-.092c0-.667-.175-1.17-.524-1.51-.349-.349-.816-.523-1.402-.523-.503 0-.939.128-1.309.385-.359.246-.585.61-.678 1.093h-1.325c.052-.554.236-1.021.555-1.401.329-.38.734-.668 1.217-.863a3.893 3.893 0 0 1 1.54-.308c1.068 0 1.87.287 2.404.862.544.565.816 1.32.816 2.265v4.699h-1.155l-.077-1.371a3.072 3.072 0 0 1-.955 1.109c-.411.298-.966.447-1.664.447Zm.2-1.094c.493 0 .914-.129 1.263-.385.36-.257.632-.59.817-1.002.185-.41.277-.842.277-1.294v-.015h-1.956c-.76 0-1.3.133-1.618.4a1.21 1.21 0 0 0-.462.97c0 .401.144.725.431.971.298.237.714.355 1.248.355ZM198.079 45.44V34.35h1.294V45.44h-1.294Z"/></g><defs><clipPath id="provider-portal-logo-clip"><path class="tw-fill-text-alt2" d="M0 0h200v46H0z"/></clipPath></defs></svg>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 46" fill="none">
+    <g class="tw-fill-text-alt2" clip-path="url(#provider-portal-logo-clip)">
+      <path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/>
+      <path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM97.887 45.44V34.658h3.543c.842 0 1.536.139 2.08.416.544.277.945.652 1.202 1.124.267.473.4 1.007.4 1.603 0 .585-.128 1.114-.385 1.586-.257.473-.657.853-1.202 1.14-.544.278-1.242.416-2.095.416h-2.249v4.499h-1.294Zm1.294-5.591h2.218c.863 0 1.474-.18 1.834-.54.369-.37.554-.873.554-1.51 0-.646-.185-1.15-.554-1.51-.36-.369-.971-.554-1.834-.554h-2.218v4.114ZM106.731 45.44V37.8h1.171l.108 1.463a2.767 2.767 0 0 1 1.078-1.201c.483-.298 1.079-.447 1.787-.447v1.355h-.354c-.452 0-.868.083-1.248.247-.38.154-.683.421-.909.801-.226.38-.339.904-.339 1.571v3.852h-1.294ZM115.523 45.626c-.719 0-1.366-.165-1.941-.493a3.63 3.63 0 0 1-1.371-1.387c-.328-.606-.493-1.315-.493-2.126 0-.811.17-1.515.509-2.11a3.602 3.602 0 0 1 1.371-1.402 3.924 3.924 0 0 1 1.956-.493c.719 0 1.366.164 1.941.493a3.5 3.5 0 0 1 1.356 1.402c.339.595.508 1.299.508 2.11 0 .812-.169 1.52-.508 2.126a3.595 3.595 0 0 1-1.387 1.386c-.575.33-1.222.494-1.941.494Zm0-1.11c.442 0 .853-.108 1.233-.323.38-.216.688-.54.924-.97.236-.432.354-.966.354-1.603s-.118-1.17-.354-1.602c-.226-.431-.529-.755-.909-.97a2.424 2.424 0 0 0-1.217-.324c-.441 0-.852.108-1.232.324-.38.215-.688.539-.925.97-.236.431-.354.965-.354 1.602 0 .637.118 1.17.354 1.602.237.432.54.755.909.97.38.216.786.324 1.217.324ZM122.97 45.44l-2.896-7.64h1.356l2.295 6.393 2.311-6.393h1.325l-2.896 7.64h-1.495ZM129.587 36.105a.907.907 0 0 1-.647-.246.906.906 0 0 1-.247-.647c0-.247.082-.452.247-.617a.906.906 0 0 1 .647-.246c.246 0 .457.082.631.246a.81.81 0 0 1 .262.617.878.878 0 0 1-.262.647.887.887 0 0 1-.631.246Zm-.647 9.336V37.8h1.294v7.64h-1.294ZM135.953 45.626c-.76 0-1.428-.175-2.003-.524a3.643 3.643 0 0 1-1.325-1.433c-.308-.606-.462-1.294-.462-2.064s.159-1.453.478-2.05a3.526 3.526 0 0 1 1.325-1.416c.565-.35 1.232-.524 2.002-.524.627 0 1.181.128 1.664.385.483.257.858.616 1.125 1.078v-4.73h1.294v11.093h-1.171l-.123-1.264c-.247.37-.601.704-1.063 1.002-.462.298-1.043.447-1.741.447Zm.139-1.125c.513 0 .965-.118 1.355-.354a2.46 2.46 0 0 0 .925-1.017c.226-.431.339-.935.339-1.51s-.113-1.078-.339-1.51a2.359 2.359 0 0 0-.925-1c-.39-.247-.842-.37-1.355-.37-.504 0-.955.123-1.356.37-.39.235-.698.57-.924 1-.216.432-.324.935-.324 1.51s.108 1.079.324 1.51c.226.431.534.77.924 1.017.401.236.852.354 1.356.354ZM145.596 45.626c-.73 0-1.377-.165-1.941-.493a3.67 3.67 0 0 1-1.341-1.402c-.318-.596-.477-1.3-.477-2.11 0-.802.159-1.5.477-2.096a3.427 3.427 0 0 1 1.325-1.402c.575-.339 1.238-.508 1.987-.508.74 0 1.377.17 1.911.508.544.329.96.765 1.247 1.31a3.699 3.699 0 0 1 .416 2.095v.385h-6.085c.031.585.165 1.073.401 1.463a2.5 2.5 0 0 0 .909.863c.37.195.76.293 1.171.293.534 0 .98-.123 1.34-.37.359-.246.621-.58.786-1.001H149a3.472 3.472 0 0 1-1.186 1.771c-.575.462-1.315.694-2.218.694Zm0-6.917c-.617 0-1.166.19-1.649.57-.472.37-.744.914-.816 1.632h4.806c-.031-.688-.267-1.227-.708-1.617-.442-.39-.986-.585-1.633-.585ZM150.931 45.44V37.8h1.171l.108 1.463a2.767 2.767 0 0 1 1.078-1.201c.483-.298 1.078-.447 1.787-.447v1.355h-.354c-.452 0-.868.083-1.248.247-.38.154-.683.421-.909.801-.226.38-.339.904-.339 1.571v3.852h-1.294ZM160.681 45.44V34.658h3.544c.842 0 1.535.139 2.079.416.545.277.945.652 1.202 1.124.267.473.4 1.007.4 1.603 0 .585-.128 1.114-.385 1.586-.256.473-.657.853-1.201 1.14-.545.278-1.243.416-2.095.416h-2.25v4.499h-1.294Zm1.294-5.591h2.219c.862 0 1.474-.18 1.833-.54.37-.37.555-.873.555-1.51 0-.646-.185-1.15-.555-1.51-.359-.369-.971-.554-1.833-.554h-2.219v4.114ZM172.556 45.626c-.719 0-1.366-.165-1.941-.493a3.63 3.63 0 0 1-1.371-1.387c-.329-.606-.493-1.315-.493-2.126 0-.811.169-1.515.508-2.11a3.602 3.602 0 0 1 1.371-1.402 3.93 3.93 0 0 1 1.957-.493c.719 0 1.366.164 1.941.493a3.49 3.49 0 0 1 1.355 1.402c.339.595.509 1.299.509 2.11 0 .812-.17 1.52-.509 2.126a3.6 3.6 0 0 1-1.386 1.386c-.575.33-1.222.494-1.941.494Zm0-1.11c.441 0 .852-.108 1.232-.323.38-.216.688-.54.925-.97.236-.432.354-.966.354-1.603s-.118-1.17-.354-1.602c-.226-.431-.529-.755-.909-.97a2.427 2.427 0 0 0-1.217-.324c-.442 0-.853.108-1.233.324-.38.215-.688.539-.924.97-.236.431-.354.965-.354 1.602 0 .637.118 1.17.354 1.602.236.432.539.755.909.97.38.216.785.324 1.217.324ZM178.191 45.44V37.8h1.171l.108 1.463a2.767 2.767 0 0 1 1.078-1.201c.483-.298 1.078-.447 1.787-.447v1.355h-.354c-.452 0-.868.083-1.248.247-.38.154-.683.421-.909.801-.226.38-.339.904-.339 1.571v3.852h-1.294ZM186.807 45.44c-.699 0-1.248-.169-1.649-.508-.4-.339-.6-.95-.6-1.833v-4.206h-1.325V37.8h1.325l.169-1.834h1.125V37.8h2.249v1.093h-2.249V43.1c0 .483.097.811.292.986.196.164.54.246 1.033.246h.801v1.11h-1.171ZM192.287 45.626c-.637 0-1.166-.108-1.587-.324-.421-.216-.734-.503-.94-.863a2.324 2.324 0 0 1-.308-1.17c0-.781.298-1.382.894-1.803.595-.421 1.407-.632 2.434-.632h2.064v-.092c0-.667-.175-1.17-.524-1.51-.349-.349-.816-.523-1.402-.523-.503 0-.939.128-1.309.385-.359.246-.585.61-.678 1.093h-1.325c.052-.554.236-1.021.555-1.401.329-.38.734-.668 1.217-.863a3.893 3.893 0 0 1 1.54-.308c1.068 0 1.87.287 2.404.862.544.565.816 1.32.816 2.265v4.699h-1.155l-.077-1.371a3.072 3.072 0 0 1-.955 1.109c-.411.298-.966.447-1.664.447Zm.2-1.094c.493 0 .914-.129 1.263-.385.36-.257.632-.59.817-1.002.185-.41.277-.842.277-1.294v-.015h-1.956c-.76 0-1.3.133-1.618.4a1.21 1.21 0 0 0-.462.97c0 .401.144.725.431.971.298.237.714.355 1.248.355ZM198.079 45.44V34.35h1.294V45.44h-1.294Z"/>
+    </g>
+    <defs>
+      <clipPath id="provider-portal-logo-clip">
+        <path class="tw-fill-text-alt2" d="M0 0h200v46H0z"/>
+      </clipPath>
+    </defs>
+  </svg>
 `;
 
 export default ProviderPortalLogo;
diff --git a/libs/assets/src/svg/svgs/recovery.icon.ts b/libs/assets/src/svg/svgs/recovery.icon.ts
deleted file mode 100644
index 95de89cad03..00000000000
--- a/libs/assets/src/svg/svgs/recovery.icon.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const RecoveryCodeIcon = svgIcon`
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    alt="rc logo"
-    width="76"
-    height="63"
-    fill="none"
-    class="tw-text-primary-600"
-    role="img"
-    aria-label="[title]"
-  >
-    <title>Recovery Code</title>
-    <rect
-      width="49.459"
-      height="17.255"
-      x="1"
-      y="-1"
-      stroke="currentColor"
-      stroke-width="2"
-      rx="8.627"
-      transform="matrix(-1 0 0 1 52.15 38.12)"
-    />
-    <path
-      fill="currentColor"
-      d="M7.742 19.337a1 1 0 0 1 1.635-1.152l-1.635 1.152Zm7.499 8.895.576.817a1 1 0 0 1-1.393-.24l.817-.577Zm8.895-7.498a1 1 0 1 1 1.152 1.634l-1.152-1.634Zm44.129 29.953-.776-.631.776.631ZM63.942 8.483l.631-.775-.631.775Zm-42.205 4.323.776.631-.776-.631Zm22.266 49.925a1 1 0 1 1 .063-1.999l-.063 2ZM16.358 27.183a1 1 0 1 1-1.975-.313l1.975.313Zm-6.981-8.998 6.681 9.47-1.634 1.153-6.682-9.47 1.635-1.154Zm5.287 9.23 9.472-6.681 1.152 1.634-9.47 6.681-1.154-1.634ZM67.49 50.056c10.112-12.42 8.241-30.685-4.179-40.797l1.263-1.551C77.85 18.517 79.85 38.042 69.04 51.318l-1.55-1.262ZM63.31 9.259C50.89-.853 32.625 1.018 22.513 13.437l-1.551-1.262C31.772-1.102 51.297-3.102 64.573 7.708l-1.263 1.55ZM44.066 60.732c8.732.275 17.484-3.381 23.423-10.676l1.551 1.263c-6.35 7.799-15.708 11.706-25.037 11.412l.063-1.999ZM22.513 13.437a28.861 28.861 0 0 0-6.155 13.746l-1.975-.313a30.861 30.861 0 0 1 6.579-14.695l1.551 1.262Z"
-    />
-    <path
-      stroke="currentColor"
-      stroke-linejoin="round"
-      stroke-width="2"
-      d="M36.59 25.167v-5.445c0-4.021 3.806-7.267 8.475-7.267s8.475 3.264 8.475 7.267v5.445"
-    />
-    <path
-      stroke="currentColor"
-      stroke-width="2"
-      d="M32.353 37.345v-6.098a6 6 0 0 1 6-6h13.424a6 6 0 0 1 6 6v9.187a6 6 0 0 1-6 6h-.601"
-    />
-    <path
-      fill="currentColor"
-      d="M45.886 35.63c.491-.285.822-.82.822-1.432v-.5c0-.913-.736-1.653-1.643-1.653-.908 0-1.643.74-1.643 1.654v.499c0 .612.33 1.146.82 1.432v1.283c0 .457.368.827.822.827.454 0 .822-.37.822-.827v-1.282Z"
-    />
-    <circle cx="2" cy="2" r="2" fill="currentColor" transform="matrix(-1 0 0 1 46.001 44.148)" />
-    <circle cx="2" cy="2" r="2" fill="currentColor" transform="matrix(-1 0 0 1 32.001 44.148)" />
-    <circle cx="2" cy="2" r="2" fill="currentColor" transform="matrix(-1 0 0 1 18.001 44.148)" />
-    <circle cx="2" cy="2" r="2" fill="currentColor" transform="matrix(-1 0 0 1 39.001 44.148)" />
-    <circle cx="2" cy="2" r="2" fill="currentColor" transform="matrix(-1 0 0 1 25.001 44.148)" />
-    <circle cx="2" cy="2" r="2" fill="currentColor" transform="matrix(-1 0 0 1 11.001 44.148)" />
-  </svg>
-`;
diff --git a/libs/assets/src/svg/svgs/registration-check-email.icon.ts b/libs/assets/src/svg/svgs/registration-check-email.icon.ts
index dd8a5c2cbdb..ae4cf3098e6 100644
--- a/libs/assets/src/svg/svgs/registration-check-email.icon.ts
+++ b/libs/assets/src/svg/svgs/registration-check-email.icon.ts
@@ -1,23 +1,18 @@
 import { svgIcon } from "../icon-service";
 
 export const RegistrationCheckEmailIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100" fill="none">
-    <path class="tw-stroke-art-primary"  stroke-linecap="round" stroke-width="2.477"
-        d="M104.552 42.242v12.023M48.415 17.31l6.51-4.858a7.43 7.43 0 0 1 8.984.074l1.172.904M24.844 34.897l-6.857 5.116A7.43 7.43 0 0 0 15 45.97v42.366a7.43 7.43 0 0 0 7.43 7.43h74.691a7.43 7.43 0 0 0 7.431-7.43V64.291" />
-    <path class="tw-stroke-art-primary"  stroke-linecap="round" stroke-width="2.477"
-        d="M25.48 50.5V20.058a2.477 2.477 0 0 1 2.476-2.477h32.091" />
-    <path class="tw-stroke-art-accent" stroke-linecap="round" stroke-width="2.477"
-        d="M33.778 27.71h15.674M33.778 37.037h15.217M33.778 46.364h17.728M33.778 55.691h23.206" />
-    <path class="tw-stroke-art-primary" stroke-width="2.477"
-        d="M102.645 93.86 74.211 67.614a12.384 12.384 0 0 0-8.4-3.284H52.41c-3.216 0-6.306 1.251-8.616 3.488L16.904 93.86" />
-    <path class="tw-stroke-art-primary" stroke-linecap="round" stroke-width="2.477" d="m71.36 64.73 8.904-5.106" />
-    <path class="tw-stroke-art-primary" stroke-linecap="round" stroke-width="2.477" d="M1.238-1.238h37.47"
-        transform="matrix(.85856 .5127 .51278 -.85852 15.476 43.85)" />
-    <path class="tw-stroke-art-primary" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.477"
-        d="M104.722 34.286c0 13.922-11.286 25.207-25.209 25.207-13.922 0-25.208-11.285-25.208-25.207 0-13.92 11.286-25.206 25.208-25.206 13.923 0 25.209 11.285 25.209 25.206Z" />
-    <path class="tw-stroke-art-accent" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.238"
-        d="M101.346 34.287c0 11.972-9.82 21.678-21.932 21.678m0-43.355c-12.113 0-21.932 9.705-21.932 21.677" />
-    <path class="tw-stroke-art-primary" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.477"
-        d="m99.636 49.689 3.853 3.852 14.322 14.32a3.096 3.096 0 0 1 0 4.379l-.303.303a3.097 3.097 0 0 1-4.379 0l-14.322-14.32-3.852-3.853" />
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="3.33 0.87 76.36 76.8">
+    <path class="tw-fill-illustration-bg-primary" d="M3.333 33.298a5 5 0 0 1 1.745-3.794L37.287 1.87a4.167 4.167 0 0 1 5.426 0l32.21 27.634a5 5 0 0 1 1.744 3.794v41.035a3.333 3.333 0 0 1-3.334 3.334H6.667a3.333 3.333 0 0 1-3.334-3.334V33.299Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M75 74.334V33.297c0-.972-.425-1.896-1.163-2.53L41.627 3.136a2.5 2.5 0 0 0-3.255 0L6.162 30.769A3.333 3.333 0 0 0 5 33.299v41.035C5 75.254 5.746 76 6.667 76h66.666c.92 0 1.667-.746 1.667-1.666ZM5.078 29.504a5 5 0 0 0-1.745 3.794v41.035a3.333 3.333 0 0 0 3.334 3.334h66.666a3.333 3.333 0 0 0 3.334-3.334V33.299a5 5 0 0 0-1.745-3.794L42.713 1.87a4.167 4.167 0 0 0-5.426 0L5.077 29.504Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M41.98 55.17a3.333 3.333 0 0 1-3.96 0L5.496 31.161a.833.833 0 1 0-.99 1.341L37.031 56.51a5 5 0 0 0 5.938 0l32.526-24.007a.833.833 0 0 0-.99-1.34L41.98 55.168Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M12.5 10.166h55v28.333L40.999 58.175a1.667 1.667 0 0 1-1.994-.005L12.5 38.29V10.166Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M65.833 11.833H14.167v25.625l25.838 19.379L65.833 37.66V11.833ZM67.5 38.499 40.999 58.175a1.667 1.667 0 0 1-1.994-.005L12.5 38.29V10.166h55v28.333Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="m40 50.166 18.333 10.417L40 70.999 21.667 60.583 40 50.166Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M42.02 51.92a3.333 3.333 0 0 0-4.04 0L5.505 76.663a.833.833 0 0 1-1.01-1.326L36.97 50.594a5 5 0 0 1 6.06 0l-.494.648.494-.648 32.475 24.743a.833.833 0 0 1-1.01 1.326L42.02 51.92Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M70 41c0 9.204-7.462 16.666-16.667 16.666-9.204 0-16.666-7.462-16.666-16.666 0-9.205 7.462-16.667 16.666-16.667C62.538 24.333 70 31.795 70 41Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M53.333 56c8.285 0 15-6.716 15-15 0-8.285-6.715-15-15-15-8.284 0-15 6.715-15 15 0 8.284 6.716 15 15 15Zm0 1.666C62.538 57.666 70 50.204 70 41c0-9.205-7.462-16.667-16.667-16.667-9.204 0-16.666 7.462-16.666 16.667 0 9.204 7.462 16.666 16.666 16.666Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M65.833 41c0 6.904-5.596 12.5-12.5 12.5-6.903 0-12.5-5.596-12.5-12.5s5.597-12.5 12.5-12.5c6.904 0 12.5 5.596 12.5 12.5Z"/>
+    <path class="tw-fill-illustration-outline" d="M79.17 65.24 65.417 52.25l-1.667 1.667L76.74 67.67a1.667 1.667 0 0 0 2.39.034l.074-.075a1.667 1.667 0 0 0-.034-2.39Z"/>
+    <path class="tw-fill-illustration-tertiary" fill-rule="evenodd" d="M18.333 17.666a.833.833 0 0 0 0 1.667h8.334a.833.833 0 0 0 0-1.667h-8.334ZM55 20.999a.833.833 0 0 1 0 1.667h-8.333a.833.833 0 1 1 0-1.667H55Zm.453 3.467a.83.83 0 0 0-.453-.133h-8.333a.833.833 0 0 0-.397 1.566 16.603 16.603 0 0 1 7.063-1.566c.718 0 1.425.045 2.12.133Zm-17.737 10.7a16.551 16.551 0 0 0-.524 1.667H35a.833.833 0 0 1 0-1.667h2.716Zm1.696-3.333a16.643 16.643 0 0 0-.966 1.666H32.5a.833.833 0 1 1 0-1.666h6.912ZM30 17.666a.833.833 0 0 0 0 1.667h8.333a.833.833 0 1 0 0-1.667H30Zm14.167 4.167a.833.833 0 0 0-.834-.834H35a.833.833 0 0 0 0 1.667h8.333c.46 0 .834-.373.834-.833Zm-.834 4.166a.833.833 0 1 0 0-1.666h-10a.833.833 0 0 0 0 1.666h10Zm-1.666-8.333a.833.833 0 1 0 0 1.667h1.666a.833.833 0 1 0 0-1.667h-1.666ZM32.5 21.833a.833.833 0 0 0-.833-.834H30a.833.833 0 0 0 0 1.667h1.667c.46 0 .833-.373.833-.833ZM30 25.999a.833.833 0 1 0 0-1.666h-3.333a.833.833 0 1 0 0 1.666H30Zm0 6.667c0 .46-.373.833-.833.833h-5a.833.833 0 1 1 0-1.666h5c.46 0 .833.373.833.833Zm1.667 4.167a.833.833 0 0 0 0-1.667H18.333a.833.833 0 0 0 0 1.667h13.334Zm15-19.167a.833.833 0 1 0 0 1.667H55a.833.833 0 0 0 0-1.667h-8.333ZM27.5 21.833a.833.833 0 0 0-.833-.834h-8.334a.833.833 0 0 0 0 1.667h8.334c.46 0 .833-.373.833-.833Zm-4.167 4.166a.833.833 0 1 0 0-1.666h-5a.833.833 0 0 0 0 1.666h5Zm-1.666 6.667c0 .46-.373.833-.834.833h-2.5a.833.833 0 1 1 0-1.666h2.5c.46 0 .834.373.834.833Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/registration-expired-link.icon.ts b/libs/assets/src/svg/svgs/registration-expired-link.icon.ts
deleted file mode 100644
index fbeda6c25ad..00000000000
--- a/libs/assets/src/svg/svgs/registration-expired-link.icon.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const RegistrationExpiredLinkIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100" fill="none">
-    <path class="tw-art-primary" fill="#175DDC"
-        d="M36.167 38.348c4.543-9.911 14.651-16.806 26.387-16.806 15.986 0 28.945 12.79 28.945 28.567 0 15.777-12.96 28.568-28.945 28.568-11.988 0-22.278-7.193-26.673-17.453-.484-1.13-1.803-1.657-2.947-1.18a2.209 2.209 0 0 0-1.195 2.908c5.073 11.845 16.957 20.163 30.815 20.163 18.47 0 33.442-14.777 33.442-33.006 0-18.228-14.972-33.006-33.442-33.006-14.18 0-26.294 8.708-31.16 20.999l-3.547-6.307a2.057 2.057 0 0 0-3.586 2.017l5.807 10.326a2.057 2.057 0 0 0 2.802.785l10.327-5.808a2.057 2.057 0 1 0-2.018-3.586l-5.012 2.819Z" />
-    <path class="tw-art-primary" fill="#175DDC"
-        d="M72.263 60.447a2.25 2.25 0 0 1-2.785-.229l-8.806-8.242a2.229 2.229 0 0 1-.512-.727 2.148 2.148 0 0 1-.183-.867V29.829c0-.583.234-1.142.653-1.556a2.251 2.251 0 0 1 3.152 0c.42.412.653.973.653 1.556v19.602l8.11 7.595a2.178 2.178 0 0 1 .537 2.413c-.164.41-.452.761-.82 1.008Z" />
-</svg>`;
diff --git a/libs/assets/src/svg/svgs/registration-lock-alt.icon.ts b/libs/assets/src/svg/svgs/registration-lock-alt.icon.ts
deleted file mode 100644
index 2172d293d96..00000000000
--- a/libs/assets/src/svg/svgs/registration-lock-alt.icon.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const RegistrationLockAltIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100" fill="none">
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M47.048 77.093a1 1 0 0 1 1 1v5.811a1 1 0 0 1-2 0v-5.811a1 1 0 0 1 1-1Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M53.547 81.8a1 1 0 0 1-.643 1.26l-5.548 1.795a1 1 0 1 1-.616-1.902l5.547-1.797a1 1 0 0 1 1.26.644Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M46.462 83.094a1 1 0 0 1 1.396.225l3.435 4.755a1 1 0 1 1-1.622 1.17l-3.434-4.754a1 1 0 0 1 .225-1.396Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M47.634 83.094a1 1 0 0 1 .225 1.396l-3.434 4.755a1 1 0 1 1-1.621-1.171l3.434-4.755a1 1 0 0 1 1.396-.225Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M40.549 81.8a1 1 0 0 1 1.26-.644l5.547 1.797a1 1 0 1 1-.617 1.902l-5.547-1.796a1 1 0 0 1-.643-1.26ZM65.91 77.093a1 1 0 0 1 1 1v5.811a1 1 0 0 1-2 0v-5.811a1 1 0 0 1 1-1Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M72.463 81.802a1 1 0 0 1-.647 1.258l-5.6 1.796a1 1 0 0 1-.611-1.904l5.6-1.796a1 1 0 0 1 1.258.646Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M65.325 83.094a1 1 0 0 1 1.396.225l3.434 4.755a1 1 0 0 1-1.621 1.17L65.1 84.49a1 1 0 0 1 .225-1.396Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M66.49 83.09a1 1 0 0 1 .235 1.394l-3.382 4.755a1 1 0 1 1-1.63-1.16l3.382-4.754a1 1 0 0 1 1.394-.236Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M59.41 81.8a1 1 0 0 1 1.26-.644l5.548 1.797a1 1 0 1 1-.616 1.902l-5.548-1.796a1 1 0 0 1-.643-1.26ZM77.5 88.5a1 1 0 0 1 1-1h11a1 1 0 1 1 0 2h-11a1 1 0 0 1-1-1ZM94.5 88.5a1 1 0 0 1 1-1h11a1 1 0 0 1 0 2h-11a1 1 0 0 1-1-1Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M30.5 42.5a7 7 0 0 0-7 7V85a7 7 0 0 0 7 7h9v2h-9a9 9 0 0 1-9-9V49.5a9 9 0 0 1 9-9h49a9 9 0 0 1 9 9v22.25h-2V49.5a7 7 0 0 0-7-7h-49Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M54.75 5C43.592 5 34.5 14.056 34.5 25.15V41h-2V25.15C32.5 12.943 42.496 3 54.75 3 67.002 3 77 12.889 77 25.15V41h-2V25.15C75 14.005 65.91 5 54.75 5ZM51 54.158c0-1.996 1.543-3.658 3.5-3.658s3.5 1.662 3.5 3.658a3.722 3.722 0 0 1-1.201 2.758L56.8 57v6.106c0 1.298-1.006 2.395-2.3 2.395-1.294 0-2.3-1.097-2.3-2.395V57l.001-.083A3.722 3.722 0 0 1 51 54.158Zm3.5-2.658c-1.357 0-2.5 1.165-2.5 2.658a2.71 2.71 0 0 0 1.029 2.148l.231.18-.043.29c-.011.072-.017.147-.017.223v6.106c0 .795.606 1.395 1.3 1.395.694 0 1.3-.6 1.3-1.395V57c0-.076-.006-.15-.017-.224l-.043-.29.231-.179A2.71 2.71 0 0 0 57 54.158c0-1.493-1.143-2.658-2.5-2.658Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-accent"  fill-rule="evenodd"
-        d="M105 72.5H46c-5.799 0-10.5 4.701-10.5 10.5v.5C35.5 89.299 40.201 94 46 94h59c5.799 0 10.5-4.701 10.5-10.5V83c0-5.799-4.701-10.5-10.5-10.5Zm-59-2c-6.904 0-12.5 5.596-12.5 12.5v.5C33.5 90.404 39.096 96 46 96h59c6.904 0 12.5-5.596 12.5-12.5V83c0-6.904-5.596-12.5-12.5-12.5H46Z"
-        clip-rule="evenodd" />
-</svg>`;
diff --git a/libs/assets/src/svg/svgs/registration-user-add.icon.ts b/libs/assets/src/svg/svgs/registration-user-add.icon.ts
index 2aa5bcc81b5..7428daa5848 100644
--- a/libs/assets/src/svg/svgs/registration-user-add.icon.ts
+++ b/libs/assets/src/svg/svgs/registration-user-add.icon.ts
@@ -1,24 +1,19 @@
 import { svgIcon } from "../icon-service";
 
 export const RegistrationUserAddIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 120 100" fill="none">
-    <path class="tw-fill-art-primary"  fill-rule="evenodd"
-        d="M0 21.627a7.798 7.798 0 0 1 7.798-7.798H89.38a7.798 7.798 0 0 1 7.799 7.798v8.764h-2.4v-8.764a5.399 5.399 0 0 0-5.398-5.398H7.797A5.399 5.399 0 0 0 2.4 21.627v49.19a5.399 5.399 0 0 0 5.4 5.399h9.483v2.399H7.798A7.798 7.798 0 0 1 0 70.817v-49.19Zm49.378 54.589h13.498v2.399H49.378v-2.4Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary" fill-rule="evenodd"
-        d="M88.78 61.819c8.946 0 16.197-7.252 16.197-16.197s-7.251-16.196-16.196-16.196-16.197 7.251-16.197 16.196S79.836 61.82 88.781 61.82Zm0 2.4c10.27 0 18.597-8.326 18.597-18.597 0-10.27-8.326-18.596-18.596-18.596s-18.596 8.326-18.596 18.596S78.51 64.218 88.78 64.218Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary" fill-rule="evenodd"
-        d="M61.005 90.612h54.28c1.303 0 1.833-.344 2.01-.53.128-.134.396-.517.226-1.586-2.187-13.74-14.213-24.278-28.752-24.278S62.203 74.757 60.017 88.496c-.09.569.026 1.226.279 1.662.115.199.23.305.316.359.072.045.184.095.393.095Zm0 2.4h54.28c3.346 0 5.104-1.76 4.605-4.894-2.371-14.903-15.402-26.3-31.121-26.3-15.72 0-28.75 11.397-31.122 26.3-.337 2.122.744 4.894 3.358 4.894Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-accent"  fill-rule="evenodd"
-        d="M77.983 21.027a1.2 1.2 0 0 1-1.2-1.2v-.6a1.2 1.2 0 0 1 2.4 0v.6a1.2 1.2 0 0 1-1.2 1.2ZM83.382 21.027a1.2 1.2 0 0 1-1.2-1.2v-.497a1.2 1.2 0 1 1 2.4 0v.498a1.2 1.2 0 0 1-1.2 1.2ZM88.78 21.027a1.2 1.2 0 0 1-1.2-1.2v-.497a1.2 1.2 0 1 1 2.4 0v.498a1.2 1.2 0 0 1-1.2 1.2Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary" fill-rule="evenodd" d="M95.083 24.027H0v-1.2h95.083v1.2Z"
-        clip-rule="evenodd" />
-    <g clip-path="url(#a)">
-        <path class="tw-fill-art-accent" 
-            d="M32.727 93.11a16.908 16.908 0 0 1-9.477-2.91 17.228 17.228 0 0 1-6.284-7.752 17.467 17.467 0 0 1-.97-9.98 17.343 17.343 0 0 1 4.669-8.843 17.002 17.002 0 0 1 8.735-4.727 16.867 16.867 0 0 1 9.856.982 17.113 17.113 0 0 1 7.656 6.362 17.419 17.419 0 0 1 2.875 9.596 17.4 17.4 0 0 1-5.003 12.208 16.977 16.977 0 0 1-12.057 5.065Zm0-32.245c-2.924 0-5.784.877-8.216 2.523a14.932 14.932 0 0 0-5.447 6.72 15.148 15.148 0 0 0-.84 8.652 15.028 15.028 0 0 0 4.047 7.667 14.729 14.729 0 0 0 7.572 4.098c2.87.578 5.842.281 8.545-.851a14.827 14.827 0 0 0 6.637-5.515 15.11 15.11 0 0 0 2.493-8.319 15.087 15.087 0 0 0-4.336-10.583 14.714 14.714 0 0 0-10.453-4.39l-.002-.002Zm8.82 14.168h-6.9a1.105 1.105 0 0 1-.793-.333 1.149 1.149 0 0 1-.328-.802v-6.99a.81.81 0 0 0-.233-.568.793.793 0 0 0-1.357.569v6.985a1.144 1.144 0 0 1-.328.802 1.115 1.115 0 0 1-.793.332h-6.907a.788.788 0 0 0-.562.237.812.812 0 0 0 0 1.139.79.79 0 0 0 .562.235h6.899c.296 0 .582.12.791.333.21.212.329.5.329.8v6.99c0 .213.084.418.232.57a.788.788 0 0 0 1.125 0 .809.809 0 0 0 .232-.57v-6.98c0-.301.119-.59.329-.802.21-.212.494-.332.79-.332h6.906a.795.795 0 0 0 .795-.806.81.81 0 0 0-.232-.569.791.791 0 0 0-.563-.236l.004-.004h.002Z" />
-    </g>
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 10 80 60">
+    <path class="tw-fill-illustration-bg-primary" d="M0 14.8A4.8 4.8 0 0 1 4.8 10h45.4a4.8 4.8 0 0 1 4.8 4.8v32.067a4.8 4.8 0 0 1-4.8 4.8H4.8a4.8 4.8 0 0 1-4.8-4.8V14.8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M50.2 11.6H4.8a3.2 3.2 0 0 0-3.2 3.2v32.067a3.2 3.2 0 0 0 3.2 3.2h45.4a3.2 3.2 0 0 0 3.2-3.2V14.8a3.2 3.2 0 0 0-3.2-3.2ZM4.8 10A4.8 4.8 0 0 0 0 14.8v32.067a4.8 4.8 0 0 0 4.8 4.8h45.4a4.8 4.8 0 0 0 4.8-4.8V14.8a4.8 4.8 0 0 0-4.8-4.8H4.8Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M54.167 19.966H.834v-1.6h53.333v1.6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M51.667 15a1.667 1.667 0 1 1-3.333 0 1.667 1.667 0 0 1 3.333 0ZM46.667 15a1.667 1.667 0 1 1-3.333 0 1.667 1.667 0 0 1 3.333 0ZM41.667 15a1.667 1.667 0 1 1-3.333 0 1.667 1.667 0 0 1 3.333 0Z"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M33.6 50.4c0 7.29-5.91 13.2-13.2 13.2-7.29 0-13.2-5.91-13.2-13.2 0-7.29 5.91-13.2 13.2-13.2 7.29 0 13.2 5.91 13.2 13.2Z"/>
+    <path class="tw-fill-illustration-tertiary" d="M30.3 50.4c0 5.468-4.432 9.9-9.9 9.9-5.467 0-9.9-4.432-9.9-9.9s4.433-9.9 9.9-9.9c5.468 0 9.9 4.432 9.9 9.9Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M20.4 58.716a8.316 8.316 0 1 0 0-16.632 8.316 8.316 0 0 0 0 16.632Zm0 1.584c5.468 0 9.9-4.432 9.9-9.9s-4.432-9.9-9.9-9.9c-5.467 0-9.9 4.432-9.9 9.9s4.433 9.9 9.9 9.9Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M19.575 46.275a.825.825 0 1 1 1.65 0v8.25a.825.825 0 0 1-1.65 0v-8.25Z"/>
+    <path class="tw-fill-illustration-outline" d="M24.525 49.575a.825.825 0 1 1 0 1.65h-8.25a.825.825 0 0 1 0-1.65h8.25Z"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M68.333 35c0 6.443-5.223 11.666-11.666 11.666C50.223 46.666 45 41.443 45 35c0-6.444 5.223-11.667 11.667-11.667 6.443 0 11.666 5.223 11.666 11.667Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M56.667 45.066c5.56 0 10.066-4.507 10.066-10.066 0-5.56-4.507-10.067-10.066-10.067C51.107 24.933 46.6 29.44 46.6 35c0 5.56 4.507 10.066 10.067 10.066Zm0 1.6c6.443 0 11.666-5.223 11.666-11.666 0-6.444-5.223-11.667-11.666-11.667C50.223 23.333 45 28.556 45 35c0 6.443 5.223 11.666 11.667 11.666Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M78.255 59.98A22.916 22.916 0 0 1 80 68.75c0 .69-.56 1.25-1.25 1.25H35.417c-.69 0-1.25-.56-1.25-1.25a22.916 22.916 0 0 1 44.088-8.77Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M78.397 68.4a21.317 21.317 0 0 0-42.628 0h42.628Zm1.603.35a22.916 22.916 0 0 0-45.833 0c0 .69.56 1.25 1.25 1.25H78.75c.69 0 1.25-.56 1.25-1.25Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/report-breach.icon.ts b/libs/assets/src/svg/svgs/report-breach.icon.ts
index 6e7fde74cbc..83dd6c72b82 100644
--- a/libs/assets/src/svg/svgs/report-breach.icon.ts
+++ b/libs/assets/src/svg/svgs/report-breach.icon.ts
@@ -1,14 +1,14 @@
 import { svgIcon } from "../icon-service";
 
 export const ReportBreach = svgIcon`
-  <svg width="58" height="75" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M39.569 74H13.007a7 7 0 0 1-7-7V31.077a7 7 0 0 1 7-7h19.101a7 7 0 0 1 4.988 2.088l7.46 7.576a7 7 0 0 1 2.013 4.912V67a7 7 0 0 1-7 7Z" fill="#175DDC" stroke="#fff" stroke-width="2" />
-    <path d="M44.576 69.055H18.015a7 7 0 0 1-7-7V26.132a7 7 0 0 1 7-7h19.1a7 7 0 0 1 4.988 2.088l7.46 7.576a7 7 0 0 1 2.013 4.911v28.348a7 7 0 0 1-7 7Z" fill="#175DDC" stroke="#fff" stroke-width="2" />
-    <path d="M50 63.698H23.439a7 7 0 0 1-7-7V20.775a7 7 0 0 1 7-7h19.1a7 7 0 0 1 4.988 2.088l7.46 7.575A7 7 0 0 1 57 28.35v28.348a7 7 0 0 1-7 7Z" fill="#175DDC" stroke="#fff" stroke-width="2" />
-    <path d="M44.648 13.599v3.95a8 8 0 0 0 8 8h4.518" stroke="#fff" stroke-width="2" />
-    <path stroke="#fff" stroke-width="2" stroke-linecap="round" d="M23.533 37.736H49.49M23.533 46.802H49.49M23.533 42.269H49.49M23.533 55.456H49.49M23.533 50.923H49.49" />
-    <path d="M1 16.483C1 7.944 8.013 1 16.69 1c8.678 0 15.691 6.944 15.691 15.483 0 8.54-7.013 15.484-15.69 15.484C8.012 31.967 1 25.023 1 16.484Z" fill="#518FFF" stroke="#fff" stroke-width="2" />
-    <path d="m16.562 7.979.1 11.538" stroke="#fff" stroke-width="2" stroke-linecap="round" />
-    <ellipse rx="1.252" ry="1.236" transform="rotate(-.479 2802.219 -1964.476) skewX(.012)" fill="#fff" />
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="11.6 3.33 56.67 73.33">
+    <path class="tw-fill-illustration-bg-secondary" d="M60 10a1.6 1.6 0 0 1 1.6 1.6v63.467a1.6 1.6 0 0 1-1.6 1.6H13.2a1.6 1.6 0 0 1-1.6-1.6V11.6a1.6 1.6 0 0 1 1.6-1.6H60Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M60 75.067V11.6H13.2v63.467H60ZM61.6 11.6A1.6 1.6 0 0 0 60 10H13.2a1.6 1.6 0 0 0-1.6 1.6v63.467a1.6 1.6 0 0 0 1.6 1.6H60a1.6 1.6 0 0 0 1.6-1.6V11.6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M68.266 68.4V4.933a1.6 1.6 0 0 0-1.6-1.6H31.012c-.425 0-.827.164-1.127.464L18.733 14.95c-.3.3-.467.706-.467 1.13V68.4a1.6 1.6 0 0 0 1.6 1.6h46.8a1.6 1.6 0 0 0 1.6-1.6Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M66.666 68.4V4.933H31.012L19.866 16.079V68.4h46.8Zm1.6-63.467V68.4a1.6 1.6 0 0 1-1.6 1.6h-46.8a1.6 1.6 0 0 1-1.6-1.6V16.08c0-.425.167-.83.467-1.13L29.885 3.796c.3-.3.702-.464 1.127-.464h35.654a1.6 1.6 0 0 1 1.6 1.6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M31.6 4.2a.8.8 0 0 1 .8.8v11.666a.8.8 0 0 1-.8.8H19.932a.8.8 0 0 1 0-1.6h10.866V4.999a.8.8 0 0 1 .8-.8Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M39.617 22.914c1.642-2.825 5.723-2.825 7.365 0l10.896 18.741c1.651 2.84-.397 6.401-3.682 6.401H32.403c-3.285 0-5.334-3.56-3.683-6.4l10.897-18.742Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M38.925 22.51c1.951-3.355 6.798-3.355 8.75 0L58.57 41.254c1.962 3.373-.472 7.603-4.374 7.603H32.403c-3.901 0-6.335-4.23-4.374-7.603L38.925 22.51Zm7.366.805c-1.334-2.295-4.648-2.295-5.982 0L29.412 42.057c-1.34 2.306.323 5.199 2.991 5.199h21.793c2.668 0 4.332-2.893 2.991-5.2L46.291 23.316Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M44.764 42.2a1.464 1.464 0 1 1-2.928 0 1.464 1.464 0 0 1 2.928 0ZM41.155 29.495a.426.426 0 0 1 .423-.472h3.444c.254 0 .45.22.424.472l-1.007 9.396a.426.426 0 0 1-.423.38h-1.43a.426.426 0 0 1-.424-.38l-.509-4.743-.498-4.653Z"/>
   </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/report-exposed-passwords.icon.ts b/libs/assets/src/svg/svgs/report-exposed-passwords.icon.ts
index 0a019885805..0309eb643d9 100644
--- a/libs/assets/src/svg/svgs/report-exposed-passwords.icon.ts
+++ b/libs/assets/src/svg/svgs/report-exposed-passwords.icon.ts
@@ -1,16 +1,32 @@
 import { svgIcon } from "../icon-service";
 
 export const ReportExposedPasswords = svgIcon`
-  <svg width="101" height="77" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M32.374 50.192a26.42 26.42 0 0 0 9.111 1.608c14.34 0 25.965-11.372 25.965-25.4 0-.337-.007-.673-.02-1.008h25.299v34.85H32.374v-10.05Z" fill="currentColor" />
-    <path d="M15.805 26.4c0 14.028 11.625 25.4 25.965 25.4s25.964-11.372 25.964-25.4C67.734 12.372 56.11 1 41.77 1 27.43 1 15.805 12.372 15.805 26.4Z" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
-    <path d="M27.914 47.849a1 1 0 0 0-2 0h2Zm68.288-26.792a2.12 2.12 0 0 1 2.14 2.11h2c0-2.253-1.83-4.11-4.14-4.11v2Zm2.14 2.11v40.552h2V23.167h-2Zm0 40.552c0 1.172-.958 2.11-2.14 2.11v2c2.25 0 4.14-1.798 4.14-4.11h-2Zm-2.14 2.11H30.054v2h66.148v-2Zm-66.148 0a2.12 2.12 0 0 1-2.14-2.11h-2a4.12 4.12 0 0 0 4.14 4.11v-2Zm-2.14-2.11V47.85h-2v15.87h2Zm39.254-42.662h29.034v-2H67.168v2Z" fill="#fff" />
-    <path d="M67.203 25.56h25.64v34.85H32.487V50.011" stroke="#fff" stroke-width="2" stroke-linejoin="round" />
-    <path d="M47.343 76h31.571" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
-    <path d="M57.557 66.83V76M67.771 66.83V76" stroke="#fff" stroke-width="2" stroke-linejoin="round" />
-    <path d="m20.995 42.873-3.972 3.972-14.61 14.61a3.413 3.413 0 0 0 0 4.826v0a3.413 3.413 0 0 0 4.827 0l14.61-14.61 3.972-3.972" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
-    <path d="M86.037 32.488H71.845M86.037 37.81H76.28M71.845 37.81h-6.652M86.037 43.132h-6.209M74.95 43.132H61.2M86.037 48.454H71.845M66.967 48.454h-7.54M86.037 53.776H66.08M61.201 53.776h-11.53M44.793 53.776h-7.096" stroke="#fff" stroke-width="2" stroke-linecap="round" />
-    <rect width="40.801" height="9.757" rx="4" transform="matrix(-1 0 0 1 61.201 14.748)" stroke="#fff" stroke-width="2" />
-    <path d="M16.852 33.375h28.375a4 4 0 0 1 4 4v1.757a4 4 0 0 1-4 4H22.174M66.523 33.375h-3.539a4 4 0 0 0-4 4v3.761c0 1.102.894 1.996 1.996 1.996v0" stroke="#fff" stroke-width="2" stroke-linecap="round" />
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0.7 2.4 79.3 77.2">
+    <path class="tw-fill-illustration-bg-primary" d="M17.6 26.8a4.8 4.8 0 0 1 4.8-4.8h52.8a4.8 4.8 0 0 1 4.8 4.8v33.6a4.8 4.8 0 0 1-4.8 4.8H22.4a4.8 4.8 0 0 1-4.8-4.8V26.8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M75.2 23.6H22.4a3.2 3.2 0 0 0-3.2 3.2v33.6a3.2 3.2 0 0 0 3.2 3.2h52.8a3.2 3.2 0 0 0 3.2-3.2V26.8a3.2 3.2 0 0 0-3.2-3.2ZM22.4 22a4.8 4.8 0 0 0-4.8 4.8v33.6a4.8 4.8 0 0 0 4.8 4.8h52.8a4.8 4.8 0 0 0 4.8-4.8V26.8a4.8 4.8 0 0 0-4.8-4.8H22.4Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M17.6 26.8H80v33.6H17.6V26.8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M78.4 28.4H19.2v30.4h59.2V28.4Zm-60.8-1.6v33.6H80V26.8H17.6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M41.6 64.4H56v14.4H41.6V64.4Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M40.8 63.6h16V78h6.4a.8.8 0 0 1 0 1.6H34.4a.8.8 0 0 1 0-1.6h6.4V63.6ZM42.4 78h12.8V65.2H42.4V78Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M42.4 65.2h12.8V70H42.4v-4.8Z"/>
+    <path class="tw-fill-illustration-tertiary" d="M56.8 43.6a8 8 0 1 1-16 0 8 8 0 0 1 16 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M48.8 50a6.4 6.4 0 1 0 0-12.8 6.4 6.4 0 0 0 0 12.8Zm0 1.6a8 8 0 1 0 0-16 8 8 0 0 0 0 16Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M11.496 20.793c0 10.158 8.235 18.392 18.393 18.392 10.158 0 18.392-8.234 18.392-18.392S40.047 2.4 29.89 2.4s-18.393 8.235-18.393 18.393Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M29.889 37.585c-9.274 0-16.793-7.518-16.793-16.792C13.096 11.519 20.614 4 29.89 4 39.163 4 46.68 11.52 46.68 20.793S39.163 37.585 29.89 37.585Zm0 1.6c-10.158 0-18.393-8.234-18.393-18.392S19.731 2.4 29.89 2.4c10.158 0 18.392 8.235 18.392 18.393 0 10.158-8.234 18.392-18.392 18.392Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M16.093 20.792c0 7.619 6.176 13.795 13.794 13.795 7.619 0 13.795-6.176 13.795-13.795 0-7.618-6.176-13.794-13.795-13.794-7.618 0-13.794 6.176-13.794 13.794Z"/>
+    <path class="tw-fill-illustration-outline" d="m1.197 47.71 15.356-14.503 1.84 1.84L3.889 50.402a1.6 1.6 0 0 1-2.294.032l-.43-.43a1.6 1.6 0 0 1 .032-2.295Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M22.402 18.041c.445 0 .806.36.806.806v2.232a.806.806 0 1 1-1.612 0v-2.232c0-.445.36-.806.806-.806Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M25.407 20.22a.794.794 0 0 1-.543.994l-2.232.638a.819.819 0 0 1-1.006-.55.793.793 0 0 1 .543-.995l2.232-.637a.819.819 0 0 1 1.006.55Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M24.465 23.968a.828.828 0 0 1-1.134-.204l-1.594-2.232a.785.785 0 0 1 .195-1.11.828.828 0 0 1 1.134.204l1.595 2.232c.259.363.171.86-.196 1.11Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M19.395 20.22a.794.794 0 0 0 .544.994l2.231.638a.819.819 0 0 0 1.007-.551.793.793 0 0 0-.543-.994l-2.232-.637a.819.819 0 0 0-1.007.55Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M20.338 23.968a.828.828 0 0 0 1.134-.204l1.594-2.232a.785.785 0 0 0-.195-1.11.828.828 0 0 0-1.135.204l-1.594 2.232a.785.785 0 0 0 .196 1.11ZM29.954 18.041c.446 0 .807.36.807.806v2.232a.806.806 0 1 1-1.613 0v-2.232c0-.445.361-.806.806-.806Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M32.96 20.22a.793.793 0 0 1-.543.994l-2.232.638a.819.819 0 0 1-1.006-.55.794.794 0 0 1 .543-.995l2.231-.637a.819.819 0 0 1 1.007.55Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M32.018 23.968a.828.828 0 0 1-1.135-.204l-1.594-2.232a.785.785 0 0 1 .196-1.11.828.828 0 0 1 1.134.204l1.594 2.232c.26.363.172.86-.195 1.11Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M26.948 20.22a.793.793 0 0 0 .543.994l2.232.638a.82.82 0 0 0 1.006-.551.794.794 0 0 0-.543-.994l-2.231-.637a.819.819 0 0 0-1.007.55Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M27.89 23.968a.828.828 0 0 0 1.135-.204l1.594-2.232a.785.785 0 0 0-.195-1.11.828.828 0 0 0-1.135.204l-1.594 2.232a.785.785 0 0 0 .195 1.11ZM37.505 18.041c.445 0 .806.36.806.806v2.232a.806.806 0 1 1-1.612 0v-2.232c0-.445.361-.806.806-.806Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M40.513 20.22a.793.793 0 0 1-.543.994l-2.232.638a.819.819 0 0 1-1.007-.55.793.793 0 0 1 .543-.995l2.232-.637a.819.819 0 0 1 1.007.55Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M39.569 23.968a.828.828 0 0 1-1.135-.204l-1.594-2.232a.785.785 0 0 1 .195-1.11.828.828 0 0 1 1.135.204l1.594 2.232c.26.363.172.86-.195 1.11Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M34.5 20.22a.793.793 0 0 0 .542.994l2.232.638a.82.82 0 0 0 1.006-.551.794.794 0 0 0-.543-.994l-2.232-.637a.819.819 0 0 0-1.006.55Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M35.443 23.968a.828.828 0 0 0 1.135-.204l1.594-2.232a.785.785 0 0 0-.196-1.11.828.828 0 0 0-1.134.204l-1.594 2.232a.785.785 0 0 0 .195 1.11Z" clip-rule="evenodd"/>
   </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/report-inactive-two-factor.icon.ts b/libs/assets/src/svg/svgs/report-inactive-two-factor.icon.ts
deleted file mode 100644
index d7ad3c9084c..00000000000
--- a/libs/assets/src/svg/svgs/report-inactive-two-factor.icon.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const ReportInactiveTwoFactor = svgIcon`
-  <svg width="42" height="75" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill="currentColor" stroke="#fff" stroke-width="2" d="M1 13.121h39.595v48.758H1z" />
-    <rect x="1" y="1" width="39.595" height="73" rx="8" stroke="#fff" stroke-width="2" />
-    <path stroke="#fff" stroke-width="2" stroke-linecap="round" d="M12.344 8.091h16.907M18.907 67.424h3.025M31.503 32.515c-2.047-4.337-6.717-7.061-11.73-6.414a11.356 11.356 0 0 0-9.125 7.126M10.816 42.016c2.047 4.337 6.718 7.062 11.73 6.414 4.346-.562 7.8-3.51 9.213-7.358" />
-    <path d="m33.584 29.293-1.295 4.625-4.625-1.295M8.523 44.725l1.441-4.581 4.582 1.441" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
-  </svg>
-`;
diff --git a/libs/assets/src/svg/svgs/report-member-access.icon.ts b/libs/assets/src/svg/svgs/report-member-access.icon.ts
deleted file mode 100644
index c47fed9cd2a..00000000000
--- a/libs/assets/src/svg/svgs/report-member-access.icon.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const MemberAccess = svgIcon`
-    <svg width="94" height="63" viewBox="0 0 94 63" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path d="M70 10H2V46H12.3227H12.6806H46.2498H70V18.1286V10Z" fill="#518FFF"/>
-        <path d="M65.7419 1H6C3.23858 1 1 3.23858 1 6V42.2581C1 45.0195 3.23857 47.2581 6 47.2581H12.2835H12.6401H46.0818H65.7419C68.5034 47.2581 70.7419 45.0195 70.7419 42.2581V11.9933V6C70.7419 3.23858 68.5034 1 65.7419 1Z" stroke="white" stroke-width="2"/>
-        <circle cx="70.129" cy="27.0968" r="13.0968" fill="#175DDC" stroke="white" stroke-width="2"/>
-        <path d="M88.9315 61.8708C73.6363 61.8708 66.0989 61.8708 50.4248 61.8708C48.57 61.8708 47.8031 59.945 48.0426 58.4704C49.725 48.1136 58.9691 40.1934 70.1207 40.1934C81.2722 40.1934 90.5164 48.1136 92.1988 58.4704C92.5526 60.6485 91.3052 61.8708 88.9315 61.8708Z" fill="#175DDC" stroke="white" stroke-width="2"/>
-        <path d="M55.7419 5.61292V5.1613" stroke="white" stroke-width="2" stroke-linecap="round"/>
-        <path d="M59.8064 5.61292V5.1613" stroke="white" stroke-width="2" stroke-linecap="round"/>
-        <path d="M63.871 5.61292V5.1613" stroke="white" stroke-width="2" stroke-linecap="round"/>
-        <line x1="2" y1="9" x2="69.7419" y2="9" stroke="white" stroke-width="2"/>
-    </svg>
-`;
diff --git a/libs/assets/src/svg/svgs/report-reused-passwords.icon.ts b/libs/assets/src/svg/svgs/report-reused-passwords.icon.ts
deleted file mode 100644
index 30aaeee80fa..00000000000
--- a/libs/assets/src/svg/svgs/report-reused-passwords.icon.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const ReportReusedPasswords = svgIcon`
-  <svg width="102" height="102" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M57.983 15.06a35.664 35.664 0 0 1 14.531 6.27c16.164 11.78 19.585 34.613 7.643 51a37.227 37.227 0 0 1-6.81 7.138m-32.842 6.697a35.708 35.708 0 0 1-11.239-5.495c-16.163-11.78-19.585-34.613-7.642-51a37.55 37.55 0 0 1 3.295-3.929" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
-    <path d="M93.909 64.598H7.72c-.708 0-1.275-.662-1.275-1.49V40.273c0-.828.567-1.49 1.275-1.49H93.91c.708 0 1.275.663 1.275 1.49v22.837c.047.827-.567 1.49-1.275 1.49Z" fill="currentColor" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
-    <path d="M21.532 52.186v-5.965M21.532 52.187l5.748-1.844M21.532 52.186l3.524 4.881M21.531 52.186l-3.47 4.881M21.532 52.187l-5.694-1.844M40.944 52.186v-5.965M40.944 52.187l5.694-1.844M40.944 52.187l3.525 4.88M40.944 52.187l-3.525 4.88M40.944 52.187l-5.694-1.844M54.849 57.337h11.294M74.21 57.337h11.295M41.75 83l.71 4.75-4.75.71M58.664 18.66 56 14.665 59.996 12" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
-  </svg>
-`;
diff --git a/libs/assets/src/svg/svgs/report-unsecured-websites.icon.ts b/libs/assets/src/svg/svgs/report-unsecured-websites.icon.ts
index d55c06987ca..487381ccaa9 100644
--- a/libs/assets/src/svg/svgs/report-unsecured-websites.icon.ts
+++ b/libs/assets/src/svg/svgs/report-unsecured-websites.icon.ts
@@ -1,12 +1,15 @@
 import { svgIcon } from "../icon-service";
 
 export const ReportUnsecuredWebsites = svgIcon`
-  <svg width="113" height="76" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M1.71 12.983h110.362v55.11a6 6 0 0 1-6 6H7.711a6 6 0 0 1-6-6v-55.11Z" fill="currentColor" />
-    <rect x="1" y="1.073" width="110.5" height="73.454" rx="9" stroke="#fff" stroke-width="2" />
-    <path d="M89.48 8.048V7.47M96.363 8.048V7.47M103.246 8.048V7.47" stroke="#fff" stroke-width="4" stroke-linecap="round" />
-    <path d="M0 12.983h111.217" stroke="#fff" stroke-width="2" />
-    <path d="m93.236 44.384-18.42-11.026 2.93 21.266 5.582-5.237 4.27 6.46 2.98-1.971-4.26-6.446 6.918-3.046Z" fill="#175DDC" stroke="#fff" stroke-width="2" stroke-linejoin="round" />
-    <rect width="96.673" height="6.886" rx="3.443" transform="matrix(-1 0 0 1 104.373 18.721)" stroke="#fff" />
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0.4 10.07 79.2 60">
+    <path class="tw-fill-illustration-bg-primary" d="M.4 14.872a4.8 4.8 0 0 1 4.8-4.8h69.6a4.8 4.8 0 0 1 4.8 4.8v50.4a4.8 4.8 0 0 1-4.8 4.8H5.2a4.8 4.8 0 0 1-4.8-4.8v-50.4Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M74.8 11.672H5.2a3.2 3.2 0 0 0-3.2 3.2v50.4a3.2 3.2 0 0 0 3.2 3.2h69.6a3.2 3.2 0 0 0 3.2-3.2v-50.4a3.2 3.2 0 0 0-3.2-3.2Zm-69.6-1.6a4.8 4.8 0 0 0-4.8 4.8v50.4a4.8 4.8 0 0 0 4.8 4.8h69.6a4.8 4.8 0 0 0 4.8-4.8v-50.4a4.8 4.8 0 0 0-4.8-4.8H5.2Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M79.6 24.166H.4v-1.6h79.2v1.6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M75.176 17.323a2.415 2.415 0 0 1-2.412 2.417 2.415 2.415 0 0 1-2.412-2.417 2.415 2.415 0 0 1 2.412-2.417 2.415 2.415 0 0 1 2.412 2.417ZM67.94 17.323a2.415 2.415 0 0 1-2.413 2.417 2.415 2.415 0 0 1-2.412-2.417 2.415 2.415 0 0 1 2.412-2.417 2.415 2.415 0 0 1 2.412 2.417ZM60.705 17.323a2.415 2.415 0 0 1-2.412 2.417 2.415 2.415 0 0 1-2.412-2.417 2.415 2.415 0 0 1 2.412-2.417 2.415 2.415 0 0 1 2.412 2.417Z"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M40.104 65.54c10.696 0 19.367-8.67 19.367-19.367 0-10.696-8.671-19.367-19.367-19.367-10.697 0-19.368 8.67-19.368 19.367 0 10.696 8.671 19.367 19.368 19.367Zm-9.705-26.63a2.4 2.4 0 0 0-2.4 2.4v14.568a2.4 2.4 0 0 0 2.4 2.4h19.41a2.4 2.4 0 0 0 2.4-2.4V41.31a2.4 2.4 0 0 0-2.4-2.4h-19.41Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M28 41.31a2.4 2.4 0 0 1 2.4-2.4h19.41a2.4 2.4 0 0 1 2.4 2.4v14.568a2.4 2.4 0 0 1-2.4 2.4H30.4a2.4 2.4 0 0 1-2.4-2.4V41.31Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M49.81 40.51H30.4a.8.8 0 0 0-.8.8v14.568a.8.8 0 0 0 .8.8h19.41a.8.8 0 0 0 .8-.8V41.31a.8.8 0 0 0-.8-.8Zm-19.41-1.6a2.4 2.4 0 0 0-2.4 2.4v14.568a2.4 2.4 0 0 0 2.4 2.4h19.41a2.4 2.4 0 0 0 2.4-2.4V41.31a2.4 2.4 0 0 0-2.4-2.4H30.4Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M38.895 46.172a1.21 1.21 0 0 1 2.42 0v4.842a1.21 1.21 0 0 1-2.42 0v-4.842Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M34.928 39.108a5.642 5.642 0 0 1 9.772-5.642l.605 1.048a.8.8 0 1 1-1.385.8l-.605-1.048a4.042 4.042 0 0 0-7.001 4.042l.605 1.048a.8.8 0 0 1-1.385.8l-.606-1.048Z" clip-rule="evenodd"/>
   </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/report-weak-passwords.icon.ts b/libs/assets/src/svg/svgs/report-weak-passwords.icon.ts
deleted file mode 100644
index 9709255169b..00000000000
--- a/libs/assets/src/svg/svgs/report-weak-passwords.icon.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const ReportWeakPasswords = svgIcon`
-  <svg width="78" height="78" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M66.493 64.415V77H9.979V64.324M9.979 44.065V32.106h56.514v12.148" stroke="#fff" stroke-width="2" stroke-linejoin="round" />
-    <path d="M75.44 64.852H2.085c-.603 0-1.085-.555-1.085-1.25V44.448c0-.694.482-1.25 1.085-1.25H75.44c.603 0 1.085.556 1.085 1.25v19.156c.04.694-.482 1.25-1.085 1.25Z" fill="currentColor" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
-    <path d="M13.84 54.56v-5.077M13.84 54.56l4.893-1.57M13.84 54.56l3 4.153M13.84 54.56l-2.954 4.153M13.84 54.56l-4.846-1.57M30.363 54.56v-5.077M30.363 54.56l4.846-1.57M30.363 54.56l3 4.153M30.363 54.56l-3 4.153M30.363 54.56l-4.846-1.57M42.197 59.042h9.506M58.57 59.042h9.507" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
-    <path d="M20.863 31.364c-.274-5.285 0-15.817 1.093-18.863 1.276-3.554 6.233-10.826 15.856-11.482 4.83-.273 15.2 2.296 18.043 14.763" stroke="#fff" stroke-width="2" />
-  </svg>
-`;
diff --git a/libs/assets/src/svg/svgs/restricted-view.ts b/libs/assets/src/svg/svgs/restricted-view.ts
index afe6c752870..5eec1a4a972 100644
--- a/libs/assets/src/svg/svgs/restricted-view.ts
+++ b/libs/assets/src/svg/svgs/restricted-view.ts
@@ -1,6 +1,19 @@
 import { svgIcon } from "../icon-service";
 
-export const RestrictedView = svgIcon`<svg xmlns="http://www.w3.org/2000/svg" width="120" height="120" viewBox="10 -10 120 140" fill="none">
-  <rect class="tw-stroke-secondary-600" width="134" height="86" x="3" y="31.485" stroke-width="6" rx="11"/>
-  <path class="tw-fill-secondary-600" d="M123.987 20.15H14.779a3.114 3.114 0 0 1-2.083-.95 3.036 3.036 0 0 1 0-4.208 3.125 3.125 0 0 1 2.083-.951h109.208c.792.043 1.536.38 2.083.95a3.035 3.035 0 0 1 0 4.208 3.115 3.115 0 0 1-2.083.95Zm-6.649-14.041h-95.91a3.114 3.114 0 0 1-2.082-.95 3.036 3.036 0 0 1-.848-2.105c0-.782.306-1.538.848-2.104A3.125 3.125 0 0 1 21.43 0h95.909c.791.043 1.535.38 2.082.95.547.57.849 1.322.849 2.104a3.05 3.05 0 0 1-.849 2.104 3.115 3.115 0 0 1-2.082.95ZM95.132 74.407A42.317 42.317 0 0 0 83.59 65.43l8.799-8.657a1.59 1.59 0 0 0 .004-2.27 1.641 1.641 0 0 0-2.298-.004l-9.64 9.479a28.017 28.017 0 0 0-10.483-2.13c-14.323 0-24.814 12.342-25.298 12.89a2.431 2.431 0 0 0-.675 1.64c-.01.612.215 1.203.626 1.66a43.981 43.981 0 0 0 11.873 9.485l-8.806 8.658a1.601 1.601 0 0 0-.499 1.138 1.602 1.602 0 0 0 1.008 1.5 1.651 1.651 0 0 0 1.255-.009c.199-.085.379-.205.528-.359l9.634-9.443a27.16 27.16 0 0 0 10.359 2.158c14.323 0 24.753-12.086 25.23-12.63a2.983 2.983 0 0 0-.078-4.128h.002ZM49.204 77.82a1.82 1.82 0 0 1-.43-.6 1.767 1.767 0 0 1-.152-.72 1.778 1.778 0 0 1 .582-1.32c3.857-3.564 11.782-9.686 20.77-9.676 2.564.037 5.105.508 7.508 1.395l-3.291 3.235a7.793 7.793 0 0 0-5.02-1.226 7.746 7.746 0 0 0-4.676 2.18 7.528 7.528 0 0 0-1 9.563l-4.199 4.143a43.135 43.135 0 0 1-10.092-6.974Zm26.059-1.318a5.19 5.19 0 0 1-1.557 3.68 5.326 5.326 0 0 1-3.733 1.521c-.82-.005-1.63-.2-2.359-.57l7.067-6.952c.377.718.575 1.513.582 2.321Zm-10.58 0a5.136 5.136 0 0 1 .673-2.555 5.204 5.204 0 0 1 1.862-1.897 5.302 5.302 0 0 1 5.172-.146l-7.096 6.977a5.06 5.06 0 0 1-.61-2.379Zm26.053 1.331c-3.857 3.56-11.779 9.677-20.763 9.677a22.723 22.723 0 0 1-7.454-1.369l3.292-3.226a7.793 7.793 0 0 0 4.995 1.192 7.734 7.734 0 0 0 4.642-2.176 7.524 7.524 0 0 0 1.033-9.506l4.224-4.168a43.258 43.258 0 0 1 10.02 6.945 1.788 1.788 0 0 1 .585 1.313 1.788 1.788 0 0 1-.577 1.318h.003Z"/>
-</svg>`;
+export const RestrictedView = svgIcon`
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="5.52 2.62 110 110">
+    <path class="tw-fill-illustration-bg-secondary" d="M25.518 12.621c0-5.523 4.477-10 10-10h50c5.523 0 10 4.477 10 10v2.5h-70v-2.5Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M85.518 5.121h-50a7.5 7.5 0 0 0-7.5 7.5h65a7.5 7.5 0 0 0-7.5-7.5Zm-50-2.5c-5.523 0-10 4.477-10 10v2.5h70v-2.5c0-5.523-4.477-10-10-10h-50Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M15.518 22.621c0-5.523 4.477-10 10-10h70c5.523 0 10 4.477 10 10v2.5h-90v-2.5Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M95.518 15.121h-70a7.5 7.5 0 0 0-7.5 7.5h85a7.5 7.5 0 0 0-7.5-7.5Zm-70-2.5c-5.523 0-10 4.477-10 10v2.5h90v-2.5c0-5.523-4.477-10-10-10h-70Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M5.518 32.621c0-5.523 4.477-10 10-10h90c5.523 0 10 4.477 10 10v70c0 5.523-4.477 10-10 10h-90c-5.523 0-10-4.477-10-10v-70Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M105.518 25.121h-90a7.5 7.5 0 0 0-7.5 7.5v70a7.5 7.5 0 0 0 7.5 7.5h90a7.5 7.5 0 0 0 7.5-7.5v-70a7.5 7.5 0 0 0-7.5-7.5Zm-90-2.5c-5.523 0-10 4.477-10 10v70c0 5.523 4.477 10 10 10h90c5.523 0 10-4.477 10-10v-70c0-5.523-4.477-10-10-10h-90Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M95.518 67.621c0 19.33-15.67 35-35 35s-35-15.67-35-35 15.67-35 35-35 35 15.67 35 35Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M60.518 100.121c17.95 0 32.5-14.55 32.5-32.5s-14.55-32.5-32.5-32.5-32.5 14.55-32.5 32.5 14.55 32.5 32.5 32.5Zm0 2.5c19.33 0 35-15.67 35-35s-15.67-35-35-35-35 15.67-35 35 15.67 35 35 35Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="m41.092 59.482-6.328 6.378a2.5 2.5 0 0 0 0 3.522l6.328 6.378a27.362 27.362 0 0 0 19.426 8.111 27.362 27.362 0 0 0 19.425-8.11l6.328-6.38a2.5 2.5 0 0 0 0-3.52l-6.328-6.379a27.362 27.362 0 0 0-19.425-8.11 27.362 27.362 0 0 0-19.426 8.11Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="m42.867 61.243-6.328 6.378L42.867 74a24.862 24.862 0 0 0 17.65 7.371c6.617 0 12.967-2.65 17.652-7.371l6.327-6.379-6.327-6.378a24.862 24.862 0 0 0-17.651-7.372 24.862 24.862 0 0 0-17.651 7.372Zm-8.102 4.617 6.327-6.378a27.362 27.362 0 0 1 19.426-8.11 27.362 27.362 0 0 1 19.425 8.11l6.328 6.378a2.5 2.5 0 0 1 0 3.522l-6.328 6.378a27.362 27.362 0 0 1-19.425 8.111 27.362 27.362 0 0 1-19.426-8.11l-6.328-6.38a2.5 2.5 0 0 1 0-3.52Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M71.768 67.621c0 6.213-5.037 11.25-11.25 11.25s-11.25-5.037-11.25-11.25 5.037-11.25 11.25-11.25 11.25 5.037 11.25 11.25Z"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M68.018 67.621a7.5 7.5 0 1 1-15 0 7.5 7.5 0 0 1 15 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M42.134 49.237a1.25 1.25 0 0 1 1.768 0l35 35a1.25 1.25 0 1 1-1.768 1.768l-35-35a1.25 1.25 0 0 1 0-1.768Z" clip-rule="evenodd"/>
+  </svg>
+`;
diff --git a/libs/assets/src/svg/svgs/search.ts b/libs/assets/src/svg/svgs/search.ts
deleted file mode 100644
index 40f323acf3e..00000000000
--- a/libs/assets/src/svg/svgs/search.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const Search = svgIcon`
-<svg width="120" height="120" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <g opacity=".49">
-    <path class="tw-fill-secondary-300" fill-rule="evenodd" clip-rule="evenodd" d="M40.36 73.256a30.004 30.004 0 0 0 10.346 1.826c16.282 0 29.482-12.912 29.482-28.84 0-.384-.008-.766-.023-1.145h28.726v39.57H40.36v-11.41Z" />
-    <path class="tw-stroke-secondary-600" d="M21.546 46.241c0 15.929 13.2 28.841 29.482 28.841S80.51 62.17 80.51 46.241c0-15.928-13.2-28.841-29.482-28.841S21.546 30.313 21.546 46.241Z" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" />
-    <path class="tw-fill-secondary-600" d="M35.36 70.595a1.2 1.2 0 0 0-2.4 0h2.4Zm77.475-30.356a2.343 2.343 0 0 1 2.365 2.33h2.4c0-2.593-2.107-4.73-4.765-4.73v2.4Zm2.365 2.33v46.047h2.4V42.57h-2.4Zm0 46.047c0 1.293-1.058 2.33-2.365 2.33v2.4c2.59 0 4.765-2.069 4.765-4.73h-2.4Zm-2.365 2.33h-75.11v2.4h75.11v-2.4Zm-75.11 0a2.343 2.343 0 0 1-2.365-2.33h-2.4c0 2.594 2.107 4.73 4.766 4.73v-2.4Zm-2.365-2.33v-18.02h-2.4v18.02h2.4Zm44.508-48.377h32.967v-2.4H79.868v2.4Z" />
-    <path class="tw-stroke-secondary-600" d="M79.907 45.287h29.114v39.57H40.487V73.051" stroke-width="2" stroke-linejoin="round" />
-    <path class="tw-stroke-secondary-600" d="M57.356 102.56h35.849" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" />
-    <path class="tw-stroke-secondary-600" d="M68.954 92.147v10.413m11.599-10.413v10.413" stroke-width="4" stroke-linejoin="round" />
-    <path class="tw-stroke-secondary-600" d="m27.44 64.945-4.51 4.51L5.72 86.663a3 3 0 0 0 0 4.243l1.238 1.238a3 3 0 0 0 4.243 0L28.41 74.936l4.51-4.51" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" />
-    <path class="tw-stroke-secondary-600" d="M101.293 53.154H85.178m16.115 6.043H90.214m-5.036 0h-7.553m23.668 6.043h-7.05m-5.54 0h-15.61m28.2 6.042H85.178m-5.538 0h-8.562m30.215 6.043H78.632m-5.539 0H60m-5.54 0h-8.057" stroke-width="2" stroke-linecap="round" />
-    <path class="tw-stroke-secondary-600" d="M29.164 33.01h41.529a2.4 2.4 0 0 1 2.4 2.4v6.28a2.4 2.4 0 0 1-2.4 2.4h-41.53a2.4 2.4 0 0 1-2.4-2.4v-6.28a2.4 2.4 0 0 1 2.4-2.4Z" stroke-width="4" />
-    <path class="tw-stroke-secondary-600" d="M22.735 54.16h34.361a2.4 2.4 0 0 1 2.4 2.4v6.28a2.4 2.4 0 0 1-2.4 2.4H28.778m50.358-11.08h-6.161a2.4 2.4 0 0 0-2.4 2.4v6.414a2.266 2.266 0 0 0 2.266 2.265" stroke-width="4" stroke-linecap="round" />
-  </g>
-</svg>
-`;
diff --git a/libs/assets/src/svg/svgs/secrets-manager.ts b/libs/assets/src/svg/svgs/secrets-manager.ts
index 3a5095b95bd..27589e7e2f9 100644
--- a/libs/assets/src/svg/svgs/secrets-manager.ts
+++ b/libs/assets/src/svg/svgs/secrets-manager.ts
@@ -1,7 +1,17 @@
 import { svgIcon } from "../icon-service";
 
 const SecretsManagerLogo = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" width="200" height="49" fill="none"><g class="tw-fill-text-alt2" clip-path="url(#secrets-manager-logo-clip)"><path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/><path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM195.307 44.875v-7.739h1.118l.088 1.413a2.7 2.7 0 0 1 .691-.883 2.854 2.854 0 0 1 1.03-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.294 0-.579.039-.853.117a2.168 2.168 0 0 0-.75.383 1.81 1.81 0 0 0-.515.72c-.128.305-.192.687-.192 1.148v4.252h-1.235ZM190.181 45.051c-.686 0-1.294-.166-1.824-.5-.53-.334-.946-.804-1.25-1.412-.295-.608-.442-1.32-.442-2.133 0-.815.147-1.526.442-2.134.304-.608.72-1.078 1.25-1.412.539-.333 1.157-.5 1.854-.5.745 0 1.368.167 1.868.5.5.334.878.78 1.133 1.339.255.559.382 1.172.382 1.839v.294c0 .098-.005.216-.015.353h-5.987v-.956h4.796c-.02-.755-.24-1.33-.662-1.721-.412-.402-.927-.603-1.545-.603-.412 0-.794.102-1.147.308a2.21 2.21 0 0 0-.839.883c-.216.392-.324.883-.324 1.471v.412c0 .647.108 1.192.324 1.633.216.432.495.755.839.971.353.216.735.324 1.147.324.549 0 .981-.103 1.295-.31.314-.215.544-.52.691-.911h1.221a2.944 2.944 0 0 1-.618 1.162 2.933 2.933 0 0 1-1.088.809c-.432.196-.932.294-1.501.294ZM181.83 48.288c-.696 0-1.309-.089-1.839-.265-.52-.167-.927-.427-1.221-.78-.284-.353-.426-.79-.426-1.31 0-.244.044-.5.132-.764.098-.265.26-.52.485-.765.236-.245.564-.466.986-.662l.942.5c-.559.216-.922.466-1.089.75-.167.285-.25.56-.25.824 0 .324.093.593.279.81.196.215.466.377.809.485.344.108.741.162 1.192.162.441 0 .819-.06 1.133-.177.324-.108.569-.27.735-.485.177-.206.265-.452.265-.736 0-.412-.132-.736-.397-.97-.265-.227-.78-.359-1.545-.398a14.968 14.968 0 0 1-1.5-.162 6.937 6.937 0 0 1-1.001-.235 3.324 3.324 0 0 1-.647-.324 4.326 4.326 0 0 1-.456-.368v-.338l1.456-1.398 1.163.383-1.589 1.31.191-.56c.108.079.211.152.309.22.098.07.231.133.397.192a7 7 0 0 0 .721.147c.314.05.726.093 1.236.133.706.049 1.27.166 1.692.353.421.186.725.446.912.78.186.323.279.72.279 1.19 0 .413-.117.805-.353 1.178-.225.372-.588.676-1.088.912-.491.245-1.128.368-1.913.368Zm-.015-5.826c-.627 0-1.162-.118-1.603-.353a2.507 2.507 0 0 1-.986-.986 2.953 2.953 0 0 1-.338-1.412c0-.52.113-.986.338-1.398.236-.412.569-.74 1.001-.985.441-.245.971-.368 1.588-.368.638 0 1.172.123 1.604.368.431.245.76.573.986.985.225.412.338.878.338 1.398 0 .52-.113.99-.338 1.412-.226.412-.555.74-.986.986-.432.235-.966.353-1.604.353Zm0-1.015c.55 0 .976-.142 1.28-.427.304-.294.456-.73.456-1.309s-.152-1.01-.456-1.295c-.304-.284-.73-.426-1.28-.426-.519 0-.946.142-1.28.426-.323.285-.485.716-.485 1.295s.157 1.015.471 1.31c.323.284.755.426 1.294.426Zm1.295-3.266-.368-1.044h3.031v.926l-2.663.118ZM173.109 45.051c-.588 0-1.078-.108-1.471-.324a2.245 2.245 0 0 1-.882-.882 2.513 2.513 0 0 1-.295-1.192c0-.51.128-.941.383-1.294.265-.363.633-.638 1.103-.824.471-.186 1.02-.28 1.648-.28h1.927c0-.5-.059-.917-.176-1.25-.118-.334-.309-.584-.574-.75-.265-.167-.618-.25-1.059-.25-.442 0-.819.112-1.133.338-.314.216-.51.54-.589.97h-1.265c.059-.51.231-.936.515-1.28a2.643 2.643 0 0 1 1.074-.794c.441-.186.907-.279 1.398-.279.696 0 1.27.127 1.721.383a2.29 2.29 0 0 1 1 1.044c.216.441.324.966.324 1.574v4.914h-1.103l-.074-1.324a2.743 2.743 0 0 1-.383.588 2.452 2.452 0 0 1-.529.47 2.586 2.586 0 0 1-.706.325c-.255.078-.54.117-.854.117Zm.177-1.044c.324 0 .623-.074.897-.221.275-.147.51-.343.707-.588.205-.255.362-.54.47-.854.108-.313.162-.642.162-.985v-.148h-1.824c-.461 0-.839.06-1.133.177-.284.118-.49.285-.618.5a1.318 1.318 0 0 0-.191.706c0 .285.059.535.177.75.117.207.289.368.514.486.236.118.515.177.839.177ZM162.192 44.875v-7.739h1.118l.059 1.221c.225-.44.549-.784.971-1.03.431-.244.926-.367 1.486-.367.568 0 1.064.108 1.485.324.422.215.751.544.986.985.235.442.353 1 .353 1.677v4.929h-1.236v-4.796c0-.687-.171-1.202-.515-1.545-.333-.343-.784-.515-1.353-.515-.382 0-.736.093-1.059.28a1.96 1.96 0 0 0-.78.794c-.186.353-.279.785-.279 1.295v4.487h-1.236ZM156.502 45.051c-.589 0-1.079-.108-1.471-.324a2.241 2.241 0 0 1-.883-.882 2.523 2.523 0 0 1-.294-1.192c0-.51.127-.941.382-1.294.265-.363.633-.638 1.104-.824.47-.186 1.02-.28 1.647-.28h1.927c0-.5-.058-.917-.176-1.25-.118-.334-.309-.584-.574-.75-.265-.167-.618-.25-1.059-.25-.441 0-.819.112-1.133.338-.314.216-.51.54-.588.97h-1.265c.058-.51.23-.936.514-1.28a2.643 2.643 0 0 1 1.074-.794c.442-.186.908-.279 1.398-.279.696 0 1.27.127 1.721.383.451.245.785.593 1.001 1.044.215.441.323.966.323 1.574v4.914h-1.103l-.074-1.324a2.738 2.738 0 0 1-.382.588 2.457 2.457 0 0 1-.53.47 2.586 2.586 0 0 1-.706.325 2.89 2.89 0 0 1-.853.117Zm.176-1.044c.324 0 .623-.074.898-.221a2.27 2.27 0 0 0 .706-.588c.206-.255.363-.54.471-.854.108-.313.161-.642.161-.985v-.148h-1.824c-.461 0-.838.06-1.133.177-.284.118-.49.285-.617.5a1.31 1.31 0 0 0-.192.706c0 .285.059.535.177.75.118.207.289.368.515.486.235.118.515.177.838.177ZM142.038 44.875V34.577h1.441l3.502 7.253 3.472-7.253h1.456v10.298h-1.236v-8.077l-3.236 6.723h-.927l-3.237-6.664v8.018h-1.235ZM133.309 45.051c-.697 0-1.275-.103-1.736-.309-.451-.215-.795-.51-1.03-.882a3.064 3.064 0 0 1-.427-1.324h1.266c.039.264.127.51.264.735.148.216.358.392.633.53.275.137.623.206 1.045.206.333 0 .617-.05.853-.147.235-.108.412-.255.529-.442.128-.186.192-.402.192-.647 0-.324-.074-.574-.221-.75-.137-.187-.343-.324-.618-.412a4.496 4.496 0 0 0-1-.22 6.687 6.687 0 0 1-1.148-.251 2.894 2.894 0 0 1-.853-.427 1.708 1.708 0 0 1-.515-.662 2.3 2.3 0 0 1-.176-.941c0-.422.112-.795.338-1.118.225-.324.544-.574.956-.75.422-.187.917-.28 1.486-.28.834 0 1.491.191 1.971.574.491.382.78.927.868 1.633h-1.221a1.209 1.209 0 0 0-.5-.854c-.284-.206-.662-.309-1.133-.309-.5 0-.877.094-1.132.28a.87.87 0 0 0-.383.736c0 .225.054.431.162.617.118.177.314.329.588.456.275.118.643.206 1.104.265.578.069 1.069.182 1.471.339.402.147.706.377.912.691.216.314.319.74.309 1.28 0 .51-.123.941-.368 1.295a2.228 2.228 0 0 1-1 .809c-.422.186-.917.28-1.486.28ZM127.538 44.875c-.441 0-.824-.069-1.147-.206a1.506 1.506 0 0 1-.75-.692c-.167-.333-.251-.78-.251-1.338V38.18h-1.353v-1.044h1.353l.162-1.928h1.074v1.927h2.192v1.045h-2.192v4.458c0 .46.093.774.28.941.186.157.515.236.985.236h.898v1.059h-1.251ZM119.656 45.051c-.687 0-1.295-.166-1.824-.5-.53-.334-.947-.804-1.251-1.412-.294-.608-.441-1.32-.441-2.133 0-.815.147-1.526.441-2.134.304-.608.721-1.078 1.251-1.412.539-.333 1.157-.5 1.853-.5.746 0 1.368.167 1.869.5.5.334.877.78 1.132 1.339.255.559.383 1.172.383 1.839v.294c0 .098-.005.216-.015.353h-5.987v-.956h4.796c-.02-.755-.241-1.33-.662-1.721-.412-.402-.927-.603-1.545-.603a2.214 2.214 0 0 0-1.986 1.192c-.216.391-.324.882-.324 1.47v.412c0 .647.108 1.192.324 1.633.216.432.495.755.838.971.353.216.736.324 1.148.324.549 0 .981-.103 1.294-.31.314-.215.545-.52.692-.911h1.221a2.97 2.97 0 0 1-.618 1.162 2.929 2.929 0 0 1-1.089.809c-.431.196-.931.294-1.5.294ZM110.99 44.875v-7.739h1.118l.088 1.413c.176-.353.407-.648.691-.883a2.854 2.854 0 0 1 1.03-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.294 0-.579.039-.853.117a2.182 2.182 0 0 0-.751.383 1.818 1.818 0 0 0-.514.72c-.128.305-.192.687-.192 1.148v4.252h-1.235ZM105.838 45.051c-.706 0-1.333-.166-1.883-.5a3.58 3.58 0 0 1-1.294-1.427c-.314-.608-.471-1.314-.471-2.118 0-.815.157-1.52.471-2.119a3.475 3.475 0 0 1 1.294-1.412c.55-.343 1.177-.515 1.883-.515.883 0 1.619.235 2.207.706.598.47.981 1.104 1.148 1.898h-1.266c-.107-.49-.358-.868-.75-1.133-.382-.274-.834-.412-1.353-.412-.451 0-.858.113-1.221.339-.353.225-.633.559-.839 1-.206.441-.309.99-.309 1.648 0 .49.059.926.177 1.309.117.373.279.686.485.941.216.246.466.432.75.56.295.127.613.19.957.19.353 0 .672-.058.956-.176.294-.127.539-.309.735-.544.206-.236.344-.515.412-.839h1.266a3.113 3.113 0 0 1-1.148 1.883c-.598.48-1.334.721-2.207.721ZM97.373 45.051c-.686 0-1.294-.166-1.824-.5-.53-.334-.946-.804-1.25-1.412-.295-.608-.442-1.32-.442-2.133 0-.815.147-1.526.442-2.134.304-.608.72-1.078 1.25-1.412.54-.333 1.157-.5 1.854-.5.745 0 1.368.167 1.868.5.5.334.878.78 1.133 1.339.255.559.382 1.172.382 1.839v.294a4.9 4.9 0 0 1-.014.353h-5.988v-.956h4.796c-.02-.755-.24-1.33-.662-1.721-.412-.402-.927-.603-1.545-.603a2.213 2.213 0 0 0-1.986 1.192c-.215.391-.323.882-.323 1.47v.412c0 .647.108 1.192.323 1.633.216.432.496.755.839.971a2.16 2.16 0 0 0 1.147.324c.55 0 .981-.103 1.295-.31.314-.215.544-.52.691-.911h1.221a2.95 2.95 0 0 1-.617 1.162 2.936 2.936 0 0 1-1.089.809c-.432.196-.932.294-1.5.294ZM88.93 45.051c-.755 0-1.412-.137-1.971-.412a3.079 3.079 0 0 1-1.295-1.147c-.304-.49-.456-1.06-.456-1.707h1.295c0 .403.093.775.28 1.118.186.334.455.604.808.81.363.196.81.294 1.339.294.461 0 .853-.074 1.177-.22.333-.158.584-.369.75-.633.177-.265.265-.564.265-.898 0-.373-.083-.681-.25-.927a1.751 1.751 0 0 0-.662-.618 5.415 5.415 0 0 0-.986-.44c-.372-.128-.775-.26-1.206-.398-.863-.275-1.49-.618-1.883-1.03-.383-.422-.574-.961-.574-1.618 0-.56.128-1.05.383-1.471.264-.422.637-.75 1.118-.986.49-.245 1.069-.368 1.736-.368.657 0 1.226.123 1.706.368.49.245.873.584 1.148 1.015.274.422.412.912.412 1.471h-1.295c0-.284-.074-.564-.22-.838a1.725 1.725 0 0 0-.677-.677c-.295-.186-.667-.28-1.118-.28a2.199 2.199 0 0 0-1 .192 1.58 1.58 0 0 0-.678.559c-.156.245-.235.544-.235.897 0 .334.069.603.206.81.147.205.353.382.618.529.274.137.593.265.956.382.363.118.765.25 1.206.398a5.9 5.9 0 0 1 1.324.617c.393.236.697.54.913.913.225.372.338.848.338 1.427 0 .49-.133.956-.397 1.397-.255.432-.638.785-1.148 1.06-.51.274-1.152.411-1.927.411Z"/></g><defs><clipPath id="secrets-manager-logo-clip"><path class="tw-fill-text-alt2" d="M0 0h200v48.819H0z"/></clipPath></defs></svg>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 49" fill="none">
+    <g class="tw-fill-text-alt2" clip-path="url(#secrets-manager-logo-clip)">
+      <path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/>
+      <path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM195.307 44.875v-7.739h1.118l.088 1.413a2.7 2.7 0 0 1 .691-.883 2.854 2.854 0 0 1 1.03-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.294 0-.579.039-.853.117a2.168 2.168 0 0 0-.75.383 1.81 1.81 0 0 0-.515.72c-.128.305-.192.687-.192 1.148v4.252h-1.235ZM190.181 45.051c-.686 0-1.294-.166-1.824-.5-.53-.334-.946-.804-1.25-1.412-.295-.608-.442-1.32-.442-2.133 0-.815.147-1.526.442-2.134.304-.608.72-1.078 1.25-1.412.539-.333 1.157-.5 1.854-.5.745 0 1.368.167 1.868.5.5.334.878.78 1.133 1.339.255.559.382 1.172.382 1.839v.294c0 .098-.005.216-.015.353h-5.987v-.956h4.796c-.02-.755-.24-1.33-.662-1.721-.412-.402-.927-.603-1.545-.603-.412 0-.794.102-1.147.308a2.21 2.21 0 0 0-.839.883c-.216.392-.324.883-.324 1.471v.412c0 .647.108 1.192.324 1.633.216.432.495.755.839.971.353.216.735.324 1.147.324.549 0 .981-.103 1.295-.31.314-.215.544-.52.691-.911h1.221a2.944 2.944 0 0 1-.618 1.162 2.933 2.933 0 0 1-1.088.809c-.432.196-.932.294-1.501.294ZM181.83 48.288c-.696 0-1.309-.089-1.839-.265-.52-.167-.927-.427-1.221-.78-.284-.353-.426-.79-.426-1.31 0-.244.044-.5.132-.764.098-.265.26-.52.485-.765.236-.245.564-.466.986-.662l.942.5c-.559.216-.922.466-1.089.75-.167.285-.25.56-.25.824 0 .324.093.593.279.81.196.215.466.377.809.485.344.108.741.162 1.192.162.441 0 .819-.06 1.133-.177.324-.108.569-.27.735-.485.177-.206.265-.452.265-.736 0-.412-.132-.736-.397-.97-.265-.227-.78-.359-1.545-.398a14.968 14.968 0 0 1-1.5-.162 6.937 6.937 0 0 1-1.001-.235 3.324 3.324 0 0 1-.647-.324 4.326 4.326 0 0 1-.456-.368v-.338l1.456-1.398 1.163.383-1.589 1.31.191-.56c.108.079.211.152.309.22.098.07.231.133.397.192a7 7 0 0 0 .721.147c.314.05.726.093 1.236.133.706.049 1.27.166 1.692.353.421.186.725.446.912.78.186.323.279.72.279 1.19 0 .413-.117.805-.353 1.178-.225.372-.588.676-1.088.912-.491.245-1.128.368-1.913.368Zm-.015-5.826c-.627 0-1.162-.118-1.603-.353a2.507 2.507 0 0 1-.986-.986 2.953 2.953 0 0 1-.338-1.412c0-.52.113-.986.338-1.398.236-.412.569-.74 1.001-.985.441-.245.971-.368 1.588-.368.638 0 1.172.123 1.604.368.431.245.76.573.986.985.225.412.338.878.338 1.398 0 .52-.113.99-.338 1.412-.226.412-.555.74-.986.986-.432.235-.966.353-1.604.353Zm0-1.015c.55 0 .976-.142 1.28-.427.304-.294.456-.73.456-1.309s-.152-1.01-.456-1.295c-.304-.284-.73-.426-1.28-.426-.519 0-.946.142-1.28.426-.323.285-.485.716-.485 1.295s.157 1.015.471 1.31c.323.284.755.426 1.294.426Zm1.295-3.266-.368-1.044h3.031v.926l-2.663.118ZM173.109 45.051c-.588 0-1.078-.108-1.471-.324a2.245 2.245 0 0 1-.882-.882 2.513 2.513 0 0 1-.295-1.192c0-.51.128-.941.383-1.294.265-.363.633-.638 1.103-.824.471-.186 1.02-.28 1.648-.28h1.927c0-.5-.059-.917-.176-1.25-.118-.334-.309-.584-.574-.75-.265-.167-.618-.25-1.059-.25-.442 0-.819.112-1.133.338-.314.216-.51.54-.589.97h-1.265c.059-.51.231-.936.515-1.28a2.643 2.643 0 0 1 1.074-.794c.441-.186.907-.279 1.398-.279.696 0 1.27.127 1.721.383a2.29 2.29 0 0 1 1 1.044c.216.441.324.966.324 1.574v4.914h-1.103l-.074-1.324a2.743 2.743 0 0 1-.383.588 2.452 2.452 0 0 1-.529.47 2.586 2.586 0 0 1-.706.325c-.255.078-.54.117-.854.117Zm.177-1.044c.324 0 .623-.074.897-.221.275-.147.51-.343.707-.588.205-.255.362-.54.47-.854.108-.313.162-.642.162-.985v-.148h-1.824c-.461 0-.839.06-1.133.177-.284.118-.49.285-.618.5a1.318 1.318 0 0 0-.191.706c0 .285.059.535.177.75.117.207.289.368.514.486.236.118.515.177.839.177ZM162.192 44.875v-7.739h1.118l.059 1.221c.225-.44.549-.784.971-1.03.431-.244.926-.367 1.486-.367.568 0 1.064.108 1.485.324.422.215.751.544.986.985.235.442.353 1 .353 1.677v4.929h-1.236v-4.796c0-.687-.171-1.202-.515-1.545-.333-.343-.784-.515-1.353-.515-.382 0-.736.093-1.059.28a1.96 1.96 0 0 0-.78.794c-.186.353-.279.785-.279 1.295v4.487h-1.236ZM156.502 45.051c-.589 0-1.079-.108-1.471-.324a2.241 2.241 0 0 1-.883-.882 2.523 2.523 0 0 1-.294-1.192c0-.51.127-.941.382-1.294.265-.363.633-.638 1.104-.824.47-.186 1.02-.28 1.647-.28h1.927c0-.5-.058-.917-.176-1.25-.118-.334-.309-.584-.574-.75-.265-.167-.618-.25-1.059-.25-.441 0-.819.112-1.133.338-.314.216-.51.54-.588.97h-1.265c.058-.51.23-.936.514-1.28a2.643 2.643 0 0 1 1.074-.794c.442-.186.908-.279 1.398-.279.696 0 1.27.127 1.721.383.451.245.785.593 1.001 1.044.215.441.323.966.323 1.574v4.914h-1.103l-.074-1.324a2.738 2.738 0 0 1-.382.588 2.457 2.457 0 0 1-.53.47 2.586 2.586 0 0 1-.706.325 2.89 2.89 0 0 1-.853.117Zm.176-1.044c.324 0 .623-.074.898-.221a2.27 2.27 0 0 0 .706-.588c.206-.255.363-.54.471-.854.108-.313.161-.642.161-.985v-.148h-1.824c-.461 0-.838.06-1.133.177-.284.118-.49.285-.617.5a1.31 1.31 0 0 0-.192.706c0 .285.059.535.177.75.118.207.289.368.515.486.235.118.515.177.838.177ZM142.038 44.875V34.577h1.441l3.502 7.253 3.472-7.253h1.456v10.298h-1.236v-8.077l-3.236 6.723h-.927l-3.237-6.664v8.018h-1.235ZM133.309 45.051c-.697 0-1.275-.103-1.736-.309-.451-.215-.795-.51-1.03-.882a3.064 3.064 0 0 1-.427-1.324h1.266c.039.264.127.51.264.735.148.216.358.392.633.53.275.137.623.206 1.045.206.333 0 .617-.05.853-.147.235-.108.412-.255.529-.442.128-.186.192-.402.192-.647 0-.324-.074-.574-.221-.75-.137-.187-.343-.324-.618-.412a4.496 4.496 0 0 0-1-.22 6.687 6.687 0 0 1-1.148-.251 2.894 2.894 0 0 1-.853-.427 1.708 1.708 0 0 1-.515-.662 2.3 2.3 0 0 1-.176-.941c0-.422.112-.795.338-1.118.225-.324.544-.574.956-.75.422-.187.917-.28 1.486-.28.834 0 1.491.191 1.971.574.491.382.78.927.868 1.633h-1.221a1.209 1.209 0 0 0-.5-.854c-.284-.206-.662-.309-1.133-.309-.5 0-.877.094-1.132.28a.87.87 0 0 0-.383.736c0 .225.054.431.162.617.118.177.314.329.588.456.275.118.643.206 1.104.265.578.069 1.069.182 1.471.339.402.147.706.377.912.691.216.314.319.74.309 1.28 0 .51-.123.941-.368 1.295a2.228 2.228 0 0 1-1 .809c-.422.186-.917.28-1.486.28ZM127.538 44.875c-.441 0-.824-.069-1.147-.206a1.506 1.506 0 0 1-.75-.692c-.167-.333-.251-.78-.251-1.338V38.18h-1.353v-1.044h1.353l.162-1.928h1.074v1.927h2.192v1.045h-2.192v4.458c0 .46.093.774.28.941.186.157.515.236.985.236h.898v1.059h-1.251ZM119.656 45.051c-.687 0-1.295-.166-1.824-.5-.53-.334-.947-.804-1.251-1.412-.294-.608-.441-1.32-.441-2.133 0-.815.147-1.526.441-2.134.304-.608.721-1.078 1.251-1.412.539-.333 1.157-.5 1.853-.5.746 0 1.368.167 1.869.5.5.334.877.78 1.132 1.339.255.559.383 1.172.383 1.839v.294c0 .098-.005.216-.015.353h-5.987v-.956h4.796c-.02-.755-.241-1.33-.662-1.721-.412-.402-.927-.603-1.545-.603a2.214 2.214 0 0 0-1.986 1.192c-.216.391-.324.882-.324 1.47v.412c0 .647.108 1.192.324 1.633.216.432.495.755.838.971.353.216.736.324 1.148.324.549 0 .981-.103 1.294-.31.314-.215.545-.52.692-.911h1.221a2.97 2.97 0 0 1-.618 1.162 2.929 2.929 0 0 1-1.089.809c-.431.196-.931.294-1.5.294ZM110.99 44.875v-7.739h1.118l.088 1.413c.176-.353.407-.648.691-.883a2.854 2.854 0 0 1 1.03-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.294 0-.579.039-.853.117a2.182 2.182 0 0 0-.751.383 1.818 1.818 0 0 0-.514.72c-.128.305-.192.687-.192 1.148v4.252h-1.235ZM105.838 45.051c-.706 0-1.333-.166-1.883-.5a3.58 3.58 0 0 1-1.294-1.427c-.314-.608-.471-1.314-.471-2.118 0-.815.157-1.52.471-2.119a3.475 3.475 0 0 1 1.294-1.412c.55-.343 1.177-.515 1.883-.515.883 0 1.619.235 2.207.706.598.47.981 1.104 1.148 1.898h-1.266c-.107-.49-.358-.868-.75-1.133-.382-.274-.834-.412-1.353-.412-.451 0-.858.113-1.221.339-.353.225-.633.559-.839 1-.206.441-.309.99-.309 1.648 0 .49.059.926.177 1.309.117.373.279.686.485.941.216.246.466.432.75.56.295.127.613.19.957.19.353 0 .672-.058.956-.176.294-.127.539-.309.735-.544.206-.236.344-.515.412-.839h1.266a3.113 3.113 0 0 1-1.148 1.883c-.598.48-1.334.721-2.207.721ZM97.373 45.051c-.686 0-1.294-.166-1.824-.5-.53-.334-.946-.804-1.25-1.412-.295-.608-.442-1.32-.442-2.133 0-.815.147-1.526.442-2.134.304-.608.72-1.078 1.25-1.412.54-.333 1.157-.5 1.854-.5.745 0 1.368.167 1.868.5.5.334.878.78 1.133 1.339.255.559.382 1.172.382 1.839v.294a4.9 4.9 0 0 1-.014.353h-5.988v-.956h4.796c-.02-.755-.24-1.33-.662-1.721-.412-.402-.927-.603-1.545-.603a2.213 2.213 0 0 0-1.986 1.192c-.215.391-.323.882-.323 1.47v.412c0 .647.108 1.192.323 1.633.216.432.496.755.839.971a2.16 2.16 0 0 0 1.147.324c.55 0 .981-.103 1.295-.31.314-.215.544-.52.691-.911h1.221a2.95 2.95 0 0 1-.617 1.162 2.936 2.936 0 0 1-1.089.809c-.432.196-.932.294-1.5.294ZM88.93 45.051c-.755 0-1.412-.137-1.971-.412a3.079 3.079 0 0 1-1.295-1.147c-.304-.49-.456-1.06-.456-1.707h1.295c0 .403.093.775.28 1.118.186.334.455.604.808.81.363.196.81.294 1.339.294.461 0 .853-.074 1.177-.22.333-.158.584-.369.75-.633.177-.265.265-.564.265-.898 0-.373-.083-.681-.25-.927a1.751 1.751 0 0 0-.662-.618 5.415 5.415 0 0 0-.986-.44c-.372-.128-.775-.26-1.206-.398-.863-.275-1.49-.618-1.883-1.03-.383-.422-.574-.961-.574-1.618 0-.56.128-1.05.383-1.471.264-.422.637-.75 1.118-.986.49-.245 1.069-.368 1.736-.368.657 0 1.226.123 1.706.368.49.245.873.584 1.148 1.015.274.422.412.912.412 1.471h-1.295c0-.284-.074-.564-.22-.838a1.725 1.725 0 0 0-.677-.677c-.295-.186-.667-.28-1.118-.28a2.199 2.199 0 0 0-1 .192 1.58 1.58 0 0 0-.678.559c-.156.245-.235.544-.235.897 0 .334.069.603.206.81.147.205.353.382.618.529.274.137.593.265.956.382.363.118.765.25 1.206.398a5.9 5.9 0 0 1 1.324.617c.393.236.697.54.913.913.225.372.338.848.338 1.427 0 .49-.133.956-.397 1.397-.255.432-.638.785-1.148 1.06-.51.274-1.152.411-1.927.411Z"/>
+    </g>
+    <defs>
+      <clipPath id="secrets-manager-logo-clip">
+        <path class="tw-fill-text-alt2" d="M0 0h200v48.819H0z"/>
+      </clipPath>
+    </defs>
+  </svg>
 `;
 
 export default SecretsManagerLogo;
diff --git a/libs/assets/src/svg/svgs/secure-devices.ts b/libs/assets/src/svg/svgs/secure-devices.ts
deleted file mode 100644
index ed216f1bc87..00000000000
--- a/libs/assets/src/svg/svgs/secure-devices.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const SecureDevices = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="none">
-<path class="tw-stroke-art-accent" stroke-width="1.5" d="M122.568 45.774v-3a5.176 5.176 0 0 0-5.176-5.175H34.094a5.176 5.176 0 0 0-5.176 5.176v10.432m67.636 39.392H33.378"/>
-<path class="tw-stroke-art-primary" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M53.446 111.924h43.108"/>
-<path class="tw-stroke-art-primary" stroke-linejoin="round" stroke-width="1.5" d="M68.118 98.72v13.204M82.96 98.72v13.204"/>
-<path class="tw-stroke-art-primary" stroke-width="2.5" d="M127.771 45.775v-3.026c0-5.718-4.635-10.352-10.352-10.352H34.068c-5.718 0-10.352 4.634-10.352 10.352v10.459m72.838 44.595H33.378"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" d="M71.835 59.965C72.068 57.392 73.906 55.5 76 55.5s3.932 1.892 4.165 4.465h-8.33Zm-1.005.034c.224-3.015 2.388-5.499 5.17-5.499 2.781 0 4.946 2.484 5.17 5.5 1.6.232 2.83 1.61 2.83 3.275v6.62a3.31 3.31 0 0 1-3.31 3.311h-9.38a3.31 3.31 0 0 1-3.31-3.31v-6.62a3.311 3.311 0 0 1 2.83-3.277Zm.48.966h9.38a2.31 2.31 0 0 1 2.31 2.31v6.62a2.31 2.31 0 0 1-2.31 2.311h-9.38a2.31 2.31 0 0 1-2.31-2.31v-6.62a2.31 2.31 0 0 1 2.31-2.311Z" clip-rule="evenodd"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" d="M75.448 67.482a1.103 1.103 0 0 1-.551-.956v-.215a1.103 1.103 0 1 1 2.206 0v.215c0 .408-.221.765-.551.956v1.594a.552.552 0 1 1-1.104 0v-1.594Z" clip-rule="evenodd"/>
-<rect width="30.203" height="56.96" x="3.411" y="52.971" class="tw-stroke-art-primary" stroke-width="2.5" rx="7.377"/>
-<path class="tw-stroke-art-accent" stroke-linecap="round" stroke-width="1.725" d="M18.164 58.148h.685"/>
-<rect width="51.284" height="71.352" x="96.554" y="45.775" class="tw-stroke-art-primary" stroke-width="2.5" rx="6.901"/>
-<circle cx="122.568" cy="111.924" r="1.486" class="tw-fill-art-accent"/>
-</svg>
-`;
diff --git a/libs/assets/src/svg/svgs/secure-user.ts b/libs/assets/src/svg/svgs/secure-user.ts
deleted file mode 100644
index 8684549a815..00000000000
--- a/libs/assets/src/svg/svgs/secure-user.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const SecureUser = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="none">
-<path class="tw-fill-art-primary" fill-rule="evenodd" d="M96.538 35.676c-.85 0-1.538-.688-1.538-1.538v-.6a1.538 1.538 0 1 1 3.076 0v.6c0 .85-.688 1.538-1.538 1.538ZM103.737 35.676a1.538 1.538 0 0 1-1.538-1.538v-.6a1.538 1.538 0 0 1 3.076 0v.6c0 .85-.688 1.538-1.538 1.538ZM110.935 35.676a1.538 1.538 0 0 1-1.538-1.538v-.6a1.538 1.538 0 0 1 3.076 0v.6c0 .85-.689 1.538-1.538 1.538Z" clip-rule="evenodd"/>
-<path class="tw-fill-art-primary" fill-rule="evenodd" d="M12.708 26.798C7.346 26.798 3 31.145 3 36.508v58.446c0 5.362 4.347 9.71 9.71 9.71h9.567v-2.5h-9.568a7.21 7.21 0 0 1-7.209-7.21V39.451h112.272v5.666a21.936 21.936 0 0 0-8.466-1.688c-12.15 0-22 9.85-22 22 0 9.269 5.732 17.199 13.845 20.439-9.966 2.189-18.447 8.17-23.747 16.296H64.038v2.5H75.91a35.893 35.893 0 0 0-3.913 11.415c-.408 2.511.898 5.791 4.056 5.791h65.572c4.042 0 6.167-2.082 5.564-5.791-2.447-15.065-14.291-27.103-29.529-30.292 8.007-3.29 13.645-11.166 13.645-20.358 0-8.158-4.44-15.278-11.034-19.077v-9.845c0-5.362-4.347-9.71-9.71-9.71H12.708ZM117.771 37.95v-1.444a7.21 7.21 0 0 0-7.21-7.21H12.708a7.21 7.21 0 0 0-7.209 7.21v1.444h112.272Zm-38.837 66.713h-.144a33.454 33.454 0 0 0-4.326 11.816c-.118.732.03 1.578.376 2.164.292.494.65.726 1.213.726h65.572c1.649 0 2.42-.429 2.735-.751.252-.258.576-.819.361-2.139-2.662-16.39-17.328-29.024-35.128-29.024-13.09 0-24.486 6.833-30.659 16.968v.24Zm49.871-39.235c0 10.77-8.73 19.5-19.5 19.5s-19.5-8.73-19.5-19.5 8.73-19.5 19.5-19.5 19.5 8.73 19.5 19.5Z" clip-rule="evenodd"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" d="M41.932 101.294a3.075 3.075 0 0 1-1.538-2.665v-.6a3.076 3.076 0 1 1 6.152 0v.6a3.075 3.075 0 0 1-1.538 2.665v4.444a1.538 1.538 0 0 1-3.076 0v-4.444Z" clip-rule="evenodd"/>
-<path class="tw-fill-art-accent" fill-rule="evenodd" d="M31.715 80.342c.649-7.236 5.821-12.592 11.755-12.592 5.934 0 11.106 5.356 11.755 12.592h-23.51Zm-2.514.076C29.834 72.08 35.82 65.25 43.47 65.25c7.65 0 13.636 6.83 14.268 15.168 4.533.586 8.034 4.46 8.034 9.152v18.457a9.229 9.229 0 0 1-9.228 9.229H30.396a9.229 9.229 0 0 1-9.228-9.229V89.57c0-4.692 3.501-8.566 8.034-9.152Zm1.195 2.424h26.148a6.728 6.728 0 0 1 6.728 6.728v18.457a6.729 6.729 0 0 1-6.728 6.729H30.396a6.729 6.729 0 0 1-6.728-6.729V89.57a6.728 6.728 0 0 1 6.728-6.728Z" clip-rule="evenodd"/>
-</svg>
-`;
diff --git a/libs/assets/src/svg/svgs/security-handshake.ts b/libs/assets/src/svg/svgs/security-handshake.ts
deleted file mode 100644
index f6309bc4c54..00000000000
--- a/libs/assets/src/svg/svgs/security-handshake.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const SecurityHandshake = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="none">
-  <path class="tw-fill-art-primary" fill-rule="evenodd" d="M55.54 113.815c1.794.909 3.324 1.383 4.435 1.727l.015.005c.777.24 1.185.374 1.432.507.368.197.8.234 1.196.101.178-.059.34-.136.424-.176l.015-.007c.074-.035.111-.052.145-.066l.043-.016c.091-.023.18-.054.265-.093 1.521-.703 3.915-1.763 5.936-2.033a1.508 1.508 0 1 0-.4-2.989c-2.483.331-5.207 1.549-6.698 2.235a3.936 3.936 0 0 0-.205.071 19.521 19.521 0 0 0-1.259-.415m-5.344 1.149-7.071 12.092 10.526 5.46a1.508 1.508 0 1 1-1.392 2.677l-11.297-5.861a1.438 1.438 0 0 1-.086-.048c-1.192-.72-1.31-2.134-.741-3.096l7.824-13.379.006-.011a2.254 2.254 0 0 1 2.988-.846c1.819 1.003 3.36 1.483 4.587 1.863m30.235 16.5a1.511 1.511 0 0 1 2.097.401c.607.894.98 1.89.98 2.92 0 1.046-.387 2.014-1.104 2.799-.651.739-1.616 1.204-2.55 1.384-.396 1.524-1.314 2.468-2.166 2.927-.453.29-.949.482-1.457.579a4.34 4.34 0 0 1-.753 1.255c-.778 1.183-2.122 1.69-3.26 1.717-.528.684-1.278 1.183-2.103 1.523a1.378 1.378 0 0 1-.207.068c-.479.121-.86.121-1.15.12h-.031c-1.046 0-2.113-.377-2.97-.771a17.903 17.903 0 0 1-2.326-1.316 1.507 1.507 0 0 1-.425-2.09 1.512 1.512 0 0 1 2.092-.425c.54.357 1.225.771 1.921 1.091.729.335 1.319.495 1.708.495.158 0 .232 0 .297-.005a.5.5 0 0 0 .057-.006c.642-.289.817-.592.864-.75a1.509 1.509 0 0 1 2.019-.963.34.34 0 0 0 .035.013l.006.001h.118c.425 0 .74-.204.844-.378.052-.087.112-.169.18-.244.233-.255.341-.534.351-.854a1.508 1.508 0 0 1 1.765-1.439.995.995 0 0 0 .183.016c.228 0 .45-.066.634-.19.052-.035.106-.067.162-.095.135-.068.748-.467.788-1.786a1.506 1.506 0 0 1 1.77-1.439c.056.009.122.015.19.015.46 0 .97-.241 1.148-.447l.03-.033c.233-.253.32-.506.32-.772 0-.291-.106-.707-.459-1.226a1.507 1.507 0 0 1 .402-2.095Z" clip-rule="evenodd"/>
-  <path class="tw-fill-art-primary" fill-rule="evenodd" d="M72 112.173c-1.273.841-2.725 2.355-4.115 5.058l-.01.017-.008.017c-.151.275-.17.673.06 1.112.223.352.93.775 2.136.148l.002-.001c1.492-.774 2.61-1.589 3.249-2.055l.27-.196.394-.28h.483c1.04 0 1.622-.069 1.973-.127l1.176-.195.463 1.096c.27.638.738 1.674 1.75 2.722 1.003 1.039 2.605 2.153 5.227 2.823l.379.097 6.936 6.552 9.308-5.228-6.9-11.821-8.164 3.699-9.407-4.142-.055-.019a5.217 5.217 0 0 1-.143-.052 4.902 4.902 0 0 0-1.654-.284c-.92 0-2.086.225-3.35 1.059Zm-1.665-2.515c1.808-1.195 3.566-1.56 5.014-1.56a7.942 7.942 0 0 1 2.62.442h.067l8.555 3.767 7.51-3.403c.622-.295 1.275-.21 1.71-.065a2.269 2.269 0 0 1 1.288 1.069l7.663 13.128.041.102c.447 1.114-.052 2.174-.793 2.728l-.079.059-10.628 5.969-.034.017a2.14 2.14 0 0 1-.611.203c-.186.031-.36.03-.42.03h-.013a2.308 2.308 0 0 1-1.566-.644l-6.743-6.369c-2.938-.818-4.923-2.157-6.267-3.548a11.163 11.163 0 0 1-1.879-2.613c-.241.016-.51.028-.81.034a27.07 27.07 0 0 1-3.503 2.196c-2.178 1.133-4.872.843-6.142-1.31l-.013-.021-.012-.021c-.64-1.17-.807-2.672-.084-4.011 1.569-3.044 3.333-4.993 5.129-6.179ZM57.94 130.702c.891-1.069 2.069-1.933 3.664-1.8l.008.001.01.001c.935.089 1.694.495 2.265.942.338-.144.68-.255 1.02-.329.627-.138 1.35-.175 2.03.051l.01.004.01.004c.977.341 1.645 1.027 2.088 1.686.1.002.202.008.305.017 1.872.175 2.963 1.224 3.556 2.131.99.251 1.717.81 2.216 1.488.572.777.794 1.647.905 2.123.353 1.346.505 3.585.005 5.75l-.012.052-.016.052c-.523 1.697-2.08 2.624-3.747 2.624-1.286 0-2.644-.473-3.66-1.359-1.753-.177-3.254-.773-4.257-1.985a5.169 5.169 0 0 1-3.062-1.144l-.03-.025-.03-.026a4.962 4.962 0 0 1-1.3-1.834 7.301 7.301 0 0 1-1.28-.677c-.767-.513-1.61-1.319-2.011-2.519-.59-1.766-.012-3.553 1.287-5.197l.013-.016.013-.015Zm2.332 1.915c-.918 1.168-.934 1.9-.78 2.359.118.355.396.679.827.968.43.287.91.469 1.226.561l.843.246.203.853c.13.545.38.869.605 1.076.441.341.906.462 1.33.462.1 0 .185-.012.26-.028l1.153-.253.524 1.056c.026.051.053.101.083.151.305.466.902.901 2.221 1.056l.848-.401.748.917c.401.493 1.156.843 1.894.843.531 0 .763-.234.848-.457.37-1.661.23-3.382-.003-4.254l-.007-.025-.005-.025c-.098-.423-.212-.781-.402-1.039-.135-.183-.335-.366-.838-.395l-.93-.054-.37-.855c-.189-.439-.584-1.013-1.482-1.097a.998.998 0 0 0-.402.042l-1.315.417-.533-1.272a2.837 2.837 0 0 0-.41-.7c-.156-.188-.302-.291-.43-.34-.02-.003-.153-.026-.421.033a3.292 3.292 0 0 0-.967.405l-.097.065-1.137.789-.885-1.063a2.803 2.803 0 0 0-.562-.523 1.255 1.255 0 0 0-.565-.228c-.189-.014-.494.023-1.072.71Z" clip-rule="evenodd"/>
-  <path class="tw-fill-art-primary" fill-rule="evenodd" d="M65.358 131.532a.754.754 0 0 1-.246 1.038l-.103.062c-.269.163-.767.464-1.28.884-.602.495-1.119 1.074-1.317 1.666-.137.411-.148.939-.064 1.485.083.542.25 1.032.4 1.333a.754.754 0 0 1-1.35.674 6.278 6.278 0 0 1-.543-1.777c-.104-.679-.116-1.471.125-2.191.334-1.002 1.12-1.804 1.79-2.355.605-.496 1.201-.855 1.463-1.012l.087-.053a.756.756 0 0 1 1.038.246ZM68.873 132.736c.19.37.044.825-.326 1.015-.456.234-1.697 1.226-2.23 3.049-.556 1.904-.188 3.039-.072 3.236a.754.754 0 1 1-1.305.76c-.38-.653-.708-2.24-.072-4.418.66-2.26 2.202-3.564 2.988-3.968a.754.754 0 0 1 1.017.326ZM72.056 135.181c.191.37.045.825-.326 1.015-.141.073-.415.314-.724.782a6.358 6.358 0 0 0-.77 1.693c-.187.637-.246 1.364-.225 1.989.01.31.04.58.077.788.034.182.065.271.074.295.002.007.002.008 0 .005a.755.755 0 0 1-1.304.76c-.132-.226-.208-.527-.255-.792a7.079 7.079 0 0 1-.1-1.006c-.025-.737.04-1.631.283-2.461a7.84 7.84 0 0 1 .96-2.102c.365-.553.814-1.046 1.294-1.292a.756.756 0 0 1 1.016.326ZM77.04 136.44l.01.008.027.025.11.101a54.371 54.371 0 0 0 1.782 1.551c1.106.921 2.391 1.905 3.282 2.35a.754.754 0 1 1-.675 1.349c-1.068-.534-2.477-1.628-3.574-2.541a57.15 57.15 0 0 1-1.833-1.595l-.114-.105-.03-.028-.012-.01.514-.553-.514.553a.754.754 0 1 1 1.027-1.105ZM78.495 132.514l.012.011.038.034.15.13a74.33 74.33 0 0 0 2.44 2.015c1.507 1.19 3.281 2.483 4.53 3.075a.753.753 0 1 1-.648 1.362c-1.422-.674-3.32-2.071-4.819-3.254-.76-.6-1.433-1.159-1.918-1.569-.242-.204-.438-.372-.572-.488l-.156-.135-.04-.036-.015-.013.499-.566-.5.566a.756.756 0 0 1 .998-1.132ZM81.422 128.595l.014.012.044.037.17.142c.15.124.366.303.635.522.54.439 1.29 1.038 2.133 1.679 1.707 1.297 3.727 2.715 5.154 3.366a.753.753 0 1 1-.627 1.372c-1.6-.73-3.742-2.247-5.441-3.538a87.058 87.058 0 0 1-2.82-2.242l-.176-.147-.046-.039-.016-.014.488-.575-.488.575a.754.754 0 1 1 .976-1.15ZM134.303 48.211a61.447 61.447 0 0 1-.856 38.597 61.76 61.76 0 0 1-23.725 30.537 1.511 1.511 0 0 1-2.096-.409 1.507 1.507 0 0 1 .408-2.093 58.736 58.736 0 0 0 22.567-29.045 58.431 58.431 0 0 0 .814-36.704 58.696 58.696 0 0 0-21.256-30.008 59.167 59.167 0 0 0-35.015-11.57 59.17 59.17 0 0 0-35.071 11.4A58.707 58.707 0 0 0 18.669 48.82a58.433 58.433 0 0 0 .634 36.708 58.733 58.733 0 0 0 22.424 29.154c.69.469.868 1.407.399 2.095a1.51 1.51 0 0 1-2.098.398 61.752 61.752 0 0 1-23.575-30.652 61.446 61.446 0 0 1-.667-38.6 61.723 61.723 0 0 1 22.502-31.44A62.192 62.192 0 0 1 75.153 4.5a62.188 62.188 0 0 1 36.803 12.161 61.714 61.714 0 0 1 22.348 31.55Z" clip-rule="evenodd"/>
-  <path class="tw-fill-art-accent" fill-rule="evenodd" d="M128.53 49.913a55.343 55.343 0 0 1-.771 34.77 55.64 55.64 0 0 1-21.378 27.512.755.755 0 0 1-.844-1.25 54.131 54.131 0 0 0 20.799-26.766 53.85 53.85 0 0 0 .751-33.825 54.094 54.094 0 0 0-19.592-27.653 54.534 54.534 0 0 0-32.27-10.66 54.537 54.537 0 0 0-32.322 10.503 54.1 54.1 0 0 0-19.727 27.558 53.841 53.841 0 0 0 .585 33.828 54.125 54.125 0 0 0 20.667 26.866.754.754 0 1 1-.85 1.247 55.637 55.637 0 0 1-21.243-27.616 55.347 55.347 0 0 1-.6-34.774A55.608 55.608 0 0 1 42.01 21.328a56.05 56.05 0 0 1 33.218-10.796 56.044 56.044 0 0 1 33.164 10.957 55.597 55.597 0 0 1 20.137 28.424Z" clip-rule="evenodd"/>
-  <path class="tw-fill-art-primary" fill-rule="evenodd" d="M61.17 48.3c.727-8.197 6.577-14.301 13.33-14.301 6.754 0 12.604 6.104 13.33 14.3a12.392 12.392 0 0 0-.35-.004H61.52c-.117 0-.234.002-.35.005Zm-2.53.343c.6-9.417 7.306-17.144 15.86-17.144 8.555 0 15.26 7.727 15.862 17.144 5.247 1.291 9.138 6.028 9.138 11.673v17.412c0 6.64-5.382 12.022-12.02 12.022H61.52c-6.639 0-12.02-5.383-12.02-12.022V60.316c0-5.646 3.891-10.382 9.138-11.673Zm2.881 2.152H87.48A9.521 9.521 0 0 1 97 60.316v17.412a9.521 9.521 0 0 1-9.52 9.522H61.52a9.521 9.521 0 0 1-9.52-9.522V60.316a9.521 9.521 0 0 1 9.52-9.521Z" clip-rule="evenodd"/>
-  <path class="tw-fill-art-accent" fill-rule="evenodd" d="M72.741 71.859a3.499 3.499 0 0 1-1.74-3.027v-.674a3.5 3.5 0 1 1 7 0v.674c0 1.292-.7 2.42-1.742 3.027v4.956a1.76 1.76 0 1 1-3.518 0V71.86Z" clip-rule="evenodd"/>
-</svg>
-`;
diff --git a/libs/assets/src/svg/svgs/security.ts b/libs/assets/src/svg/svgs/security.ts
index 0edf0aec14f..6e475b25ab7 100644
--- a/libs/assets/src/svg/svgs/security.ts
+++ b/libs/assets/src/svg/svgs/security.ts
@@ -1,50 +1,21 @@
 import { svgIcon } from "../icon-service";
 
 export const Security = svgIcon`
-<svg width="96" height="96" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <rect width="96" height="96" class="tw-fill-background"/>
-  <rect x="5" y="5" width="86" height="77" rx="7" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-  <rect x="63" y="15" width="18" height="18" rx="3" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-  <rect x="39" y="15" width="18" height="18" rx="3" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-  <rect x="15" y="15" width="18" height="18" rx="3" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-  <rect x="13" y="41" width="70" height="14" rx="7" class="tw-stroke-art-primary tw-fill-background" stroke-width="2" stroke-linecap="round"/>
-  <path d="M21.0039 48.3526V45.5728" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M21.0039 48.3525L23.6272 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M21.0039 48.3524L22.6279 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M21.0029 48.3524L19.3789 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M21.0022 48.3525L18.3789 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M30.0039 48.3526V45.5728" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M30.0039 48.3525L32.6272 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M30.0039 48.3524L31.6279 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M30.0029 48.3524L28.3789 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M30.0022 48.3525L27.3789 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M39.0039 48.3526V45.5728" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M39.0039 48.3525L41.6272 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M39.0039 48.3524L40.6279 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M39.0029 48.3524L37.3789 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M39.0022 48.3525L36.3789 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M48.0039 48.3526V45.5728" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M48.0039 48.3525L50.6272 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M48.0039 48.3524L49.6279 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M48.0029 48.3524L46.3789 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M48.0022 48.3525L45.3789 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M57.0039 48.3526V45.5728" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M57.0039 48.3525L59.6272 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M57.0039 48.3524L58.6279 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M57.0029 48.3524L55.3789 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M57.0022 48.3525L54.3789 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M66.0039 48.3526V45.5728" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M66.0039 48.3525L68.6272 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M66.0039 48.3524L67.6279 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M66.0029 48.3524L64.3789 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M66.0022 48.3525L63.3789 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M75.0039 48.3526V45.5728" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M75.0039 48.3525L77.6272 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M75.0039 48.3524L76.6279 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M75.0029 48.3524L73.3789 50.6268" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M75.0022 48.3525L72.3789 47.4933" class="tw-stroke-art-accent" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <rect x="35" y="72" width="26" height="20" rx="2" class="tw-stroke-art-primary tw-fill-background" stroke-width="2"/>
-  <rect x="47" y="78" width="2" height="8" rx="1" class="tw-stroke-art-accent"/>
-  <path d="M55 71V69C55 65.134 51.866 62 48 62V62C44.134 62 41 65.134 41 69V71" class="tw-stroke-art-primary" stroke-width="2"/>
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="4 4 88 89">
+    <path class="tw-fill-illustration-bg-secondary" d="M4 12a8 8 0 0 1 8-8h72a8 8 0 0 1 8 8v63a8 8 0 0 1-8 8H12a8 8 0 0 1-8-8V12Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M84 6H12a6 6 0 0 0-6 6v63a6 6 0 0 0 6 6h72a6 6 0 0 0 6-6V12a6 6 0 0 0-6-6ZM12 4a8 8 0 0 0-8 8v63a8 8 0 0 0 8 8h72a8 8 0 0 0 8-8V12a8 8 0 0 0-8-8H12Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M62 18a4 4 0 0 1 4-4h12a4 4 0 0 1 4 4v12a4 4 0 0 1-4 4H66a4 4 0 0 1-4-4V18Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M78 16H66a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V18a2 2 0 0 0-2-2Zm-12-2a4 4 0 0 0-4 4v12a4 4 0 0 0 4 4h12a4 4 0 0 0 4-4V18a4 4 0 0 0-4-4H66Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M38 18a4 4 0 0 1 4-4h12a4 4 0 0 1 4 4v12a4 4 0 0 1-4 4H42a4 4 0 0 1-4-4V18Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M54 16H42a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V18a2 2 0 0 0-2-2Zm-12-2a4 4 0 0 0-4 4v12a4 4 0 0 0 4 4h12a4 4 0 0 0 4-4V18a4 4 0 0 0-4-4H42Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M14 18a4 4 0 0 1 4-4h12a4 4 0 0 1 4 4v12a4 4 0 0 1-4 4H18a4 4 0 0 1-4-4V18Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M30 16H18a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V18a2 2 0 0 0-2-2Zm-12-2a4 4 0 0 0-4 4v12a4 4 0 0 0 4 4h12a4 4 0 0 0 4-4V18a4 4 0 0 0-4-4H18Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M12 48a8 8 0 0 1 8-8h56a8 8 0 1 1 0 16H20a8 8 0 0 1-8-8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M76 42H20a6 6 0 0 0 0 12h56a6 6 0 0 0 0-12Zm-56-2a8 8 0 1 0 0 16h56a8 8 0 1 0 0-16H20Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M21.005 44.572a1 1 0 0 1 1 1v1.4l1.312-.43a1 1 0 0 1 .622 1.901l-1.33.436.833 1.166a1 1 0 1 1-1.627 1.163l-.81-1.135-.81 1.134a1 1 0 1 1-1.628-1.162l.833-1.166-1.33-.436a1 1 0 1 1 .622-1.9l1.313.43v-1.4a1 1 0 0 1 1-1Zm9 0a1 1 0 0 1 1 1v1.4l1.312-.43a1 1 0 0 1 .622 1.901l-1.33.436.833 1.166a1 1 0 1 1-1.627 1.163l-.81-1.135-.81 1.134a1 1 0 1 1-1.628-1.162l.833-1.166-1.33-.436a1 1 0 1 1 .622-1.9l1.313.43v-1.4a1 1 0 0 1 1-1Zm9 0a1 1 0 0 1 1 1v1.4l1.312-.43a1 1 0 0 1 .622 1.901l-1.33.436.833 1.166a1 1 0 1 1-1.627 1.163l-.81-1.135-.81 1.134a1 1 0 1 1-1.628-1.162l.833-1.166-1.33-.436a1 1 0 1 1 .622-1.9l1.313.43v-1.4a1 1 0 0 1 1-1Zm9 0a1 1 0 0 1 1 1v1.4l1.312-.43a1 1 0 0 1 .622 1.901l-1.33.436.833 1.166a1 1 0 1 1-1.627 1.163l-.81-1.135-.81 1.134a1 1 0 1 1-1.628-1.162l.833-1.166-1.33-.436a1 1 0 1 1 .622-1.9l1.313.43v-1.4a1 1 0 0 1 1-1Zm9 0a1 1 0 0 1 1 1v1.4l1.312-.43a1 1 0 0 1 .622 1.901l-1.33.436.833 1.166a1 1 0 1 1-1.627 1.163l-.81-1.135-.81 1.134a1 1 0 1 1-1.628-1.162l.833-1.166-1.33-.436a1 1 0 1 1 .622-1.9l1.313.43v-1.4a1 1 0 0 1 1-1Zm9 0a1 1 0 0 1 1 1v1.4l1.312-.43a1 1 0 0 1 .622 1.901l-1.33.436.833 1.166a1 1 0 1 1-1.627 1.163l-.81-1.135-.81 1.134a1 1 0 1 1-1.628-1.162l.833-1.166-1.33-.436a1 1 0 1 1 .622-1.9l1.313.43v-1.4a1 1 0 0 1 1-1Zm9 0a1 1 0 0 1 1 1v1.4l1.312-.43a1 1 0 0 1 .622 1.901l-1.33.436.833 1.166a1 1 0 1 1-1.627 1.163l-.81-1.135-.81 1.134a1 1 0 1 1-1.628-1.162l.833-1.166-1.33-.436a1 1 0 1 1 .622-1.9l1.313.43v-1.4a1 1 0 0 1 1-1Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M34 74a3 3 0 0 1 3-3h22a3 3 0 0 1 3 3v16a3 3 0 0 1-3 3H37a3 3 0 0 1-3-3V74Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M59 73H37a1 1 0 0 0-1 1v16a1 1 0 0 0 1 1h22a1 1 0 0 0 1-1V74a1 1 0 0 0-1-1Zm-22-2a3 3 0 0 0-3 3v16a3 3 0 0 0 3 3h22a3 3 0 0 0 3-3V74a3 3 0 0 0-3-3H37Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M47 79a1 1 0 1 1 2 0v6a1 1 0 1 1-2 0v-6Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M40 69a8 8 0 1 1 16 0v2h-2v-2a6 6 0 0 0-12 0v2h-2v-2Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/shield.ts b/libs/assets/src/svg/svgs/shield.ts
index 708642dc6ed..eaf9780773e 100644
--- a/libs/assets/src/svg/svgs/shield.ts
+++ b/libs/assets/src/svg/svgs/shield.ts
@@ -4,13 +4,22 @@ import { svgIcon } from "../icon-service";
  * Shield logo with extra space in the viewbox.
  */
 const AnonLayoutBitwardenShield = svgIcon`
- <svg viewBox="0 0 120 132" xmlns="http://www.w3.org/2000/svg">
+  <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" width="26" height="32" fill="none"><g clip-path="url(#bitwarden-shield-clip)"><path class="tw-fill-text-alt2" d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.256 9.256 0 0 1-.677 3.442 12.828 12.828 0 0 1-1.68 3.029 18.708 18.708 0 0 1-2.386 2.574 27.808 27.808 0 0 1-2.56 2.08 32.251 32.251 0 0 1-2.448 1.564c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.99 22.99 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.242 32.242 0 0 1-2.448-1.564 27.796 27.796 0 0 1-2.56-2.08 18.706 18.706 0 0 1-2.386-2.573 12.828 12.828 0 0 1-1.68-3.029A9.256 9.256 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642.641.386.944.26 1.294.26H24.6c.35 0 .654.127.91.383s.384.559.384.909Z"/></g><defs><clipPath id="bitwarden-shield-clip"><path class="tw-fill-text-alt2" d="M0 0h26v32H0z"/></clipPath></defs></svg>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 32" fill="none">
+    <g clip-path="url(#bitwarden-shield-clip)">
+      <path class="tw-fill-text-alt2" d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.256 9.256 0 0 1-.677 3.442 12.828 12.828 0 0 1-1.68 3.029 18.708 18.708 0 0 1-2.386 2.574 27.808 27.808 0 0 1-2.56 2.08 32.251 32.251 0 0 1-2.448 1.564c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.99 22.99 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.242 32.242 0 0 1-2.448-1.564 27.796 27.796 0 0 1-2.56-2.08 18.706 18.706 0 0 1-2.386-2.573 12.828 12.828 0 0 1-1.68-3.029A9.256 9.256 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642.641.386.944.26 1.294.26H24.6c.35 0 .654.127.91.383s.384.559.384.909Z"/>
+    </g>
+    <defs>
+      <clipPath id="bitwarden-shield-clip">
+        <path class="tw-fill-text-alt2" d="M0 0h26v32H0z"/>
+      </clipPath>
+    </defs>
+  </svg>
 `;
 
 export { AnonLayoutBitwardenShield, BitwardenShield };
diff --git a/libs/assets/src/svg/svgs/sso-key.icon.ts b/libs/assets/src/svg/svgs/sso-key.icon.ts
index 533c033feac..ad81c707449 100644
--- a/libs/assets/src/svg/svgs/sso-key.icon.ts
+++ b/libs/assets/src/svg/svgs/sso-key.icon.ts
@@ -1,10 +1,11 @@
 import { svgIcon } from "../icon-service";
 
 export const SsoKeyIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100">
-  <path class="tw-fill-art-primary" d="M28.573 23.888c6.488-8.225 16.56-13.51 27.87-13.51 15.454 0 28.595 9.864 33.446 23.62a23.969 23.969 0 0 1 2.844-.168c13.083 0 23.689 10.58 23.689 23.629 0 13.049-10.606 23.628-23.69 23.628H56.445v-2.393h36.289c11.757 0 21.289-9.507 21.289-21.236 0-11.728-9.532-21.235-21.29-21.235-1.182 0-2.34.096-3.469.28l-1.022.168-.315-.984c-4.26-13.293-16.746-22.915-31.482-22.915-10.712 0-20.234 5.083-26.274 12.968l-.31.404-.506.059C16.22 27.718 6.022 38.852 6.022 52.36c0 9.427 4.965 17.696 12.429 22.348l-.954 2.226C9.179 71.897 3.622 62.776 3.622 52.36c0-14.563 10.865-26.595 24.951-28.472Z"/>
-  <path class="tw-fill-art-accent" fill-rule="evenodd" d="M110.626 64.594a.598.598 0 0 1-.393-.75 18.278 18.278 0 0 0-1.008-13.552 18.326 18.326 0 0 0-7.607-8.025.597.597 0 0 1-.233-.814.6.6 0 0 1 .816-.232 19.52 19.52 0 0 1 8.103 8.548 19.474 19.474 0 0 1 1.074 14.434.6.6 0 0 1-.752.39ZM33.17 30.116c-13.02 0-23.574 10.524-23.574 23.506a.6.6 0 0 1-1.2 0c0-13.642 11.092-24.702 24.773-24.702a.6.6 0 1 1 0 1.196Z" clip-rule="evenodd"/>
-  <path class="tw-fill-art-primary" fill-rule="evenodd" d="M81.528 43.563a1.198 1.198 0 0 0-1.058-1.306l-11.08-1.273c-.32-.037-.641.055-.892.256L46.665 58.748c-6.998-3.579-15.75-3.07-22.226 2.123-8.84 7.088-10.054 19.941-2.89 28.787 7.168 8.847 20.1 10.352 28.888 3.306 6.524-5.232 8.897-13.726 6.742-21.358l3.146-2.523c.25-.2.41-.493.441-.812l.509-5.09 5.29.609c.32.036.64-.056.89-.257.251-.2.41-.493.442-.812l.144-1.439 1.169.135c.317.036.635-.055.885-.252s.41-.485.446-.8l.612-5.372 5.764.663c.32.036.641-.056.892-.257l2.366-1.897c.25-.201.41-.494.441-.812l.912-9.127ZM68.289 58.904l-1.186-.136c-.32-.037-.64.056-.891.257-.25.2-.41.493-.441.812l-.144 1.438-5.29-.607c-.32-.037-.64.055-.891.256-.25.201-.41.494-.441.812l-.58 5.8-3.384 2.713a1.191 1.191 0 0 0-.389 1.3c2.266 6.94.211 14.794-5.724 19.553-7.726 6.196-19.152 4.902-25.508-2.944-6.357-7.848-5.248-19.19 2.527-25.425 5.886-4.72 13.952-5.061 20.26-1.516.43.241.962.198 1.345-.11l22.063-17.691 9.405 1.08-.745 7.458-1.583 1.27-6.46-.743a1.205 1.205 0 0 0-.885.251c-.25.198-.41.486-.446.801l-.612 5.371Z" clip-rule="evenodd"/>
-  <path class="tw-fill-art-accent" fill-rule="evenodd" d="M35.251 78.67c2.144 2.647 1.721 6.453-.864 8.526-2.587 2.074-6.414 1.676-8.558-.97-2.137-2.638-1.78-6.405.865-8.525 2.653-2.127 6.468-1.61 8.557.97Zm-2.373 6.665c1.543-1.237 1.823-3.535.503-5.164-1.291-1.595-3.602-1.873-5.179-.609-1.584 1.271-1.829 3.528-.503 5.165 1.32 1.629 3.637 1.845 5.18.608Z" clip-rule="evenodd"/>
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 12.12 96 76">
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M77 43.121h2c9.389 0 17 7.611 17 17s-7.611 17-17 17H21v-.086C9.234 76.022 0 66.15 0 54.121c0-10.663 7.256-19.63 17.099-22.236C21.599 20.32 32.842 12.121 46 12.121c17.12 0 31 13.88 31 31Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" fill-rule="evenodd" d="M56 53.121c2.903 0 5.707-.427 8.352-1.22 3.427 4.966 9.157 8.22 15.648 8.22 5.856 0 11.094-2.65 14.579-6.815C91.952 47.31 85.965 43.121 79 43.121h-2c0-17.12-13.88-31-31-31a30.861 30.861 0 0 0-18.387 6.039A29.12 29.12 0 0 0 27 24.121c0 16.016 12.984 29 29 29Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M75 45.121v-2c0-16.016-12.984-29-29-29-12.306 0-22.826 7.666-27.037 18.49l-.369.947-.983.26C8.623 36.199 2 44.389 2 54.121c0 10.982 8.43 19.997 19.172 20.922l.91.078H79c8.284 0 15-6.716 15-15 0-8.284-6.716-15-15-15h-4ZM21 77.035C9.234 76.022 0 66.15 0 54.121c0-10.663 7.256-19.63 17.099-22.236C21.599 20.32 32.842 12.121 46 12.121c17.12 0 31 13.88 31 31h2c9.389 0 17 7.611 17 17s-7.611 17-17 17H21v-.086Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" fill-rule="evenodd" d="M31 88.121c6.326 0 11.795-3.671 14.392-9h7.002a2 2 0 0 0 1.11-.336L56 77.121l1.895 1.516a1 1 0 0 0 1.225.02l1.38-1.036 1.38 1.035a1 1 0 0 0 1.225-.019L65 77.121l3.578 1.789a2 2 0 0 0 .894.211h3.608a2 2 0 0 0 1.519-.698l4.843-5.651a1 1 0 0 0 0-1.302L74.6 65.82a2 2 0 0 0-1.519-.699H45.392c-2.597-5.328-8.066-9-14.392-9-8.837 0-16 7.163-16 16s7.163 16 16 16Zm-6-13a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M44.141 77.121h8.253l3.713-2.475 2.432 1.945 1.961-1.47 1.96 1.47 2.29-1.831 4.722 2.361h3.608l4.286-5-4.286-5H44.141l-.547-1.124C41.319 61.33 36.532 58.121 31 58.121c-7.732 0-14 6.268-14 14s6.268 14 14 14c5.532 0 10.32-3.209 12.594-7.876l.547-1.124Zm33.783-4.35h-.001Zm-.002-1.3h.002-.002ZM74.6 65.82a2 2 0 0 0-1.519-.699H45.392c-2.597-5.328-8.066-9-14.392-9-8.837 0-16 7.163-16 16s7.163 16 16 16c6.326 0 11.795-3.671 14.392-9h7.002a2 2 0 0 0 1.11-.336L56 77.121l1.895 1.516a1 1 0 0 0 1.225.02l1.38-1.036 1.38 1.035a1 1 0 0 0 1.225-.019L65 77.121l3.578 1.789a2 2 0 0 0 .894.211h3.608a2 2 0 0 0 1.519-.698l4.843-5.651a1 1 0 0 0 0-1.302L74.6 65.82ZM30 72.12a5 5 0 1 1-10 0 5 5 0 0 1 10 0Zm-2 0a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/subscription-hidden.ts b/libs/assets/src/svg/svgs/subscription-hidden.ts
deleted file mode 100644
index 38840580f86..00000000000
--- a/libs/assets/src/svg/svgs/subscription-hidden.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const SubscriptionHiddenIcon = svgIcon`
-<svg width="216" height="231" viewBox="0 0 216 231" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M133.356 85.6618C133.136 85.43 132.871 85.2457 132.577 85.1198C132.283 84.9939 131.968 84.93 131.648 84.9318H87.8482C87.5289 84.93 87.2113 84.9939 86.9175 85.1198C86.6237 85.2457 86.359 85.43 86.14 85.6618C85.9083 85.8808 85.7239 86.1473 85.598 86.4411C85.4721 86.7349 85.4082 87.0506 85.41 87.37V116.57C85.4192 118.793 85.8499 120.994 86.6802 123.056C87.4705 125.091 88.5326 127.011 89.8375 128.761C91.1789 130.515 92.6808 132.137 94.3233 133.612C95.8472 135.01 97.4532 136.318 99.1304 137.528C100.59 138.565 102.123 139.547 103.729 140.474C105.335 141.401 106.469 142.027 107.131 142.354C107.799 142.682 108.339 142.941 108.741 143.113C109.055 143.264 109.4 143.339 109.748 143.332C110.091 143.337 110.431 143.257 110.737 143.102C111.146 142.923 111.679 142.671 112.354 142.343C113.03 142.014 114.179 141.386 115.756 140.463C117.333 139.539 118.884 138.554 120.355 137.517C122.034 136.306 123.642 134.999 125.169 133.601C126.814 132.128 128.316 130.504 129.655 128.75C130.958 126.998 132.021 125.08 132.813 123.045C133.645 120.983 134.075 118.782 134.083 116.559V87.3591C134.085 87.0415 134.021 86.7276 133.895 86.4356C133.769 86.1436 133.586 85.8808 133.356 85.6618ZM127.71 116.836C127.71 127.421 109.748 136.514 109.748 136.514V91.1879H127.71V116.836Z" fill="rgb(var(--color-secondary-700))"/>
-  <path d="M24.6216 122.3C24.7144 123.4 25.6819 124.217 26.7825 124.125C27.8832 124.032 28.7002 123.064 28.6074 121.964L24.6216 122.3ZM151.501 45.7445C152.57 45.4679 153.213 44.3768 152.936 43.3074L148.429 25.8809C148.152 24.8115 147.061 24.1688 145.992 24.4454C144.922 24.722 144.28 25.8131 144.556 26.8825L148.563 42.3728L133.073 46.3793C132.003 46.6559 131.361 47.747 131.637 48.8164C131.914 49.8858 133.005 50.5285 134.074 50.2519L151.501 45.7445ZM28.6074 121.964C26.6788 99.0874 34.4658 75.5543 51.9661 58.054L49.1377 55.2256C30.7695 73.5938 22.5982 98.2999 24.6216 122.3L28.6074 121.964ZM51.9661 58.054C78.5404 31.4797 119.036 27.3026 149.985 45.5315L152.015 42.0849C119.534 22.9534 77.0327 27.3306 49.1377 55.2256L51.9661 58.054Z" fill="rgb(var(--color-secondary-700))"/>
-  <path d="M67.4747 185.062C66.4089 185.352 65.7801 186.451 66.0701 187.517L70.797 204.885C71.0871 205.951 72.1862 206.58 73.252 206.29C74.3179 205.999 74.9467 204.9 74.6567 203.834L70.455 188.396L85.8934 184.194C86.9592 183.904 87.5881 182.805 87.298 181.739C87.008 180.674 85.9088 180.045 84.843 180.335L67.4747 185.062ZM192.478 100.283C192.286 99.1952 191.248 98.4697 190.16 98.6625C189.072 98.8552 188.347 99.8931 188.54 100.981L192.478 100.283ZM166.138 172.225C139.813 198.55 99.8271 202.897 68.9932 185.255L67.0068 188.727C99.3669 207.242 141.333 202.687 168.966 175.054L166.138 172.225ZM188.54 100.981C192.985 126.07 185.516 152.847 166.138 172.225L168.966 175.054C189.307 154.713 197.142 126.603 192.478 100.283L188.54 100.981Z" fill="rgb(var(--color-secondary-700))"/>
-  <path d="M37.726 108.132C39.283 92.1931 46.1655 76.6765 58.3734 64.4686C75.2893 47.5527 98.5583 40.8618 120.5 44.396" stroke="rgb(var(--color-secondary-700))" stroke-width="2" stroke-linecap="round"/>
-  <path d="M180.595 119.132C179.653 136.119 172.693 152.834 159.717 165.811C144.44 181.088 123.982 188.025 104 186.623" stroke="rgb(var(--color-secondary-700))" stroke-width="2" stroke-linecap="round"/>
-  <rect x="153.5" y="56.1317" width="49" height="34" rx="2.5" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <path d="M153.5 63.6317V63.6317C153.5 66.9454 156.186 69.6317 159.5 69.6317H172.509M202.5 63.6317V63.6317C202.5 66.9454 199.814 69.6317 196.5 69.6317H183.491" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <mask id="path-8-inside-1_1000_26057" fill="white">
-    <rect x="172" y="65.6317" width="12" height="9" rx="1.25"/>
-  </mask>
-  <rect x="172" y="65.6317" width="12" height="9" rx="1.25" stroke="rgb(var(--color-secondary-700))" stroke-width="6" mask="url(#path-8-inside-1_1000_26057)"/>
-  <path d="M187 54.6317C187 54.6317 187 53.6317 187 52.6317C187 51.6317 186.053 50.6317 185.105 50.6317C184.158 50.6317 171.842 50.6317 170.895 50.6317C169.947 50.6317 169 51.6317 169 52.6317C169 53.6317 169 54.6317 169 54.6317" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <circle cx="48" cy="141" r="10.5" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <path d="M64.9935 168.5H64.9126H64.8318H64.7512H64.6708H64.5905H64.5104H64.4304H64.3506H64.2709H64.1914H64.1121H64.0329H63.9538H63.8749H63.7962H63.7176H63.6392H63.5609H63.4828H63.4048H63.3269H63.2492H63.1717H63.0943H63.017H62.9399H62.8629H62.7861H62.7094H62.6329H62.5565H62.4802H62.4041H62.3281H62.2523H62.1766H62.101H62.0256H61.9503H61.8751H61.8001H61.7252H61.6504H61.5758H61.5013H61.4269H61.3527H61.2786H61.2046H61.1308H61.0571H60.9835H60.91H60.8367H60.7635H60.6904H60.6175H60.5446H60.4719H60.3993H60.3269H60.2545H60.1823H60.1102H60.0382H59.9664H59.8946H59.823H59.7515H59.6801H59.6088H59.5376H59.4666H59.3956H59.3248H59.2541H59.1835H59.113H59.0426H58.9724H58.9022H58.8322H58.7622H58.6924H58.6226H58.553H58.4835H58.4141H58.3448H58.2756H58.2065H58.1375H58.0686H57.9998H57.9311H57.8625H57.794H57.7256H57.6572H57.589H57.5209H57.4529H57.385H57.3172H57.2494H57.1818H57.1142H57.0468H56.9794H56.9121H56.8449H56.7779H56.7108H56.6439H56.5771H56.5103H56.4437H56.3771H56.3106H56.2442H56.1779H56.1117H56.0455H55.9794H55.9134H55.8475H55.7817H55.7159H55.6502H55.5846H55.5191H55.4537H55.3883H55.323H55.2578H55.1926H55.1275H55.0625H54.9976H54.9328H54.868H54.8032H54.7386H54.674H54.6095H54.5451H54.4807H54.4164H54.3521H54.2879H54.2238H54.1598H54.0958H54.0318H53.968H53.9042H53.8404H53.7767H53.7131H53.6495H53.586H53.5226H53.4592H53.3958H53.3325H53.2693H53.2061H53.143H53.0799H53.0169H52.9539H52.891H52.8281H52.7653H52.7025H52.6398H52.5771H52.5145H52.4519H52.3894H52.3269H52.2645H52.202H52.1397H52.0774H52.0151H51.9528H51.8907H51.8285H51.7664H51.7043H51.6423H51.5803H51.5183H51.4564H51.3945H51.3326H51.2708H51.209H51.1472H51.0855H51.0238H50.9621H50.9005H50.8389H50.7773H50.7157H50.6542H50.5927H50.5312H50.4698H50.4084H50.347H50.2856H50.2243H50.1629H50.1016H50.0404H49.9791H49.9178H49.8566H49.7954H49.7342H49.6731H49.6119H49.5508H49.4896H49.4285H49.3674H49.3064H49.2453H49.1842H49.1232H49.0622H49.0011H48.9401H48.8791H48.8181H48.7571H48.6962H48.6352H48.5742H48.5133H48.4523H48.3913H48.3304H48.2694H48.2085H48.1475H48.0866H48.0257H47.9647H47.9038H47.8428H47.7819H47.7209H47.6599H47.599H47.538H47.477H47.416H47.3551H47.2941H47.2331H47.172H47.111H47.05H46.9889H46.9279H46.8668H46.8057H46.7446H46.6835H46.6224H46.5612H46.5001H46.4389H46.3777H46.3165H46.2553H46.194H46.1328H46.0715H46.0102H45.9489H45.8875H45.8261H45.7647H45.7033H45.6418H45.5804H45.5189H45.4573H45.3958H45.3342H45.2726H45.2109H45.1493H45.0876H45.0258H44.9641H44.9023H44.8404H44.7786H44.7166H44.6547H44.5927H44.5307H44.4687H44.4066H44.3445H44.2823H44.2201H44.1578H44.0956H44.0332H43.9709H43.9084H43.846H43.7835H43.7209H43.6583H43.5957H43.533H43.4703H43.4075H43.3447H43.2818H43.2189H43.1559H43.0929H43.0298H42.9666H42.9034H42.8402H42.7769H42.7135H42.6501H42.5867H42.5231H42.4596H42.3959H42.3322H42.2685H42.2046H42.1408H42.0768H42.0128H41.9487H41.8846H41.8204H41.7562H41.6918H41.6274H41.563H41.4985H41.4339H41.3692H41.3045H41.2397H41.1748H41.1098H41.0448H40.9797H40.9146H40.8493H40.784H40.7186H40.6532H40.5876H40.522H40.4563H40.3905H40.3247H40.2588H40.1928H40.1267H40.0605H39.9942H39.9279H39.8615H39.795H39.7284H39.6617H39.5949H39.5281H39.4611H39.3941H39.327H39.2598H39.1925H39.1251H39.0576H38.9901H38.9224H38.8547H38.7868H38.7189H38.6508H38.5827H38.5145H38.4461H38.3777H38.3092H38.2406H38.1719H38.103H38.0341H37.9651H37.896H37.8267H37.7574H37.688H37.6184H37.5488H37.479H37.4092H37.3392H37.2691H37.199H37.1287H37.0583H36.9878H36.9171H36.8464H36.7755H36.7046H36.6335H36.5623H36.491H36.4196H36.3481H36.2764H36.2046H36.1328H36.0607H35.9886H35.9164H35.844H35.7715H35.6989H35.6262H35.5533H35.4803H35.4072H35.334H35.2606H35.1872H35.1135H35.0398H34.9659H34.8919H34.8178H34.7436H34.6692H34.5947H34.52H34.4452H34.3703H34.2952H34.2201H34.1447H34.0693H33.9937H33.9179H33.8421H33.7661H33.6899H33.6136H33.5372H33.4606H33.3839H33.3071H33.2301H33.1529H33.0756H32.9982H32.9206H32.8429H32.765H32.687H32.6088H32.5305H32.452H32.3734H32.2946H32.2157H32.1367H32.0574H31.978H31.8985H31.8188H31.739H31.659H31.5788H31.4985H31.418H31.3374H31.2566H31.1757H31.0946H31.0133H30.9318H30.8503H30.7685H30.6866H30.6045H30.5222H30.4398H30.3572H30.2745H30.1915C30.0489 168.5 29.9693 168.466 29.9164 168.433C29.8553 168.394 29.7779 168.322 29.702 168.192C29.5361 167.906 29.4608 167.48 29.5197 167.111C30.9235 158.322 38.6474 151.574 47.9925 151.574C57.3375 151.574 65.0615 158.322 66.4652 167.111C66.5751 167.799 66.4037 168.054 66.3124 168.149C66.1888 168.278 65.8364 168.5 64.9935 168.5Z" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <circle cx="20" cy="141" r="10.5" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <path d="M36.9935 168.5H36.9126H36.8318H36.7512H36.6708H36.5905H36.5104H36.4304H36.3506H36.2709H36.1914H36.1121H36.0329H35.9538H35.8749H35.7962H35.7176H35.6392H35.5609H35.4828H35.4048H35.3269H35.2492H35.1717H35.0943H35.017H34.9399H34.8629H34.7861H34.7094H34.6329H34.5565H34.4802H34.4041H34.3281H34.2523H34.1766H34.101H34.0256H33.9503H33.8751H33.8001H33.7252H33.6504H33.5758H33.5013H33.4269H33.3527H33.2786H33.2046H33.1308H33.0571H32.9835H32.91H32.8367H32.7635H32.6904H32.6175H32.5446H32.4719H32.3993H32.3269H32.2545H32.1823H32.1102H32.0382H31.9664H31.8946H31.823H31.7515H31.6801H31.6088H31.5376H31.4666H31.3956H31.3248H31.2541H31.1835H31.113H31.0426H30.9724H30.9022H30.8322H30.7622H30.6924H30.6226H30.553H30.4835H30.4141H30.3448H30.2756H30.2065H30.1375H30.0686H29.9998H29.9311H29.8625H29.794H29.7256H29.6572H29.589H29.5209H29.4529H29.385H29.3172H29.2494H29.1818H29.1142H29.0468H28.9794H28.9121H28.8449H28.7779H28.7108H28.6439H28.5771H28.5103H28.4437H28.3771H28.3106H28.2442H28.1779H28.1117H28.0455H27.9794H27.9134H27.8475H27.7817H27.7159H27.6502H27.5846H27.5191H27.4537H27.3883H27.323H27.2578H27.1926H27.1275H27.0625H26.9976H26.9328H26.868H26.8032H26.7386H26.674H26.6095H26.5451H26.4807H26.4164H26.3521H26.2879H26.2238H26.1598H26.0958H26.0318H25.968H25.9042H25.8404H25.7767H25.7131H25.6495H25.586H25.5226H25.4592H25.3958H25.3325H25.2693H25.2061H25.143H25.0799H25.0169H24.9539H24.891H24.8281H24.7653H24.7025H24.6398H24.5771H24.5145H24.4519H24.3894H24.3269H24.2645H24.202H24.1397H24.0774H24.0151H23.9528H23.8907H23.8285H23.7664H23.7043H23.6423H23.5803H23.5183H23.4564H23.3945H23.3326H23.2708H23.209H23.1472H23.0855H23.0238H22.9621H22.9005H22.8389H22.7773H22.7157H22.6542H22.5927H22.5312H22.4698H22.4084H22.347H22.2856H22.2243H22.1629H22.1016H22.0404H21.9791H21.9178H21.8566H21.7954H21.7342H21.6731H21.6119H21.5508H21.4896H21.4285H21.3674H21.3064H21.2453H21.1842H21.1232H21.0622H21.0011H20.9401H20.8791H20.8181H20.7571H20.6962H20.6352H20.5742H20.5133H20.4523H20.3913H20.3304H20.2694H20.2085H20.1475H20.0866H20.0257H19.9647H19.9038H19.8428H19.7819H19.7209H19.6599H19.599H19.538H19.477H19.416H19.3551H19.2941H19.2331H19.172H19.111H19.05H18.9889H18.9279H18.8668H18.8057H18.7446H18.6835H18.6224H18.5612H18.5001H18.4389H18.3777H18.3165H18.2553H18.194H18.1328H18.0715H18.0102H17.9489H17.8875H17.8261H17.7647H17.7033H17.6418H17.5804H17.5189H17.4573H17.3958H17.3342H17.2726H17.2109H17.1493H17.0876H17.0258H16.9641H16.9023H16.8404H16.7786H16.7166H16.6547H16.5927H16.5307H16.4687H16.4066H16.3445H16.2823H16.2201H16.1578H16.0956H16.0332H15.9709H15.9084H15.846H15.7835H15.7209H15.6583H15.5957H15.533H15.4703H15.4075H15.3447H15.2818H15.2189H15.1559H15.0929H15.0298H14.9666H14.9034H14.8402H14.7769H14.7135H14.6501H14.5867H14.5231H14.4596H14.3959H14.3322H14.2685H14.2046H14.1408H14.0768H14.0128H13.9487H13.8846H13.8204H13.7562H13.6918H13.6274H13.563H13.4985H13.4339H13.3692H13.3045H13.2397H13.1748H13.1098H13.0448H12.9797H12.9146H12.8493H12.784H12.7186H12.6532H12.5876H12.522H12.4563H12.3905H12.3247H12.2588H12.1928H12.1267H12.0605H11.9942H11.9279H11.8615H11.795H11.7284H11.6617H11.5949H11.5281H11.4611H11.3941H11.327H11.2598H11.1925H11.1251H11.0576H10.9901H10.9224H10.8547H10.7868H10.7189H10.6508H10.5827H10.5145H10.4461H10.3777H10.3092H10.2406H10.1719H10.103H10.0341H9.9651H9.89597H9.82674H9.75741H9.68798H9.61843H9.54879H9.47904H9.40918H9.33921H9.26914H9.19896H9.12867H9.05826H8.98775H8.91713H8.8464H8.77555H8.70459H8.63351H8.56232H8.49102H8.4196H8.34807H8.27641H8.20464H8.13276H8.06075H7.98862H7.91638H7.84401H7.77152H7.69891H7.62617H7.55332H7.48034H7.40723H7.334H7.26064H7.18716H7.11355H7.03981H6.96594H6.89195H6.81782H6.74356H6.66918H6.59466H6.52H6.44522H6.3703H6.29525H6.22006H6.14474H6.06928H5.99368H5.91795H5.84208H5.76607H5.68992H5.61363H5.5372H5.46062H5.38391H5.30705H5.23005H5.15291H5.07562H4.99819H4.92061H4.84288H4.76501H4.68699H4.60882H4.5305H4.45203H4.37342H4.29465H4.21573H4.13665H4.05743H3.97805H3.89851H3.81882H3.73898H3.65898H3.57882H3.49851H3.41804H3.33741H3.25662H3.17566H3.09455H3.01328H2.93185H2.85025H2.76849H2.68657H2.60448H2.52223H2.43981H2.35722H2.27447H2.19155C2.04893 168.5 1.96927 168.466 1.91645 168.433C1.85532 168.394 1.77792 168.322 1.702 168.192C1.53613 167.906 1.46078 167.48 1.51975 167.111C2.92347 158.322 10.6474 151.574 19.9925 151.574C29.3375 151.574 37.0615 158.322 38.4652 167.111C38.5751 167.799 38.4037 168.054 38.3124 168.149C38.1888 168.278 37.8364 168.5 36.9935 168.5Z" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <circle cx="34" cy="154" r="10.5" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <path d="M50.9935 181.5H50.9126H50.8318H50.7512H50.6708H50.5905H50.5104H50.4304H50.3506H50.2709H50.1914H50.1121H50.0329H49.9538H49.8749H49.7962H49.7176H49.6392H49.5609H49.4828H49.4048H49.3269H49.2492H49.1717H49.0943H49.017H48.9399H48.8629H48.7861H48.7094H48.6329H48.5565H48.4802H48.4041H48.3281H48.2523H48.1766H48.101H48.0256H47.9503H47.8751H47.8001H47.7252H47.6504H47.5758H47.5013H47.4269H47.3527H47.2786H47.2046H47.1308H47.0571H46.9835H46.91H46.8367H46.7635H46.6904H46.6175H46.5446H46.4719H46.3993H46.3269H46.2545H46.1823H46.1102H46.0382H45.9664H45.8946H45.823H45.7515H45.6801H45.6088H45.5376H45.4666H45.3956H45.3248H45.2541H45.1835H45.113H45.0426H44.9724H44.9022H44.8322H44.7622H44.6924H44.6226H44.553H44.4835H44.4141H44.3448H44.2756H44.2065H44.1375H44.0686H43.9998H43.9311H43.8625H43.794H43.7256H43.6572H43.589H43.5209H43.4529H43.385H43.3172H43.2494H43.1818H43.1142H43.0468H42.9794H42.9121H42.8449H42.7779H42.7108H42.6439H42.5771H42.5103H42.4437H42.3771H42.3106H42.2442H42.1779H42.1117H42.0455H41.9794H41.9134H41.8475H41.7817H41.7159H41.6502H41.5846H41.5191H41.4537H41.3883H41.323H41.2578H41.1926H41.1275H41.0625H40.9976H40.9328H40.868H40.8032H40.7386H40.674H40.6095H40.5451H40.4807H40.4164H40.3521H40.2879H40.2238H40.1598H40.0958H40.0318H39.968H39.9042H39.8404H39.7767H39.7131H39.6495H39.586H39.5226H39.4592H39.3958H39.3325H39.2693H39.2061H39.143H39.0799H39.0169H38.9539H38.891H38.8281H38.7653H38.7025H38.6398H38.5771H38.5145H38.4519H38.3894H38.3269H38.2645H38.202H38.1397H38.0774H38.0151H37.9528H37.8907H37.8285H37.7664H37.7043H37.6423H37.5803H37.5183H37.4564H37.3945H37.3326H37.2708H37.209H37.1472H37.0855H37.0238H36.9621H36.9005H36.8389H36.7773H36.7157H36.6542H36.5927H36.5312H36.4698H36.4084H36.347H36.2856H36.2243H36.1629H36.1016H36.0404H35.9791H35.9178H35.8566H35.7954H35.7342H35.6731H35.6119H35.5508H35.4896H35.4285H35.3674H35.3064H35.2453H35.1842H35.1232H35.0622H35.0011H34.9401H34.8791H34.8181H34.7571H34.6962H34.6352H34.5742H34.5133H34.4523H34.3913H34.3304H34.2694H34.2085H34.1475H34.0866H34.0257H33.9647H33.9038H33.8428H33.7819H33.7209H33.6599H33.599H33.538H33.477H33.416H33.3551H33.2941H33.2331H33.172H33.111H33.05H32.9889H32.9279H32.8668H32.8057H32.7446H32.6835H32.6224H32.5612H32.5001H32.4389H32.3777H32.3165H32.2553H32.194H32.1328H32.0715H32.0102H31.9489H31.8875H31.8261H31.7647H31.7033H31.6418H31.5804H31.5189H31.4573H31.3958H31.3342H31.2726H31.2109H31.1493H31.0876H31.0258H30.9641H30.9023H30.8404H30.7786H30.7166H30.6547H30.5927H30.5307H30.4687H30.4066H30.3445H30.2823H30.2201H30.1578H30.0956H30.0332H29.9709H29.9084H29.846H29.7835H29.7209H29.6583H29.5957H29.533H29.4703H29.4075H29.3447H29.2818H29.2189H29.1559H29.0929H29.0298H28.9666H28.9034H28.8402H28.7769H28.7135H28.6501H28.5867H28.5231H28.4596H28.3959H28.3322H28.2685H28.2046H28.1408H28.0768H28.0128H27.9487H27.8846H27.8204H27.7562H27.6918H27.6274H27.563H27.4985H27.4339H27.3692H27.3045H27.2397H27.1748H27.1098H27.0448H26.9797H26.9146H26.8493H26.784H26.7186H26.6532H26.5876H26.522H26.4563H26.3905H26.3247H26.2588H26.1928H26.1267H26.0605H25.9942H25.9279H25.8615H25.795H25.7284H25.6617H25.5949H25.5281H25.4611H25.3941H25.327H25.2598H25.1925H25.1251H25.0576H24.9901H24.9224H24.8547H24.7868H24.7189H24.6508H24.5827H24.5145H24.4461H24.3777H24.3092H24.2406H24.1719H24.103H24.0341H23.9651H23.896H23.8267H23.7574H23.688H23.6184H23.5488H23.479H23.4092H23.3392H23.2691H23.199H23.1287H23.0583H22.9878H22.9171H22.8464H22.7755H22.7046H22.6335H22.5623H22.491H22.4196H22.3481H22.2764H22.2046H22.1328H22.0607H21.9886H21.9164H21.844H21.7715H21.6989H21.6262H21.5533H21.4803H21.4072H21.334H21.2606H21.1872H21.1135H21.0398H20.9659H20.8919H20.8178H20.7436H20.6692H20.5947H20.52H20.4452H20.3703H20.2952H20.2201H20.1447H20.0693H19.9937H19.9179H19.8421H19.7661H19.6899H19.6136H19.5372H19.4606H19.3839H19.3071H19.2301H19.1529H19.0756H18.9982H18.9206H18.8429H18.765H18.687H18.6088H18.5305H18.452H18.3734H18.2946H18.2157H18.1367H18.0574H17.978H17.8985H17.8188H17.739H17.659H17.5788H17.4985H17.418H17.3374H17.2566H17.1757H17.0946H17.0133H16.9318H16.8503H16.7685H16.6866H16.6045H16.5222H16.4398H16.3572H16.2745H16.1915C16.045 181.5 15.9628 181.465 15.9092 181.432C15.8479 181.394 15.772 181.324 15.6978 181.198C15.5354 180.922 15.4617 180.509 15.5193 180.153C16.9196 171.496 24.6325 164.823 33.9925 164.823C43.3524 164.823 51.0654 171.496 52.4657 180.153C52.574 180.823 52.4052 181.064 52.319 181.152C52.1962 181.279 51.8413 181.5 50.9935 181.5Z" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-</svg>
-`;
diff --git a/libs/assets/src/svg/svgs/totp.icon.ts b/libs/assets/src/svg/svgs/totp.icon.ts
deleted file mode 100644
index 00e96c93b6f..00000000000
--- a/libs/assets/src/svg/svgs/totp.icon.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const TOTPIcon = svgIcon`
-<svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="120"
-    height="62"
-    fill="none"
-    class="tw-text-primary-600"
-    role="img"
-    aria-label="[title]"
-  >
-    <title>TOTP Authenticator</title>
-    <rect width="35" height="12" x="50.324" y="21.5" stroke="currentColor" rx="6" />
-    <circle cx="55.324" cy="27.5" r="1.5" fill="currentColor" />
-    <circle cx="65.324" cy="27.5" r="1.5" fill="currentColor" />
-    <circle cx="75.324" cy="27.5" r="1.5" fill="currentColor" />
-    <circle cx="60.324" cy="27.5" r="1.5" fill="currentColor" />
-    <circle cx="70.324" cy="27.5" r="1.5" fill="currentColor" />
-    <circle cx="80.324" cy="27.5" r="1.5" fill="currentColor" />
-    <path
-      stroke="currentColor"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      stroke-width="2"
-      d="M52.703 61h34.706"
-    />
-    <path
-      stroke="currentColor"
-      stroke-linejoin="round"
-      stroke-width="2"
-      d="M63.932 51.166V61M75.16 51.166V61"
-    />
-    <path
-      stroke="currentColor"
-      stroke-width="2"
-      d="M38.952 51.166h64.894a6 6 0 0 0 6-6V7a6 6 0 0 0-6-6h-68a6 6 0 0 0-6 6v7.655"
-    />
-    <path
-      stroke="currentColor"
-      d="M38.692 46.517h62.999a4 4 0 0 0 4-4V9.552a4 4 0 0 0-4-4H38.537a4 4 0 0 0-4 4v5.103"
-    />
-    <path
-      stroke="currentColor"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      d="M32.284 27.382h11.064l-2.912-2.895M43.348 30.276H32.284l2.912 2.895"
-    />
-    <path
-      stroke="currentColor"
-      stroke-width="2"
-      d="M37.846 27.75V19a4 4 0 0 0-4-4h-18a4 4 0 0 0-4 4v38a4 4 0 0 0 4 4h18a4 4 0 0 0 4-4V30.5"
-    />
-    <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M24.806 18.5h.08" />
-    <path stroke="currentColor" d="M24.846 36a8 8 0 1 0 7.858 6.5" />
-    <path
-      fill="currentColor"
-      d="M21.547 45.36h1.02v-3.64l-1.221.584v-.626l1.215-.575h.657v4.258h1.007v.545h-2.678v-.545ZM25.793 45.358h2.23v.548h-2.948v-.548c.405-.424.76-.799 1.063-1.124a27 27 0 0 0 .627-.687c.216-.263.363-.475.438-.636.076-.164.114-.33.114-.5 0-.27-.08-.48-.24-.633-.158-.153-.376-.23-.653-.23a1.99 1.99 0 0 0-.621.107 3.493 3.493 0 0 0-.69.323v-.658c.224-.106.443-.185.657-.24.217-.053.43-.08.64-.08.475 0 .856.126 1.145.378.29.25.435.578.435.984 0 .207-.049.413-.146.62a3.005 3.005 0 0 1-.468.684c-.122.14-.298.334-.53.581-.23.248-.58.618-1.053 1.11Z"
-    />
-  </svg>
-`;
diff --git a/libs/assets/src/svg/svgs/two-factor-auth-authenticator.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-authenticator.icon.ts
index 8e4e381eeb9..622875b59f2 100644
--- a/libs/assets/src/svg/svgs/two-factor-auth-authenticator.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-authenticator.icon.ts
@@ -1,39 +1,21 @@
 import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthAuthenticatorIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
-    <g clip-path="url(#two-factor-auth-authenticator-clip)">
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M47.967 84.718c0-.37.3-.67.67-.67h42.904a.67.67 0 1 1 0 1.34H48.637a.67.67 0 0 1-.67-.67Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M63.4 84.848V72.111h1.34v12.737H63.4ZM77.073 84.848V72.111h1.341v12.737h-1.34Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M20.482 14.999a6.704 6.704 0 0 1 6.703-6.704h85.808A6.704 6.704 0 0 1 119.697 15v50.949a6.704 6.704 0 0 1-6.704 6.703H35.565V69.97h77.428c2.222 0 4.023-1.801 4.023-4.022V14.999a4.022 4.022 0 0 0-4.023-4.022H27.185a4.022 4.022 0 0 0-4.022 4.022v11.732h-2.681V14.999Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M25.845 15.67c0-1.111.9-2.012 2.01-2.012h84.468c1.111 0 2.011.9 2.011 2.011v49.608c0 1.11-.9 2.011-2.011 2.011H35.23v-1.34h77.093c.37 0 .67-.3.67-.67V15.668c0-.37-.3-.67-.67-.67H27.856c-.37 0-.67.3-.67.67v11.062h-1.341V15.669Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M-.3 33.1a8.045 8.045 0 0 1 8.045-8.045h21.452a8.045 8.045 0 0 1 8.044 8.044v17.43H34.56v-17.43a5.363 5.363 0 0 0-5.363-5.363H7.745A5.363 5.363 0 0 0 2.382 33.1v50.949a5.363 5.363 0 0 0 5.363 5.363h21.452a5.363 5.363 0 0 0 5.363-5.363V53.546h2.681v30.502a8.045 8.045 0 0 1-8.044 8.044H7.745A8.044 8.044 0 0 1-.3 84.048V33.099Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M17.13 32.429c0-.37.3-.67.67-.67h1.326a.67.67 0 1 1 0 1.34H17.8a.67.67 0 0 1-.67-.67Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-accent" fill-rule="evenodd"
-            d="M39.598 46.024a.67.67 0 0 1 .948.017l3.881 4.022a.67.67 0 0 1-.482 1.136H29.197a.67.67 0 0 1 0-1.34h13.17l-2.786-2.887a.67.67 0 0 1 .017-.948ZM32.947 58.162a.67.67 0 0 1-.948-.017l-3.88-4.022a.67.67 0 0 1 .482-1.136h14.748a.67.67 0 1 1 0 1.34h-13.17l2.785 2.887a.67.67 0 0 1-.017.948ZM44.615 41.144a8.715 8.715 0 0 1 8.715-8.715h37.541a8.715 8.715 0 0 1 0 17.43H53.33a8.715 8.715 0 0 1-8.715-8.715Zm8.715-7.374a7.374 7.374 0 0 0 0 14.748h37.541a7.374 7.374 0 0 0 0-14.748H53.33Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M10.761 61.682a13.408 13.408 0 0 1 7.71-2.438v2.681a10.726 10.726 0 0 0-6.838 18.99l-.854 1.034.854-1.033A10.726 10.726 0 0 0 29.007 70.64l2.634-.502a13.407 13.407 0 1 1-20.879-8.457Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-accent"
-            d="M13.411 75.183h1.537v-5.472l-1.84.878v-.941l1.83-.864h.989v6.4h1.517v.82h-4.033v-.82ZM19.806 75.178h3.357v.825h-4.44v-.825c.611-.637 1.145-1.2 1.601-1.688.457-.488.772-.833.945-1.033.326-.395.547-.713.66-.956.115-.246.172-.496.172-.752 0-.404-.12-.721-.362-.95-.238-.23-.566-.345-.984-.345-.297 0-.608.053-.935.16a5.264 5.264 0 0 0-1.037.485v-.99c.336-.158.665-.278.988-.359.327-.08.648-.121.964-.121.715 0 1.29.19 1.723.568.438.375.656.868.656 1.48 0 .31-.073.62-.22.93-.144.311-.378.654-.705 1.03-.183.21-.448.5-.798.873-.345.371-.874.928-1.585 1.668ZM53.79 37.121c.816 0 1.432.34 1.849 1.016.42.678.629 1.68.629 3.007 0 1.327-.21 2.329-.63 3.006-.416.677-1.032 1.016-1.847 1.016-.816 0-1.431-.339-1.848-1.016-.416-.677-.624-1.68-.624-3.006 0-1.327.208-2.33.624-3.007.416-.677 1.032-1.016 1.848-1.016Zm0 7.211c.485 0 .845-.262 1.08-.787.24-.524.359-1.325.359-2.401 0-.573-.034-1.091-.102-1.553l-2.437 3.882c.256.573.623.86 1.1.86Zm0-6.377c-.48 0-.84.262-1.08.787-.235.524-.352 1.325-.352 2.402 0 .49.032.948.097 1.375l2.385-3.871c-.26-.462-.609-.693-1.05-.693ZM60.106 37.121c.816 0 1.432.34 1.848 1.016.42.678.63 1.68.63 3.007 0 1.327-.21 2.329-.63 3.006-.416.677-1.032 1.016-1.848 1.016-.815 0-1.43-.339-1.847-1.016-.416-.677-.624-1.68-.624-3.006 0-1.327.208-2.33.624-3.007.416-.677 1.032-1.016 1.847-1.016Zm0 7.211c.485 0 .845-.262 1.08-.787.24-.524.359-1.325.359-2.401 0-.573-.035-1.091-.103-1.553l-2.436 3.882c.256.573.623.86 1.1.86Zm0-6.377c-.48 0-.84.262-1.08.787-.235.524-.353 1.325-.353 2.402 0 .49.033.948.098 1.375l2.385-3.871c-.26-.462-.61-.693-1.05-.693ZM66.422 37.121c.816 0 1.431.34 1.848 1.016.42.678.63 1.68.63 3.007 0 1.327-.21 2.329-.63 3.006-.416.677-1.032 1.016-1.848 1.016-.815 0-1.431-.339-1.847-1.016-.417-.677-.625-1.68-.625-3.006 0-1.327.208-2.33.624-3.007.417-.677 1.033-1.016 1.848-1.016Zm0 7.211c.485 0 .845-.262 1.08-.787.239-.524.358-1.325.358-2.401 0-.573-.034-1.091-.102-1.553l-2.436 3.882c.256.573.622.86 1.1.86Zm0-6.377c-.481 0-.84.262-1.08.787-.235.524-.353 1.325-.353 2.402 0 .49.032.948.097 1.375l2.385-3.871c-.259-.462-.609-.693-1.049-.693ZM76.433 37.121c.815 0 1.431.34 1.848 1.016.42.678.63 1.68.63 3.007 0 1.327-.21 2.329-.63 3.006-.417.677-1.033 1.016-1.848 1.016-.816 0-1.431-.339-1.848-1.016-.416-.677-.624-1.68-.624-3.006 0-1.327.208-2.33.624-3.007.417-.677 1.033-1.016 1.848-1.016Zm0 7.211c.484 0 .844-.262 1.08-.787.239-.524.358-1.325.358-2.401 0-.573-.034-1.091-.102-1.553l-2.436 3.882c.255.573.622.86 1.1.86Zm0-6.377c-.481 0-.841.262-1.08.787-.235.524-.353 1.325-.353 2.402 0 .49.032.948.097 1.375l2.385-3.871c-.26-.462-.609-.693-1.049-.693ZM82.749 37.121c.815 0 1.43.34 1.847 1.016.42.678.63 1.68.63 3.007 0 1.327-.21 2.329-.63 3.006-.416.677-1.032 1.016-1.847 1.016-.816 0-1.432-.339-1.848-1.016-.416-.677-.624-1.68-.624-3.006 0-1.327.208-2.33.624-3.007.416-.677 1.032-1.016 1.848-1.016Zm0 7.211c.484 0 .844-.262 1.08-.787.238-.524.358-1.325.358-2.401 0-.573-.034-1.091-.103-1.553l-2.436 3.882c.256.573.623.86 1.1.86Zm0-6.377c-.481 0-.841.262-1.08.787-.236.524-.353 1.325-.353 2.402 0 .49.032.948.097 1.375l2.385-3.871c-.26-.462-.61-.693-1.05-.693ZM89.064 37.121c.816 0 1.432.34 1.848 1.016.42.678.63 1.68.63 3.007 0 1.327-.21 2.329-.63 3.006-.416.677-1.032 1.016-1.848 1.016-.815 0-1.431-.339-1.847-1.016-.417-.677-.625-1.68-.625-3.006 0-1.327.208-2.33.625-3.007.416-.677 1.032-1.016 1.847-1.016Zm0 7.211c.485 0 .845-.262 1.08-.787.239-.524.358-1.325.358-2.401 0-.573-.034-1.091-.102-1.553l-2.436 3.882c.256.573.623.86 1.1.86Zm0-6.377c-.48 0-.84.262-1.08.787-.235.524-.353 1.325-.353 2.402 0 .49.033.948.097 1.375l2.385-3.871c-.259-.462-.609-.693-1.049-.693Z" />
-    </g>
-    <defs>
-        <clipPath id="two-factor-auth-authenticator-clip">
-            <path fill="#fff" d="M0 0h120v100H0z" />
-        </clipPath>
-    </defs>
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 10 80 66.67">
+    <path class="tw-fill-illustration-bg-secondary" d="M13.333 15a5 5 0 0 1 5-5H75a5 5 0 0 1 5 5v40a5 5 0 0 1-5 5H18.333a5 5 0 0 1-5-5V15Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M75 11.667H18.333A3.333 3.333 0 0 0 15 15v40a3.333 3.333 0 0 0 3.333 3.333H75A3.333 3.333 0 0 0 78.333 55V15A3.333 3.333 0 0 0 75 11.667ZM18.333 10a5 5 0 0 0-5 5v40a5 5 0 0 0 5 5H75a5 5 0 0 0 5-5V15a5 5 0 0 0-5-5H18.333Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M79.167 20h-65v-1.667h65V20Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M76.667 15a1.667 1.667 0 1 1-3.334 0 1.667 1.667 0 0 1 3.334 0ZM71.667 15a1.667 1.667 0 1 1-3.334 0 1.667 1.667 0 0 1 3.334 0ZM66.667 15a1.667 1.667 0 1 1-3.334 0 1.667 1.667 0 0 1 3.334 0Z"/>
+    <path class="tw-fill-illustration-tertiary" d="M15 37.5a6.667 6.667 0 0 1 6.667-6.667H65a6.667 6.667 0 0 1 6.667 6.667v3.333A6.667 6.667 0 0 1 65 47.5H21.667A6.667 6.667 0 0 1 15 40.833V37.5Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M65 32.5H21.667a5 5 0 0 0-5 5v3.333a5 5 0 0 0 5 5H65a5 5 0 0 0 5-5V37.5a5 5 0 0 0-5-5Zm-43.333-1.667A6.667 6.667 0 0 0 15 37.5v3.333a6.667 6.667 0 0 0 6.667 6.667H65a6.667 6.667 0 0 0 6.667-6.667V37.5A6.667 6.667 0 0 0 65 30.833H21.667Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M24.167 40.834v-3.137l-2.333 4.665a1.667 1.667 0 0 0 2.332-1.528Zm-3.334-.197 2.333-4.665a1.667 1.667 0 0 0-2.332 1.528v3.137Zm5-3.137a3.333 3.333 0 0 0-6.666 0v3.334a3.333 3.333 0 0 0 6.666 0V37.5Zm6.667.197v3.137a1.667 1.667 0 0 1-2.332 1.528l2.332-4.665Zm-1-1.725-2.333 4.665V37.5a1.667 1.667 0 0 1 2.332-1.528Zm-.667-1.805a3.333 3.333 0 0 1 3.334 3.333v3.334a3.333 3.333 0 1 1-6.667 0V37.5a3.333 3.333 0 0 1 3.333-3.333Zm10 6.667v-3.137l-2.332 4.665a1.667 1.667 0 0 0 2.332-1.528Zm-3.333-.197 2.333-4.665A1.667 1.667 0 0 0 37.5 37.5v3.137Zm5-3.137a3.333 3.333 0 0 0-6.667 0v3.334a3.333 3.333 0 0 0 6.667 0V37.5Zm6.667.197v3.137a1.667 1.667 0 0 1-2.333 1.528l2.333-4.665Zm-1.001-1.725-2.333 4.665V37.5a1.667 1.667 0 0 1 2.333-1.528Zm-.666-1.805a3.333 3.333 0 0 1 3.333 3.333v3.334a3.333 3.333 0 0 1-6.666 0V37.5a3.333 3.333 0 0 1 3.333-3.333Zm10 6.667v-3.137l-2.332 4.665a1.667 1.667 0 0 0 2.333-1.528Zm-3.333-.197 2.332-4.665a1.667 1.667 0 0 0-2.333 1.528v3.137Zm5-3.137a3.333 3.333 0 1 0-6.667 0v3.334a3.333 3.333 0 0 0 6.667 0V37.5Zm6.666 3.334v-3.137l-2.332 4.665a1.667 1.667 0 0 0 2.332-1.528Zm-3.333-.197 2.333-4.665A1.667 1.667 0 0 0 62.5 37.5v3.137Zm5-3.137a3.333 3.333 0 0 0-6.667 0v3.334a3.333 3.333 0 0 0 6.667 0V37.5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M0 23.333a5 5 0 0 1 5-5h24.167a5 5 0 0 1 5 5v48.333a5 5 0 0 1-5 5H5a5 5 0 0 1-5-5V23.333Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M29.167 20H5a3.333 3.333 0 0 0-3.333 3.333v48.333A3.333 3.333 0 0 0 5 75h24.167a3.333 3.333 0 0 0 3.333-3.334V23.333A3.333 3.333 0 0 0 29.167 20ZM5 18.333a5 5 0 0 0-5 5v48.333a5 5 0 0 0 5 5h24.167a5 5 0 0 0 5-5V23.333a5 5 0 0 0-5-5H5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M6.667 33.75a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0Zm3.333 0a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0ZM12.083 35a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm11.667 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm-3.333 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm-3.334 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M6.667 33.75a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0Zm3.333 0a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0ZM12.083 35a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm11.667 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm-3.333 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm-3.334 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M6.667 42.917a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0Zm3.333 0a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0Zm2.083 1.25a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm11.667 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm-3.333 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm-3.334 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M6.667 42.917a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0Zm3.333 0a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0Zm2.083 1.25a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm11.667 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm-3.333 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm-3.334 0a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M13.333 23.333c0-.46.373-.833.834-.833H20a.833.833 0 1 1 0 1.667h-5.833a.833.833 0 0 1-.834-.834Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M16.25 54.166a7.083 7.083 0 1 0 7.083 7.084 1.667 1.667 0 1 1 3.334 0c0 5.753-4.664 10.416-10.417 10.416S5.833 67.003 5.833 61.25s4.664-10.417 10.417-10.417a1.667 1.667 0 1 1 0 3.333Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/two-factor-auth-email.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-email.icon.ts
index 71ffc099e58..20709a8a1e1 100644
--- a/libs/assets/src/svg/svgs/two-factor-auth-email.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-email.icon.ts
@@ -1,18 +1,18 @@
 import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthEmailIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
-    <path class="tw-fill-art-primary" fill-rule="evenodd"
-        d="M56.791 3.994a4.8 4.8 0 0 1 5.714-.02l10.651 7.83h21.69a2.88 2.88 0 0 1 2.88 2.88V29.87l9.277 6.821a4.798 4.798 0 0 1 1.957 3.867v51.6a4.8 4.8 0 0 1-4.8 4.8H15.84a4.8 4.8 0 0 1-4.8-4.8V40.542a4.8 4.8 0 0 1 1.93-3.847l9.304-6.943V14.685a2.88 2.88 0 0 1 2.88-2.88h21.17l10.467-7.81Zm-7.256 7.81h20.38l-8.547-6.283a2.88 2.88 0 0 0-3.428.012l-8.405 6.272Zm-27.26 20.343-8.157 6.086a2.88 2.88 0 0 0-1.158 2.308v.162a.957.957 0 0 1 .371.127l8.943 5.295V32.147Zm1.92 15.114 23.887 14.145c.316-.046.637-.07.961-.07h20.368c.778 0 1.542.136 2.262.393l24.133-14.412V14.685a.96.96 0 0 0-.96-.96H25.154a.96.96 0 0 0-.96.96V47.26Zm73.531-1.091 8.939-5.339a.952.952 0 0 1 .375-.128v-.145a2.88 2.88 0 0 0-1.174-2.32l-8.14-5.985V46.17ZM12.96 92.159V42.84L45.7 62.227c-.47.27-.91.598-1.308.98L13.144 93.174a2.876 2.876 0 0 1-.184-1.015Zm94.08-49.315L73.609 62.809c.122.098.241.2.357.307l32.81 30.249a2.86 2.86 0 0 0 .264-1.206V42.844Zm-91.2 52.195a2.866 2.866 0 0 1-1.456-.395l31.337-30.052a4.8 4.8 0 0 1 3.322-1.335h20.368a4.8 4.8 0 0 1 3.253 1.27l32.773 30.214c-.385.19-.819.298-1.277.298H15.84Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-accent" fill-rule="evenodd"
-        d="M42.729 27.585h34.476a9.204 9.204 0 1 1 0 18.409H42.73a9.204 9.204 0 0 1 0-18.409Zm0 .96a8.244 8.244 0 0 0 0 16.489h34.476a8.244 8.244 0 0 0 0-16.489H42.73Z"
-        clip-rule="evenodd" />
-    <circle cx="41.23" cy="36.789" r="2.248" class="tw-fill-art-accent" />
-    <circle cx="56.22" cy="36.789" r="2.248" class="tw-fill-art-accent" />
-    <circle cx="71.209" cy="36.789" r="2.248" class="tw-fill-art-accent" />
-    <circle cx="48.725" cy="36.789" r="2.248" class="tw-fill-art-accent" />
-    <circle cx="63.715" cy="36.789" r="2.248" class="tw-fill-art-accent" />
-    <circle cx="78.704" cy="36.789" r="2.248" class="tw-fill-art-accent" />
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="3.33 0.46 73.33 76.8">
+    <path class="tw-fill-illustration-bg-primary" d="M3.333 32.89a5 5 0 0 1 1.745-3.796L37.287 1.46a4.167 4.167 0 0 1 5.426 0l32.21 27.635a5 5 0 0 1 1.744 3.794v41.035a3.333 3.333 0 0 1-3.334 3.334H6.667a3.333 3.333 0 0 1-3.334-3.334V32.89Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M75 73.924V32.89c0-.972-.425-1.896-1.163-2.53L41.627 2.725a2.5 2.5 0 0 0-3.255 0L6.162 30.36A3.333 3.333 0 0 0 5 32.89v41.035c0 .92.746 1.667 1.667 1.667h66.666c.92 0 1.667-.746 1.667-1.667ZM5.078 29.094a5 5 0 0 0-1.745 3.795v41.035a3.333 3.333 0 0 0 3.334 3.334h66.666a3.333 3.333 0 0 0 3.334-3.334V32.89a5 5 0 0 0-1.745-3.795L42.713 1.46a4.167 4.167 0 0 0-5.426 0L5.077 29.095Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M5.793 32.464a2.5 2.5 0 0 1-.113-3.886L37.287 1.46a4.167 4.167 0 0 1 5.426 0L74.32 28.578a2.5 2.5 0 0 1-.114 3.886L42.02 56.97a3.333 3.333 0 0 1-4.038 0L5.793 32.464Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="m41.01 55.644 32.187-24.506a.833.833 0 0 0 .038-1.295L41.628 2.725a2.5 2.5 0 0 0-3.256 0L6.765 29.843a.833.833 0 0 0 .038 1.295L38.99 55.644a1.667 1.667 0 0 0 2.02 0ZM5.68 28.578a2.5 2.5 0 0 0 .113 3.886L37.981 56.97a3.333 3.333 0 0 0 4.038 0l32.187-24.506a2.5 2.5 0 0 0 .114-3.886L42.713 1.46a4.167 4.167 0 0 0-5.426 0L5.68 28.578Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M41.98 54.761a3.333 3.333 0 0 1-3.96 0L5.496 30.754a.833.833 0 1 0-.99 1.341l32.526 24.007a5 5 0 0 0 5.938 0l32.526-24.007a.833.833 0 0 0-.99-1.341L41.98 54.761Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M12.5 9.758h55V38.09L40.999 57.766a1.667 1.667 0 0 1-1.994-.004L12.5 37.882V9.759Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M65.833 11.425H14.167v25.624l25.838 19.38 25.828-19.176V11.425ZM67.5 38.09 40.999 57.766a1.667 1.667 0 0 1-1.994-.004L12.5 37.882V9.759h55V38.09Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="m40 49.758 18.333 10.416L40 70.591 21.667 60.175 40 49.758Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M42.02 51.51a3.333 3.333 0 0 0-4.04 0L5.505 76.254a.833.833 0 1 1-1.01-1.325L36.97 50.185a5 5 0 0 1 6.06 0l-.494.648.494-.648 32.475 24.743a.833.833 0 0 1-1.01 1.325L42.02 51.511Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M21.667 29.757a5.833 5.833 0 0 1 5.833-5.833h25a5.833 5.833 0 0 1 0 11.666h-25a5.833 5.833 0 0 1-5.833-5.833Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M52.5 25.59h-25a4.167 4.167 0 0 0 0 8.334h25a4.167 4.167 0 1 0 0-8.334Zm-25-1.666a5.833 5.833 0 1 0 0 11.666h25a5.833 5.833 0 0 0 0-11.666h-25Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M27.5 31.424a1.667 1.667 0 1 0 0-3.333 1.667 1.667 0 0 0 0 3.333Zm5 0a1.667 1.667 0 1 0 0-3.333 1.667 1.667 0 0 0 0 3.333Zm6.667-1.666a1.667 1.667 0 1 1-3.334 0 1.667 1.667 0 0 1 3.334 0Zm3.333 1.666a1.667 1.667 0 1 0 0-3.333 1.667 1.667 0 0 0 0 3.333Zm6.667-1.666a1.667 1.667 0 1 1-3.334 0 1.667 1.667 0 0 1 3.334 0Zm3.333 1.666a1.667 1.667 0 1 0 0-3.333 1.667 1.667 0 0 0 0 3.333Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/two-factor-auth-security-key-failed.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-security-key-failed.icon.ts
new file mode 100644
index 00000000000..0e467bf1901
--- /dev/null
+++ b/libs/assets/src/svg/svgs/two-factor-auth-security-key-failed.icon.ts
@@ -0,0 +1,17 @@
+import { svgIcon } from "../icon-service";
+
+export const TwoFactorAuthSecurityKeyFailedIcon = svgIcon`
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="4.72 12.85 92 80">
+    <path class="tw-fill-illustration-bg-primary" d="M16.722 18.846a6 6 0 0 1 6-6h68a6 6 0 0 1 6 6v48a6 6 0 0 1-6 6h-68a6 6 0 0 1-6-6v-48Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M90.722 14.846h-68a4 4 0 0 0-4 4v48a4 4 0 0 0 4 4h68a4 4 0 0 0 4-4v-48a4 4 0 0 0-4-4Zm-68-2a6 6 0 0 0-6 6v48a6 6 0 0 0 6 6h68a6 6 0 0 0 6-6v-48a6 6 0 0 0-6-6h-68Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M54.732 34.216c1.353-2.327 4.713-2.327 6.066 0L72.24 53.898c1.36 2.34-.327 5.272-3.033 5.272H46.321c-2.705 0-4.392-2.933-3.032-5.272l11.443-19.682Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M70.512 54.904 59.07 35.22c-.582-1-2.026-1-2.608 0L45.018 54.904a1.508 1.508 0 0 0 1.303 2.266h22.887a1.508 1.508 0 0 0 1.304-2.266Zm-9.714-20.688c-1.353-2.327-4.713-2.327-6.066 0L43.288 53.898c-1.36 2.34.328 5.272 3.033 5.272h22.887c2.706 0 4.393-2.933 3.033-5.272L60.798 34.216Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M59.168 53.557a1.403 1.403 0 1 1-2.806 0 1.403 1.403 0 0 1 2.806 0ZM55.702 41.315a.35.35 0 0 1 .348-.388h3.43a.35.35 0 0 1 .348.388l-.977 9.121a.35.35 0 0 1-.349.314h-1.474a.35.35 0 0 1-.35-.314l-.976-9.121Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M95.722 24.846h-78v-2h78v2Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M92.722 18.846a2 2 0 1 1-4 0 2 2 0 0 1 4 0ZM86.722 18.846a2 2 0 1 1-4 0 2 2 0 0 1 4 0ZM80.722 18.846a2 2 0 1 1-4 0 2 2 0 0 1 4 0ZM9.722 31.846a2 2 0 0 1 2-2h15a2 2 0 0 1 2 2v15h-19v-15Z"/>
+    <path class="tw-fill-illustration-tertiary" d="M12.722 32.846h3v11h-3v-11ZM17.722 34.846h3v9h-3v-9ZM22.722 32.846h3v11h-3v-11Z"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M8.722 44.846a4 4 0 0 0-4 4v40a4 4 0 0 0 4 4h21a4 4 0 0 0 4-4v-40a4 4 0 0 0-4-4h-21Zm10.5 36a2.5 2.5 0 1 1 0 5 2.5 2.5 0 0 1 0-5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M8.722 46.846a2 2 0 0 0-2 2v40a2 2 0 0 0 2 2h21a2 2 0 0 0 2-2v-40a2 2 0 0 0-2-2h-21Zm10.5 32a4.5 4.5 0 1 1 0 9 4.5 4.5 0 0 1 0-9Zm-14.5-30a4 4 0 0 1 4-4h21a4 4 0 0 1 4 4v40a4 4 0 0 1-4 4h-21a4 4 0 0 1-4-4v-40Zm17 34.5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" fill-rule="evenodd" d="M19.222 72.846a7.5 7.5 0 1 0 0-15 7.5 7.5 0 0 0 0 15Zm0 2a9.5 9.5 0 1 0 0-19 9.5 9.5 0 0 0 0 19Z" clip-rule="evenodd"/>
+  </svg>
+`;
diff --git a/libs/assets/src/svg/svgs/two-factor-auth-security-key.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-security-key.icon.ts
index 30ef25baabb..f10068b735b 100644
--- a/libs/assets/src/svg/svgs/two-factor-auth-security-key.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-security-key.icon.ts
@@ -1,52 +1,20 @@
 import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthSecurityKeyIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
-    <g clip-path="url(#two-factor-auth-security-key-clip-1)">
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M22.852 21.578H6.656v16.365h16.196V21.578ZM5.183 20.09v19.34h19.142V20.09H5.183Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M.03 39.431c0-1.643 1.318-2.975 2.945-2.975h23.558c1.627 0 2.945 1.332 2.945 2.975v5.207h-2.945v-5.207H2.975v12.458l1.255 1.598c.413.526.638 1.178.638 1.85v16.517c0 .725-.262 1.424-.736 1.968l-1.157 1.326v13.378h23.558V75.148l-1.157-1.326a2.993 2.993 0 0 1-.736-1.968V55.337c0-.672.225-1.324.638-1.85l1.255-1.598V49.1h2.945v2.788c0 .671-.225 1.323-.638 1.85l-1.255 1.598v16.517l1.157 1.326c.474.544.736 1.243.736 1.968v13.378c0 1.644-1.318 2.976-2.945 2.976H2.975C1.348 91.502.03 90.17.03 88.526V75.148c0-.725.262-1.424.736-1.968l1.157-1.326V55.337L.668 53.738a2.995 2.995 0 0 1-.638-1.85V39.432Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-accent" fill-rule="evenodd"
-            d="M30.8 38.884a.731.731 0 0 1 1.04.043l4.07 4.464a.75.75 0 0 1 .132.802.736.736 0 0 1-.674.445h-15.46a.74.74 0 0 1-.737-.744c0-.41.33-.743.736-.743H33.69l-2.931-3.216a.75.75 0 0 1 .042-1.051ZM24.557 53.368a.73.73 0 0 1-1.04-.043l-4.069-4.463a.75.75 0 0 1-.133-.803.736.736 0 0 1 .675-.445h15.46a.74.74 0 0 1 .736.744.74.74 0 0 1-.736.744H21.669l2.93 3.215a.75.75 0 0 1-.042 1.051Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M42.452 91.904c0-.411.33-.744.736-.744h46.416a.74.74 0 0 1 .736.744.74.74 0 0 1-.736.744H43.188a.74.74 0 0 1-.736-.744Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M57.47 91.903V78.257h1.472v13.646H57.47ZM72.486 91.903V78.257h1.472v13.646h-1.472Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M11.81 17.859c0-5.752 4.614-10.414 10.306-10.414h87.608c5.692 0 10.307 4.662 10.307 10.414v50.583c0 5.752-4.615 10.414-10.307 10.414H29.11v-2.975h80.614c4.066 0 7.362-3.33 7.362-7.439V17.86c0-4.108-3.296-7.439-7.362-7.439H22.116c-4.066 0-7.362 3.33-7.362 7.439v3.72H11.81v-3.72Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M18.435 18.603c0-2.465 1.978-4.463 4.417-4.463h86.136c2.439 0 4.417 1.998 4.417 4.463V67.7c0 2.465-1.978 4.463-4.417 4.463H26.901v-1.488h82.087c1.626 0 2.945-1.332 2.945-2.975V18.603c0-1.643-1.319-2.975-2.945-2.975H22.852c-1.626 0-2.945 1.332-2.945 2.975v2.232h-1.472v-2.232Z"
-            clip-rule="evenodd" />
-        <g clip-path="url(#two-factor-auth-security-key-clip-2)">
-            <path class="tw-fill-art-accent"
-                d="M67.118 46.886a1.062 1.062 0 0 0-.138-.531 1.037 1.037 0 0 0-.381-.386 1.006 1.006 0 0 0-1.037.018 1.059 1.059 0 0 0-.324 1.46c.099.156.237.283.4.366v1.716a.48.48 0 0 0 .126.347.461.461 0 0 0 .333.147.446.446 0 0 0 .333-.147.482.482 0 0 0 .125-.347V47.81c.168-.086.31-.219.409-.382.099-.163.152-.35.154-.543Zm5.37-6.916h-.565a.337.337 0 0 1-.312-.215.358.358 0 0 1-.026-.133v-.255a5.896 5.896 0 0 0-1.374-3.901 5.645 5.645 0 0 0-3.567-1.972 5.4 5.4 0 0 0-2.268.263c-.73.248-1.4.65-1.97 1.181a5.634 5.634 0 0 0-1.332 1.896 5.75 5.75 0 0 0-.468 2.286v.413c0 .008-.03.434-.392.44h-.509a1.686 1.686 0 0 0-1.203.514c-.32.328-.498.772-.497 1.234v10.37c0 .463.178.907.497 1.234.318.328.75.515 1.203.518h12.783c.452-.003.884-.189 1.202-.517.319-.328.497-.772.497-1.234V41.721a1.776 1.776 0 0 0-.495-1.235 1.71 1.71 0 0 0-.552-.38 1.665 1.665 0 0 0-.653-.136h.001Zm-10.637-.85a4.442 4.442 0 0 1 .41-1.877 4.346 4.346 0 0 1 1.16-1.515 4.218 4.218 0 0 1 1.685-.855 4.17 4.17 0 0 1 1.881-.029 4.335 4.335 0 0 1 2.436 1.596c.61.8.934 1.79.918 2.806v.376a.358.358 0 0 1-.1.246.336.336 0 0 1-.24.102h-7.63a.468.468 0 0 1-.352-.115.51.51 0 0 1-.169-.336v-.399h.001Zm11.091 12.97a.477.477 0 0 1-.133.332.45.45 0 0 1-.322.139H59.705a.445.445 0 0 1-.323-.139.46.46 0 0 1-.132-.331V41.72a.474.474 0 0 1 .132-.331.456.456 0 0 1 .321-.138h12.784c.121 0 .237.05.322.138a.473.473 0 0 1 .133.33v10.37Z" />
-        </g>
-        <path class="tw-fill-art-primary" fill-rule="evenodd"
-            d="M13.281 25.298h-3.68V23.81h3.68v1.488ZM19.907 25.298h-3.68V23.81h3.68v1.488Z"
-            clip-rule="evenodd" />
-        <path class="tw-stroke-art-accent" stroke-width=".784"
-            d="M20.079 63.907c0 2.913-2.336 5.267-5.21 5.267-2.872 0-5.208-2.355-5.208-5.268s2.336-5.267 5.209-5.267c2.873 0 5.209 2.354 5.209 5.267Z" />
-        <path class="tw-fill-art-accent" fill-rule="evenodd"
-            d="M11.37 63.14a.378.378 0 0 0 0 .53c.146.146.38.146.525 0a4.442 4.442 0 0 1 6.329 0c.145.146.38.146.524 0a.377.377 0 0 0 0-.53 5.179 5.179 0 0 0-7.377 0Z"
-            clip-rule="evenodd" />
-        <path class="tw-fill-art-accent" fill-rule="evenodd"
-            d="M12.357 64.724a.377.377 0 0 0 0 .53c.145.147.38.147.525 0a3.057 3.057 0 0 1 4.355 0c.145.147.38.147.525 0a.378.378 0 0 0 0-.53 3.794 3.794 0 0 0-5.405 0Z"
-            clip-rule="evenodd" />
-    </g>
-    <defs>
-        <clipPath id="two-factor-auth-security-key-clip-1">
-            <path fill="#fff" d="M0 0h120v100H0z" />
-        </clipPath>
-        <clipPath id="two-factor-auth-security-key-clip-2">
-            <path fill="#fff" d="M56.014 33.468h20.165v20.375H56.014z" />
-        </clipPath>
-    </defs>
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="3.33 10 71.27 66.67">
+    <path class="tw-fill-illustration-bg-primary" d="M19.6 14.8a4.8 4.8 0 0 1 4.8-4.8h45.4a4.8 4.8 0 0 1 4.8 4.8v32.067a4.8 4.8 0 0 1-4.8 4.8H24.4a4.8 4.8 0 0 1-4.8-4.8V14.8Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M69.8 11.6H24.4a3.2 3.2 0 0 0-3.2 3.2v32.067a3.2 3.2 0 0 0 3.2 3.2h45.4a3.2 3.2 0 0 0 3.2-3.2V14.8a3.2 3.2 0 0 0-3.2-3.2ZM24.4 10a4.8 4.8 0 0 0-4.8 4.8v32.067a4.8 4.8 0 0 0 4.8 4.8h45.4a4.8 4.8 0 0 0 4.8-4.8V14.8a4.8 4.8 0 0 0-4.8-4.8H24.4Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M73.767 19.966H20.434v-1.6h53.333v1.6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M71.267 15a1.667 1.667 0 1 1-3.333 0 1.667 1.667 0 0 1 3.333 0ZM66.267 15a1.667 1.667 0 1 1-3.333 0 1.667 1.667 0 0 1 3.333 0ZM61.267 15a1.667 1.667 0 1 1-3.333 0 1.667 1.667 0 0 1 3.333 0Z"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M67.2 50.4c0 7.29-5.91 13.2-13.2 13.2-7.29 0-13.2-5.91-13.2-13.2 0-7.29 5.91-13.2 13.2-13.2 7.29 0 13.2 5.91 13.2 13.2Z"/>
+    <path class="tw-fill-illustration-tertiary" d="M46.235 47.977a2.236 2.236 0 0 1 2.236-2.236h11.057a2.236 2.236 0 0 1 2.236 2.236v7.952a2.236 2.236 0 0 1-2.236 2.236H48.471a2.236 2.236 0 0 1-2.236-2.236v-7.952Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M59.528 47.232H48.471a.745.745 0 0 0-.745.745v7.952c0 .411.334.745.745.745h11.057a.745.745 0 0 0 .746-.745v-7.952a.745.745 0 0 0-.746-.745Zm-11.057-1.49a2.236 2.236 0 0 0-2.236 2.235v7.952a2.236 2.236 0 0 0 2.236 2.236h11.057a2.236 2.236 0 0 0 2.236-2.236v-7.952a2.236 2.236 0 0 0-2.236-2.236H48.471Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M53.223 50.4a.776.776 0 1 1 1.553 0v3.105a.776.776 0 1 1-1.553 0V50.4Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M50.148 44.965a3.851 3.851 0 0 1 7.703 0v.776h-1.49v-.776a2.36 2.36 0 1 0-4.722 0v.776h-1.49v-.776Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M7.5 25.767a1.6 1.6 0 0 1 1.6-1.6h12.633a1.6 1.6 0 0 1 1.6 1.6v12.567H7.5V25.767Z"/>
+    <path class="tw-fill-illustration-tertiary" d="M10 26.667h2.5v9.167H10v-9.167ZM14.167 28.333h2.5v7.5h-2.5v-7.5ZM18.333 26.667h2.5v9.167h-2.5v-9.167Z"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M6.533 36.667a3.2 3.2 0 0 0-3.2 3.2v33.6a3.2 3.2 0 0 0 3.2 3.2H24.3a3.2 3.2 0 0 0 3.2-3.2v-33.6a3.2 3.2 0 0 0-3.2-3.2H6.533Zm8.884 30a2.083 2.083 0 1 1 0 4.167 2.083 2.083 0 0 1 0-4.167Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M6.533 38.267a1.6 1.6 0 0 0-1.6 1.6v33.6a1.6 1.6 0 0 0 1.6 1.6H24.3a1.6 1.6 0 0 0 1.6-1.6v-33.6a1.6 1.6 0 0 0-1.6-1.6H6.533Zm8.884 26.8a3.683 3.683 0 1 1 0 7.367 3.683 3.683 0 0 1 0-7.367Zm-12.084-25.2a3.2 3.2 0 0 1 3.2-3.2H24.3a3.2 3.2 0 0 1 3.2 3.2v33.6a3.2 3.2 0 0 1-3.2 3.2H6.533a3.2 3.2 0 0 1-3.2-3.2v-33.6ZM17.5 68.75a2.083 2.083 0 1 0-4.167 0 2.083 2.083 0 0 0 4.167 0Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" fill-rule="evenodd" d="M15.417 60.066a6.317 6.317 0 1 0 0-12.633 6.317 6.317 0 0 0 0 12.633Zm0 1.6a7.917 7.917 0 1 0 0-15.833 7.917 7.917 0 0 0 0 15.833Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/two-factor-auth-webauthn.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-webauthn.icon.ts
index f5e7519e024..b9114259584 100644
--- a/libs/assets/src/svg/svgs/two-factor-auth-webauthn.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-webauthn.icon.ts
@@ -1,40 +1,17 @@
 import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthWebAuthnIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
-    <path class="tw-fill-art-primary"
-        d="M19.258 16.434c0-3.635 2.966-6.58 6.626-6.58H56.88c3.659 0 6.625 2.946 6.625 6.58v27.788l-2.208 2.667V16.434c0-2.423-1.978-4.387-4.417-4.387H25.884c-2.44 0-4.418 1.964-4.418 4.387v67.09c0 2.422 1.978 4.386 4.418 4.386h16.389l-.814 2.194H25.884c-3.66 0-6.626-2.947-6.626-6.58v-67.09Z" />
-    <path class="tw-fill-art-primary" fill-rule="evenodd"
-        d="M40.119 19.287a.55.55 0 0 1 .552-.548h2.208a.55.55 0 0 1 .553.548.55.55 0 0 1-.553.549h-2.208a.55.55 0 0 1-.552-.549Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-accent" fill-rule="evenodd"
-        d="M31.994 38.828c2.103-3.001 5.541-4.957 9.425-4.957 5.66 0 10.376 4.155 11.392 9.653a.567.567 0 0 1-.439.664.553.553 0 0 1-.646-.451c-.918-4.969-5.183-8.73-10.307-8.73-3.515 0-6.625 1.769-8.53 4.485a.542.542 0 0 1-.77.129.579.579 0 0 1-.125-.793Zm-.623 2.186c.282.117.42.448.305.74a10.928 10.928 0 0 0-.748 3.992v3.46a.56.56 0 0 1-.553.569.56.56 0 0 1-.552-.568v-3.461c0-1.56.294-3.051.829-4.417a.547.547 0 0 1 .718-.315Zm21.09 4.164a.56.56 0 0 1 .553.568v3.23a.56.56 0 0 1-.552.568.56.56 0 0 1-.552-.568v-3.23a.56.56 0 0 1 .552-.568Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-accent" fill-rule="evenodd"
-        d="M32.823 41.892c1.451-3.427 4.75-5.827 8.596-5.827 1.98 0 3.819.638 5.333 1.725.25.18.31.532.135.788a.544.544 0 0 1-.769.138 8.02 8.02 0 0 0-4.7-1.52c-3.382 0-6.297 2.111-7.582 5.146a.547.547 0 0 1-.726.294.57.57 0 0 1-.287-.744Zm14.94-2.495a.543.543 0 0 1 .778.066 9.936 9.936 0 0 1 2.265 6.35v7.783a.559.559 0 0 1-.552.566.559.559 0 0 1-.553-.566v-7.782a8.788 8.788 0 0 0-2.002-5.62.575.575 0 0 1 .064-.797Zm-15.06 4.804a.562.562 0 0 1 .487.625 9.062 9.062 0 0 0-.053.988v7.782a.559.559 0 0 1-.553.566.559.559 0 0 1-.552-.566v-7.782c0-.377.02-.748.06-1.114a.555.555 0 0 1 .611-.499Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-accent" fill-rule="evenodd"
-        d="M34.24 45.704c0-4.105 3.207-7.446 7.178-7.446 3.972 0 7.178 3.341 7.178 7.446V55.79a.559.559 0 0 1-.552.565.559.559 0 0 1-.552-.565V45.704c0-3.495-2.726-6.315-6.074-6.315-3.347 0-6.073 2.82-6.073 6.315v3.948a.559.559 0 0 1-.553.566.559.559 0 0 1-.552-.566v-3.948Zm.552 5.572c.305 0 .553.253.553.565v3.949a.559.559 0 0 1-.553.565.559.559 0 0 1-.552-.565V51.84c0-.312.247-.565.552-.565Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-accent" fill-rule="evenodd"
-        d="M38.89 41.142a4.955 4.955 0 0 1 2.529-.69 4.966 4.966 0 0 1 4.97 4.962v3.044a.55.55 0 0 1-.553.548.55.55 0 0 1-.552-.548v-3.044a3.865 3.865 0 0 0-5.83-3.33.554.554 0 0 1-.757-.19.546.546 0 0 1 .192-.752Zm-.911 1.45c.258.16.335.5.173.756a3.844 3.844 0 0 0-.599 2.066v11.49a.55.55 0 0 1-.552.548.55.55 0 0 1-.552-.548v-11.49c0-.974.282-1.884.768-2.651a.554.554 0 0 1 .762-.172Zm7.857 7.904a.55.55 0 0 1 .552.549v5.859a.55.55 0 0 1-.552.548.55.55 0 0 1-.552-.548v-5.86a.55.55 0 0 1 .552-.547Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-accent" fill-rule="evenodd"
-        d="M38.658 45.306c0-1.488 1.256-2.66 2.76-2.66 1.505 0 2.761 1.172 2.761 2.66v4.829a.55.55 0 0 1-.552.548.55.55 0 0 1-.552-.548v-4.828c0-.845-.722-1.564-1.657-1.564-.934 0-1.656.72-1.656 1.563v12.146a.55.55 0 0 1-.552.549.55.55 0 0 1-.552-.549V45.307Zm4.97 6.317a.55.55 0 0 1 .551.549v5.28a.55.55 0 0 1-.552.549.55.55 0 0 1-.552-.549v-5.28a.55.55 0 0 1 .552-.549Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-accent" fill-rule="evenodd"
-        d="M41.419 44.84a.55.55 0 0 1 .552.548v1.9a.55.55 0 0 1-.552.548.55.55 0 0 1-.552-.549v-1.9a.55.55 0 0 1 .552-.548Zm0 4a.55.55 0 0 1 .552.548V58a.55.55 0 0 1-.552.549.55.55 0 0 1-.552-.549v-8.612a.55.55 0 0 1 .552-.549Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary" fill-rule="evenodd"
-        d="M48.904 87.97c2.492 0 4.542-2.042 4.542-4.616 0-2.51-1.986-4.616-4.542-4.616-2.55 0-4.543 2.049-4.543 4.616 0 2.574 2.05 4.616 4.543 4.616Zm3.016-4.616c0 1.739-1.376 3.086-3.016 3.086-1.64 0-3.017-1.347-3.017-3.086 0-1.745 1.333-3.086 3.017-3.086 1.677 0 3.016 1.385 3.016 3.086Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-primary" fill-rule="evenodd"
-        d="M108.913 84.456a.767.767 0 0 0 0-1.074l-6.098-6.213a.76.76 0 0 0-.544-.228H70.225c-2.438-5.616-7.969-9.602-14.417-9.602-8.75 0-15.73 7.185-15.73 16.015 0 8.832 7.032 16.015 15.73 16.015 6.498 0 12.081-4.036 14.475-9.756h8.303c.204 0 .4-.082.544-.228l2.933-2.989 3.034 3.091a.762.762 0 0 0 1.088 0l.918-.934.766.78a.762.762 0 0 0 1.08.008l3.135-3.107 3.294 3.356c.143.146.339.229.543.229h7.408a.76.76 0 0 0 .544-.229l5.04-5.134Zm-5.903 3.832h-6.769l-3.606-3.674a.762.762 0 0 0-1.08-.007l-3.135 3.106-.774-.788a.762.762 0 0 0-1.087 0l-.918.935-3.034-3.091a.762.762 0 0 0-1.088 0l-3.253 3.314h-8.5c-.316 0-.6.196-.712.493-2.06 5.419-7.23 9.263-13.246 9.263-7.832 0-14.204-6.475-14.204-14.485 0-8.011 6.323-14.485 14.204-14.485 5.966 0 11.09 3.795 13.2 9.12a.763.763 0 0 0 .709.482h32.235l5.346 5.448-4.288 4.37Z"
-        clip-rule="evenodd" />
-    <path class="tw-fill-art-accent"
-        d="M100.357 80.991a.382.382 0 0 0-.382-.382H73.651a.382.382 0 0 0 0 .765h26.324c.211 0 .382-.171.382-.383ZM65.693 77.56c-2.04-3.686-5.74-6.133-9.95-6.133-.895 0-1.766.11-2.602.319a.382.382 0 0 1-.184-.743 11.478 11.478 0 0 1 2.785-.341c4.52 0 8.46 2.627 10.618 6.528a14.09 14.09 0 0 1 1.563 4.503.382.382 0 1 1-.752.126 13.324 13.324 0 0 0-1.478-4.258Z" />
-    <path class="tw-fill-art-primary tw-stroke-art-primary" fill-rule="evenodd" stroke-width=".355"
-        d="M75.94 32.403c8.007 0 14.498 6.51 14.498 14.538a14.542 14.542 0 0 1-9.26 13.56c8.849 1.9 15.896 8.519 18.221 17.036l-1.472.404C95.343 68.475 86.492 61.48 75.95 61.48c-6.743 0-12.796 2.861-16.96 7.404l-1.123-1.036a24.374 24.374 0 0 1 12.842-7.344 14.542 14.542 0 0 1-9.265-13.563c0-8.029 6.49-14.538 14.497-14.538Zm12.972 14.538c0-7.184-5.808-13.007-12.972-13.007S62.97 39.757 62.97 46.94c0 7.184 5.807 13.008 12.971 13.008s12.972-5.823 12.972-13.008Z"
-        clip-rule="evenodd" />
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="3.33 3.33 76.49 75.83">
+    <path class="tw-fill-illustration-bg-primary" d="M3.333 8.334a5 5 0 0 1 5-5H35a5 5 0 0 1 5 5v56.667a5 5 0 0 1-5 5H8.333a5 5 0 0 1-5-5V8.334Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M35 5H8.333A3.333 3.333 0 0 0 5 8.335v56.667a3.333 3.333 0 0 0 3.333 3.333H35a3.333 3.333 0 0 0 3.333-3.333V8.334A3.333 3.333 0 0 0 35 5.001ZM8.333 3.335a5 5 0 0 0-5 5v56.667a5 5 0 0 0 5 5H35a5 5 0 0 0 5-5V8.334a5 5 0 0 0-5-5H8.333Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M18.333 9.167c0-.46.373-.833.834-.833h5a.833.833 0 0 1 0 1.667h-5a.833.833 0 0 1-.834-.834Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M36.667 38.333c0 10.126-6.716 18.334-15 18.334-8.285 0-15-8.208-15-18.334 0-10.125 6.715-18.333 15-18.333 8.284 0 15 8.208 15 18.333Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M21.667 55C28.733 55 35 47.866 35 38.333c0-9.533-6.267-16.666-13.333-16.666-7.067 0-13.334 7.133-13.334 16.666C8.333 47.866 14.6 55 21.667 55Zm0 1.667c8.284 0 15-8.208 15-18.334 0-10.125-6.716-18.333-15-18.333-8.285 0-15 8.208-15 18.333 0 10.126 6.715 18.334 15 18.334Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M68.333 35c0 6.444-5.223 11.667-11.666 11.667C50.223 46.667 45 41.444 45 35.001c0-6.444 5.223-11.667 11.667-11.667 6.443 0 11.666 5.223 11.666 11.667Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M56.667 45c5.523 0 10-4.477 10-10 0-5.522-4.477-10-10-10s-10 4.478-10 10c0 5.523 4.477 10 10 10Zm0 1.667c6.443 0 11.666-5.223 11.666-11.666 0-6.444-5.223-11.667-11.666-11.667C50.223 23.334 45 28.557 45 35.001c0 6.443 5.223 11.666 11.667 11.666Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" fill-rule="evenodd" d="M78.255 59.98a22.918 22.918 0 0 1 1.559 5.854H41.667v-8.333h-4.549a22.916 22.916 0 0 1 41.137 2.48Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M43.333 55.834v8.333h34.5a21.238 21.238 0 0 0-5.724-10.442 21.25 21.25 0 0 0-31.9 2.109h3.124Zm-5.18 0c-.368.54-.714 1.096-1.035 1.667h4.549v8.333h38.147a22.875 22.875 0 0 0-1.558-5.853 22.915 22.915 0 0 0-40.102-4.147Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M39.167 79.167c5.272 0 9.829-3.06 11.993-7.5h5.65c.442 0 .866-.176 1.178-.489L60 69.168l1.91 1.91a.833.833 0 0 0 1.18 0l.66-.66.66.66a.833.833 0 0 0 1.18 0l1.91-1.91 2.012 2.011c.312.313.736.489 1.178.489h2.786c.442 0 .866-.176 1.179-.489l5.05-5.05a.417.417 0 0 0 0-.59l-5.05-5.05A1.667 1.667 0 0 0 73.476 60H51.16c-2.164-4.44-6.721-7.5-11.993-7.5-7.364 0-13.334 5.97-13.334 13.333 0 7.364 5.97 13.334 13.334 13.334Zm-5-10.834a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M50.118 70h6.692L60 66.81l2.5 2.5 1.25-1.25L65 69.31l2.5-2.5L70.69 70h2.786l4.167-4.167-4.167-4.166H50.118l-.457-.937a11.667 11.667 0 0 0-10.494-6.563c-6.444 0-11.667 5.223-11.667 11.666 0 6.444 5.223 11.667 11.667 11.667 4.61 0 8.6-2.674 10.494-6.563l.457-.937Zm29.587-3.872a.417.417 0 0 0 0-.59l-5.05-5.05A1.667 1.667 0 0 0 73.476 60H51.16c-2.164-4.44-6.721-7.5-11.993-7.5-7.364 0-13.334 5.97-13.334 13.333 0 7.364 5.97 13.334 13.334 13.334 5.272 0 9.829-3.06 11.993-7.5h5.65c.442 0 .866-.176 1.178-.489L60 69.168l1.91 1.91a.833.833 0 0 0 1.179.001l.661-.661.66.66.002.001a.833.833 0 0 0 1.177 0l1.911-1.911 2.012 2.011c.312.313.736.489 1.178.489h2.786c.442 0 .866-.176 1.179-.489l5.05-5.05Zm-41.372-.295a4.167 4.167 0 1 1-8.333 0 4.167 4.167 0 0 1 8.333 0Zm-1.666 0a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0ZM16.126 28.497a15.793 15.793 0 0 1 5.542-.996c1.95 0 3.818.352 5.541.996a.833.833 0 0 0 .584-1.56 17.462 17.462 0 0 0-6.125-1.103c-2.154 0-4.218.39-6.125 1.102a.833.833 0 1 0 .583 1.561Zm5.542 2.337a11.648 11.648 0 0 0-9.335 4.667.833.833 0 1 1-1.332-1 13.314 13.314 0 0 1 10.667-5.334c4.331 0 7.947 1.77 10.59 4.41a.833.833 0 1 1-1.179 1.18c-2.36-2.36-5.564-3.923-9.411-3.923Zm-.117 1.667c-5.377 0-9.63 4.555-9.26 9.92l.075 1.081c.097 1.4.428 2.772.98 4.061l.47 1.099a.833.833 0 1 0 1.532-.656l-.47-1.1a10.835 10.835 0 0 1-.85-3.519l-.074-1.08a7.615 7.615 0 1 1 15.212-.524v.718a.833.833 0 0 1-1.666 0v-.834a5.848 5.848 0 0 0-1.522-3.927c-1.054-1.146-2.637-1.906-4.728-1.906-2.173 0-3.575.99-4.397 2.254-.79 1.216-1.02 2.639-1.02 3.58 0 2.326.209 4.02.794 5.424.593 1.425 1.54 2.465 2.84 3.549a.833.833 0 1 0 1.067-1.28c-1.2-1-1.921-1.835-2.369-2.91-.457-1.097-.665-2.527-.665-4.784 0-.726.187-1.803.75-2.67.533-.82 1.423-1.496 3-1.496 1.659 0 2.785.589 3.501 1.368a4.181 4.181 0 0 1 1.082 2.798v.834a2.5 2.5 0 0 0 5 0v-.718a9.282 9.282 0 0 0-9.282-9.282Zm-.754 9.116c0-.42.347-.783.823-.783a.88.88 0 0 1 .88.88v1.364a4.68 4.68 0 0 0 1.872 3.743l.684.513a5 5 0 0 0 3 1h.277a.833.833 0 0 0 0-1.667h-.277a3.334 3.334 0 0 1-2-.666l-.684-.513a3.013 3.013 0 0 1-1.205-2.41v-1.364a2.547 2.547 0 0 0-2.547-2.547c-1.342 0-2.492 1.056-2.49 2.453.001.82.033 1.85.148 2.804.125 1.035.627 1.848 1.163 2.526.244.31.509.608.757.887l.066.074c.274.308.526.597.752.895.553.729.7 1.326.544 1.719a.833.833 0 0 0 1.547.619c.504-1.26-.137-2.52-.763-3.345-.27-.356-.562-.688-.834-.994l-.06-.069a18.78 18.78 0 0 1-.701-.819c-.456-.577-.745-1.1-.817-1.693a23.012 23.012 0 0 1-.135-2.607Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/two-factor-timeout.icon.ts b/libs/assets/src/svg/svgs/two-factor-timeout.icon.ts
index 7a5e04c07a3..55ca4f4e945 100644
--- a/libs/assets/src/svg/svgs/two-factor-timeout.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-timeout.icon.ts
@@ -1,8 +1,14 @@
 import { svgIcon } from "../icon-service";
 
 export const TwoFactorTimeoutIcon = svgIcon`
-<svg viewBox="0 0 120 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path class="tw-fill-primary-600" d="M36.1675 38.8485C40.71 28.9376 50.8182 22.0428 62.554 22.0428C78.5399 22.0428 91.499 34.8328 91.499 50.6101C91.499 66.3874 78.5399 79.1774 62.554 79.1774C50.5663 79.1774 40.2756 71.9847 35.8807 61.7246C35.3972 60.5957 34.0779 60.0675 32.9341 60.5447C31.7903 61.022 31.255 62.324 31.7386 63.4529C36.8123 75.2975 48.6962 83.6158 62.554 83.6158C81.0235 83.6158 95.9961 68.8387 95.9961 50.6101C95.9961 32.3816 81.0235 17.6044 62.554 17.6044C48.3746 17.6044 36.2605 26.3121 31.3944 38.6029L27.8472 32.2954C27.2902 31.305 26.0358 30.9537 25.0454 31.5107C24.055 32.0676 23.7036 33.3221 24.2606 34.3125L30.0681 44.6391C30.6251 45.6295 31.8795 45.9809 32.8699 45.4239L43.1965 39.6164C44.187 39.0594 44.5383 37.805 43.9813 36.8146C43.4243 35.8242 42.1699 35.4728 41.1795 36.0298L36.1675 38.8485Z" />
-  <path class="tw-fill-primary-600" d="M72.2625 60.9479C71.8946 61.1944 71.4577 61.3265 71.0118 61.3265C70.4411 61.3265 69.8927 61.1086 69.4781 60.7189L60.6723 52.4767C60.4538 52.272 60.2799 52.0232 60.1595 51.7502C60.0391 51.4772 59.9767 51.1822 59.9767 50.8828V30.3303C59.9767 29.7469 60.2108 29.1877 60.6299 28.7739C61.049 28.36 61.6153 28.1288 62.206 28.1288C62.7968 28.1288 63.363 28.3622 63.7822 28.7739C64.2013 29.1855 64.4353 29.7469 64.4353 30.3303V49.9318L72.5456 57.5268C72.8688 57.8306 73.094 58.2225 73.1899 58.6518C73.2857 59.081 73.2478 59.5301 73.0829 59.9396C72.9179 60.3491 72.6303 60.7013 72.2625 60.9479Z" />
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="5 4 87 87">
+    <circle cx="48" cy="48" r="42" class="tw-fill-illustration-bg-primary tw-stroke-illustration-outline" stroke-width="2"/>
+    <rect width="18" height="14" x="12" y="70" class="tw-fill-illustration-bg-secondary tw-stroke-illustration-outline" stroke-width="2" rx="2"/>
+    <rect width="2" height="6" x="20" y="74" class="tw-fill-illustration-outline" rx="1"/>
+    <path class="tw-stroke-illustration-outline" stroke-width="2" d="M25 69v-1a4 4 0 0 0-8 0v1"/>
+    <circle cx="80" cy="16" r="11" class="tw-fill-illustration-tertiary tw-stroke-illustration-outline" stroke-width="2"/>
+    <path class="tw-stroke-illustration-outline" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m76.673 19.495 3.5-3.5m3.5-3.5-3.5 3.5m0 0-3.5-3.5 7 7"/>
+    <circle cx="48" cy="48" r="15.5" class="tw-fill-illustration-bg-tertiary tw-stroke-illustration-outline" stroke-width="2"/>
+    <path class="tw-stroke-illustration-outline" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M52.95 52.243 48 48.707v-9.9"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/unlocked.icon.ts b/libs/assets/src/svg/svgs/unlocked.icon.ts
new file mode 100644
index 00000000000..6ce40819e44
--- /dev/null
+++ b/libs/assets/src/svg/svgs/unlocked.icon.ts
@@ -0,0 +1,15 @@
+import { svgIcon } from "../icon-service";
+
+export const UnlockedIcon = svgIcon`
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0.99 80 73.35">
+    <path class="tw-fill-illustration-bg-primary" d="M11.666 32.667c0-5.523 3.806-10 8.5-10h39.667c4.694 0 8.5 4.477 8.5 10v31.667c0 5.522-3.806 10-8.5 10H20.166c-4.694 0-8.5-4.478-8.5-10V32.667Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M59.833 24.334H20.166c-3.912 0-7.083 3.73-7.083 8.333v31.667c0 4.602 3.171 8.333 7.083 8.333h39.667c3.912 0 7.083-3.731 7.083-8.333V32.667c0-4.602-3.171-8.333-7.083-8.333Zm-39.667-1.667c-4.694 0-8.5 4.477-8.5 10v31.667c0 5.522 3.806 10 8.5 10h39.667c4.694 0 8.5-4.478 8.5-10V32.667c0-5.523-3.806-10-8.5-10H20.166Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M13.334 56.833h53.333V63.5H13.334v-6.667Z"/>
+    <path class="tw-fill-illustration-tertiary" d="M0 48.5c0-5.523 4.477-10 10-10h60c5.523 0 10 4.477 10 10s-4.477 10-10 10H10c-5.523 0-10-4.477-10-10Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M70 40.167H10a8.333 8.333 0 1 0 0 16.666h60a8.333 8.333 0 1 0 0-16.666ZM10 38.5c-5.523 0-10 4.477-10 10s4.477 10 10 10h60c5.523 0 10-4.477 10-10s-4.477-10-10-10H10Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M16.667 43.5c.46 0 .834.389.834.868v3.48l3.117-1.658c.423-.225.942-.078 1.158.328.216.407.047.919-.376 1.144l-3.364 1.789 2.69 2.885c.327.35.319.89-.018 1.203-.336.314-.874.284-1.201-.067l-2.84-3.045-2.84 3.045c-.326.351-.864.38-1.2.067-.337-.314-.345-.853-.018-1.203l2.69-2.885-3.364-1.79c-.424-.224-.592-.736-.376-1.143.216-.406.735-.553 1.158-.328l3.117 1.658v-3.48c0-.48.373-.868.833-.868Zm13.334 0c.46 0 .833.389.833.868v3.48l3.117-1.658c.423-.225.942-.078 1.158.328.216.407.048.919-.376 1.144L31.37 49.45l2.69 2.885c.327.35.32.89-.017 1.203-.337.314-.875.284-1.202-.067L30 50.427l-2.839 3.045c-.327.351-.865.38-1.201.067-.337-.314-.345-.853-.018-1.203l2.69-2.885-3.364-1.79c-.424-.224-.592-.736-.376-1.143.216-.406.735-.553 1.158-.328l3.117 1.658v-3.48c0-.48.373-.868.834-.868Zm14.166.868c0-.48-.373-.868-.833-.868-.46 0-.833.389-.833.868v3.48l-3.117-1.658c-.424-.225-.942-.078-1.158.328-.216.407-.048.919.375 1.144l3.365 1.789-2.69 2.885c-.328.35-.32.89.017 1.203.337.314.874.284 1.202-.067l2.839-3.045 2.84 3.045c.327.351.864.38 1.201.067.337-.314.344-.853.017-1.203l-2.69-2.885 3.365-1.79c.423-.224.591-.736.375-1.143-.216-.406-.734-.553-1.158-.328l-3.117 1.657v-3.479Zm6.667 8.299c0-.46.373-.834.833-.834h6.667a.833.833 0 0 1 0 1.667h-6.667a.833.833 0 0 1-.833-.833Zm10.833-.834a.833.833 0 0 0 0 1.667h6.667a.833.833 0 0 0 0-1.667h-6.667Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M55.833 17.644v-.025c0-8.745-7.09-15.834-15.834-15.834S24.166 8.874 24.166 17.62v5.833h5v-5.834c0-5.983 4.85-10.833 10.833-10.833 5.983 0 10.834 4.85 10.834 10.834v.025h5Z"/>
+    <path class="tw-fill-illustration-bg-primary" d="M24.785 19.488h3.775v3.333h-3.775z"/>
+    <path class="tw-fill-illustration-outline" d="M28.367 17.618c0-6.424 5.208-11.632 11.633-11.633 6.164 0 11.206 4.795 11.605 10.859h3.409C54.61 8.9 48.043 2.585 40 2.585c-8.302 0-15.033 6.73-15.033 15.033v5.033h3.4v-5.033Zm1.6 5.834a.8.8 0 0 1-.8.8h-5a.8.8 0 0 1-.8-.8v-5.834C23.367 8.432 30.814.986 40 .985c9.186 0 16.634 7.447 16.634 16.633v.027a.8.8 0 0 1-.8.8h-5a.802.802 0 0 1-.8-.8v-.027C50.032 12.078 45.54 7.585 40 7.585s-10.033 4.492-10.033 10.033v5.834Z"/>
+  </svg>
+`;
diff --git a/libs/assets/src/svg/svgs/user-lock.icon.ts b/libs/assets/src/svg/svgs/user-lock.icon.ts
index ad56d612268..cc848a05769 100644
--- a/libs/assets/src/svg/svgs/user-lock.icon.ts
+++ b/libs/assets/src/svg/svgs/user-lock.icon.ts
@@ -1,102 +1,20 @@
 import { svgIcon } from "../icon-service";
 
 export const UserLockIcon = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
-    <path
-      class="tw-fill-art-primary"
-      fill-rule="evenodd"
-      d="M0 18.207a7.798 7.798 0 0 1 7.798-7.798H89.38a7.798 7.798 0 0 1 7.799 7.798v8.763h-2.4v-8.763a5.399 5.399 0 0 0-5.398-5.399H7.797A5.399 5.399 0 0 0 2.4 18.207v49.19a5.399 5.399 0 0 0 5.4 5.398h9.483v2.4H7.798A7.798 7.798 0 0 1 0 67.396V18.207Zm49.378 54.588h13.498v2.4H49.378v-2.4Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-primary"
-      fill-rule="evenodd"
-      d="M88.78 58.398c8.946 0 16.197-7.251 16.197-16.196s-7.251-16.197-16.196-16.197-16.197 7.252-16.197 16.197 7.252 16.196 16.197 16.196Zm0 2.4c10.27 0 18.597-8.326 18.597-18.596s-8.326-18.596-18.596-18.596-18.596 8.326-18.596 18.596S78.51 60.798 88.78 60.798Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-primary"
-      fill-rule="evenodd"
-      d="M61.005 87.192h54.28c1.303 0 1.833-.344 2.01-.53.128-.134.396-.517.226-1.586-2.187-13.74-14.213-24.278-28.752-24.278S62.203 71.337 60.017 85.076c-.09.57.026 1.226.279 1.662.115.2.23.305.316.359.072.046.184.095.393.095Zm0 2.4h54.28c3.346 0 5.104-1.76 4.605-4.893-2.371-14.903-15.402-26.3-31.121-26.3-15.72 0-28.75 11.397-31.122 26.3-.337 2.121.744 4.893 3.358 4.893Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M77.983 17.607a1.2 1.2 0 0 1-1.2-1.2v-.6a1.2 1.2 0 1 1 2.4 0v.6a1.2 1.2 0 0 1-1.2 1.2Zm5.399 0a1.2 1.2 0 0 1-1.2-1.2v-.498a1.2 1.2 0 1 1 2.4 0v.498a1.2 1.2 0 0 1-1.2 1.2Zm5.398 0a1.2 1.2 0 0 1-1.2-1.2v-.498a1.2 1.2 0 1 1 2.4 0v.498a1.2 1.2 0 0 1-1.2 1.2Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-primary"
-      fill-rule="evenodd"
-      d="M95.083 20.607H0v-1.2h95.083v1.2ZM15.12 54.571a5.999 5.999 0 0 1 6-5.998h23.23a5.999 5.999 0 0 1 6 5.998V57.2h-2.4v-2.63a3.6 3.6 0 0 0-3.6-3.599H21.12a3.6 3.6 0 0 0-3.6 3.6v2.627h-2.4V54.57Zm2.4 15.825v2.693a3.6 3.6 0 0 0 3.6 3.599h23.23a3.6 3.6 0 0 0 3.6-3.6v-2.692h2.4v2.693a5.999 5.999 0 0 1-6 5.998H21.12a5.999 5.999 0 0 1-6-5.998v-2.693h2.4Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-primary"
-      fill-rule="evenodd"
-      d="M32.479 33.255c-5.31 0-9.641 4.332-9.641 9.64v6.822h-2.4v-6.821c0-6.635 5.406-12.04 12.04-12.04 6.633 0 12.041 5.377 12.041 12.04v6.821h-2.4v-6.821c0-5.334-4.33-9.641-9.64-9.641Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M10.498 63.797a7.498 7.498 0 0 1 7.498-7.498h30.593a7.498 7.498 0 0 1 0 14.997H17.996a7.498 7.498 0 0 1-7.498-7.499Zm43.79 0a5.699 5.699 0 0 0-5.699-5.699H17.996a5.699 5.699 0 0 0 0 11.398h30.593a5.699 5.699 0 0 0 5.7-5.699Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M19.02 60.669a.6.6 0 0 1 .6.6v2.959a.6.6 0 0 1-1.2 0v-2.96a.6.6 0 0 1 .6-.6Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M22.443 63.13a.6.6 0 0 1-.388.755l-2.851.914a.6.6 0 1 1-.367-1.142l2.852-.915a.6.6 0 0 1 .754.388Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M18.67 63.742a.6.6 0 0 1 .837.135l1.748 2.42a.6.6 0 0 1-.972.703l-1.749-2.42a.6.6 0 0 1 .136-.838Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M19.368 63.739a.6.6 0 0 1 .142.837l-1.722 2.42a.6.6 0 0 1-.978-.695l1.722-2.42a.6.6 0 0 1 .836-.142Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M15.626 63.129a.6.6 0 0 1 .755-.386l2.825.914a.6.6 0 0 1-.37 1.142l-2.824-.915a.6.6 0 0 1-.386-.755Zm13.025-2.46a.6.6 0 0 1 .6.6v2.959a.6.6 0 1 1-1.2 0v-2.96a.6.6 0 0 1 .6-.6Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M32.046 63.129a.6.6 0 0 1-.386.755l-2.824.915a.6.6 0 1 1-.37-1.142l2.825-.914a.6.6 0 0 1 .755.386Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M28.3 63.742a.6.6 0 0 1 .837.135l1.749 2.42a.6.6 0 0 1-.973.703l-1.748-2.42a.6.6 0 0 1 .135-.838Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M29.002 63.742a.6.6 0 0 1 .136.837L27.387 67a.6.6 0 0 1-.972-.702l1.749-2.421a.6.6 0 0 1 .837-.136Z"
-      clip-rule="evenodd"
-    />
-    <path
-      class="tw-fill-art-accent"
-      fill-rule="evenodd"
-      d="M25.256 63.129a.6.6 0 0 1 .755-.386l2.825.914a.6.6 0 1 1-.37 1.142l-2.824-.915a.6.6 0 0 1-.386-.755Zm9.601 3.52a.6.6 0 0 1 .6-.6h5.649a.6.6 0 0 1 0 1.2h-5.649a.6.6 0 0 1-.6-.6Zm9.63 0a.6.6 0 0 1 .6-.6h5.65a.6.6 0 0 1 0 1.2h-5.65a.6.6 0 0 1-.6-.6Z"
-      clip-rule="evenodd"
-    />
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 10 80 60">
+    <path class="tw-fill-illustration-bg-primary" d="M0 15a5 5 0 0 1 5-5h45a5 5 0 0 1 5 5v31.667a5 5 0 0 1-5 5H5a5 5 0 0 1-5-5V15Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M50 11.667H5A3.333 3.333 0 0 0 1.667 15v31.667A3.333 3.333 0 0 0 5 50h45a3.333 3.333 0 0 0 3.333-3.333V15A3.333 3.333 0 0 0 50 11.667ZM5 10a5 5 0 0 0-5 5v31.667a5 5 0 0 0 5 5h45a5 5 0 0 0 5-5V15a5 5 0 0 0-5-5H5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M19.167 30a2.5 2.5 0 0 1 2.5-2.5h11.666a2.5 2.5 0 0 1 2.5 2.5v8.333a2.5 2.5 0 0 1-2.5 2.5H21.667a2.5 2.5 0 0 1-2.5-2.5V30Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M33.333 29.167H21.667a.833.833 0 0 0-.834.833v8.333c0 .46.373.834.834.834h11.666c.46 0 .834-.373.834-.834V30a.833.833 0 0 0-.834-.833ZM21.667 27.5a2.5 2.5 0 0 0-2.5 2.5v8.333a2.5 2.5 0 0 0 2.5 2.5h11.666a2.5 2.5 0 0 0 2.5-2.5V30a2.5 2.5 0 0 0-2.5-2.5H21.667Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M26.667 32.5a.833.833 0 0 1 1.666 0v3.334a.833.833 0 0 1-1.666 0V32.5Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M23.334 26.667a4.167 4.167 0 0 1 8.333 0v.833H30v-.833a2.5 2.5 0 0 0-5 0v.833h-1.666v-.833ZM54.167 20H.833v-1.666h53.334v1.667Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" d="M51.667 15a1.667 1.667 0 1 1-3.333 0 1.667 1.667 0 0 1 3.333 0ZM46.667 15a1.667 1.667 0 1 1-3.333 0 1.667 1.667 0 0 1 3.333 0ZM41.667 15a1.667 1.667 0 1 1-3.333 0 1.667 1.667 0 0 1 3.333 0Z"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M68.333 35c0 6.444-5.223 11.667-11.666 11.667C50.223 46.667 45 41.444 45 35.001c0-6.444 5.223-11.667 11.667-11.667 6.443 0 11.666 5.223 11.666 11.667Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M56.667 45c5.523 0 10-4.477 10-10 0-5.522-4.477-10-10-10s-10 4.478-10 10c0 5.523 4.477 10 10 10Zm0 1.667c6.443 0 11.666-5.223 11.666-11.666 0-6.444-5.223-11.667-11.666-11.667C50.223 23.334 45 28.557 45 35.001c0 6.443 5.223 11.666 11.667 11.666Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M78.256 59.98A22.918 22.918 0 0 1 80 68.75c0 .691-.56 1.25-1.25 1.25H35.417c-.69 0-1.25-.559-1.25-1.25a22.916 22.916 0 0 1 44.089-8.77Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M78.33 68.334a21.25 21.25 0 0 0-42.492 0h42.491Zm1.67.417a22.918 22.918 0 0 0-31.686-21.173 22.917 22.917 0 0 0-14.147 21.173c0 .69.56 1.25 1.25 1.25H78.75c.69 0 1.25-.56 1.25-1.25Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M9.167 50.834a6.667 6.667 0 0 1 6.666-6.667h22.5a6.667 6.667 0 0 1 0 13.333h-22.5a6.667 6.667 0 0 1-6.666-6.666Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M38.333 45.834h-22.5a5 5 0 1 0 0 10h22.5a5 5 0 0 0 0-10Zm-22.5-1.667a6.667 6.667 0 0 0 0 13.333h22.5a6.667 6.667 0 1 0 0-13.333h-22.5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M16.67 47.977c.46 0 .834.374.834.834v1.166l1.093-.358a.833.833 0 1 1 .519 1.584l-1.108.363.694.972a.833.833 0 1 1-1.357.969l-.675-.945-.675.945a.833.833 0 0 1-1.356-.969l.694-.972-1.108-.363a.833.833 0 0 1 .518-1.584l1.094.359V48.81c0-.46.373-.834.833-.834Zm7.5 0c.46 0 .834.374.834.834v1.166l1.093-.358a.833.833 0 1 1 .519 1.584l-1.108.363.694.972a.833.833 0 1 1-1.357.969l-.675-.945-.675.945a.833.833 0 0 1-1.356-.969l.694-.972-1.108-.363a.833.833 0 0 1 .518-1.584l1.094.359V48.81c0-.46.373-.834.833-.834ZM29.167 52.5c0-.46.373-.833.833-.833h3.333a.833.833 0 1 1 0 1.667H30a.833.833 0 0 1-.833-.834ZM35.834 52.5c0-.46.373-.833.833-.833H40a.833.833 0 0 1 0 1.667h-3.333a.833.833 0 0 1-.834-.834Z" clip-rule="evenodd"/>
   </svg>
-`;
+  `;
diff --git a/libs/assets/src/svg/svgs/user-verification-biometrics-fingerprint.icon.ts b/libs/assets/src/svg/svgs/user-verification-biometrics-fingerprint.icon.ts
index b3ace19a93d..19e1aa3e6cd 100644
--- a/libs/assets/src/svg/svgs/user-verification-biometrics-fingerprint.icon.ts
+++ b/libs/assets/src/svg/svgs/user-verification-biometrics-fingerprint.icon.ts
@@ -1,12 +1,12 @@
 import { svgIcon } from "../icon-service";
 
 export const UserVerificationBiometricsIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" width="63" height="65" fill="none">
-    <path class="tw-fill-secondary-600" fill="#89929F" fill-rule="evenodd" d="M6.539 13.582C12.113 5.786 21.228.7 31.529.7c15.02 0 27.512 10.808 30.203 25.086a2 2 0 1 1-3.93.74C55.457 14.093 44.578 4.7 31.528 4.7c-8.952 0-16.879 4.416-21.736 11.21a2 2 0 0 1-3.254-2.327Zm-.955 5.384A2 2 0 0 1 6.7 21.565a26.876 26.876 0 0 0-1.91 9.988v8.833a2 2 0 1 1-4 0v-8.833c0-4.05.778-7.923 2.195-11.472a2 2 0 0 1 2.599-1.115Zm54.685 10.587a2 2 0 0 1 2 2v8.244a2 2 0 0 1-4 0v-8.244a2 2 0 0 1 2-2Z" clip-rule="evenodd"/>
-    <path class="tw-fill-secondary-600" fill="#89929F" fill-rule="evenodd" d="M8.476 21.293c3.898-8.848 12.751-15.032 23.053-15.032a25.08 25.08 0 0 1 14.296 4.448A2 2 0 1 1 43.552 14a21.08 21.08 0 0 0-12.023-3.739c-8.66 0-16.11 5.196-19.392 12.645a2 2 0 1 1-3.661-1.613Zm39.328-6.481a2 2 0 0 1 2.82.211 25.062 25.062 0 0 1 6.082 16.4v19.629a2 2 0 1 1-4 0V31.423c0-5.27-1.925-10.085-5.114-13.79a2 2 0 0 1 .212-2.821ZM8.728 26.786A2 2 0 0 1 10.49 29c-.09.794-.137 1.603-.137 2.423v19.629a2 2 0 1 1-4 0V31.423c0-.972.055-1.931.163-2.876a2 2 0 0 1 2.213-1.76Z" clip-rule="evenodd"/>
-    <path class="tw-fill-secondary-600" fill="#89929F" fill-rule="evenodd" d="M12.223 31.097c0-10.648 8.647-19.273 19.306-19.273s19.306 8.625 19.306 19.273v25.321a2 2 0 1 1-4 0v-25.32c0-8.433-6.85-15.274-15.306-15.274s-15.305 6.841-15.305 15.273v9.913a2 2 0 1 1-4 0v-9.913Zm2 13.409a2 2 0 0 1 2 2v9.912a2 2 0 1 1-4 0v-9.912a2 2 0 0 1 2-2Z" clip-rule="evenodd"/>
-    <path class="tw-fill-secondary-600" fill="#89929F" fill-rule="evenodd" d="M24.698 19.044a13.418 13.418 0 0 1 6.831-1.857c7.411 0 13.434 5.984 13.434 13.385v7.851a2 2 0 1 1-4 0v-7.851c0-5.175-4.216-9.385-9.434-9.385a9.419 9.419 0 0 0-4.8 1.304 2 2 0 0 1-2.031-3.447Zm-1.76 3.755a2 2 0 0 1 .613 2.762 9.296 9.296 0 0 0-1.456 5.01v29.64a2 2 0 0 1-4 0v-29.64c0-2.63.763-5.087 2.081-7.158a2 2 0 0 1 2.761-.614Zm20.025 20.298a2 2 0 0 1 2 2v15.114a2 2 0 1 1-4 0V45.097a2 2 0 0 1 2-2Z" clip-rule="evenodd"/>
-    <path class="tw-fill-secondary-600" fill="#89929F" fill-rule="evenodd" d="M23.967 30.18c0-4.163 3.408-7.497 7.562-7.497s7.563 3.334 7.563 7.496v12.563a2 2 0 0 1-4 0V30.179c0-1.908-1.573-3.496-3.563-3.496-1.99 0-3.562 1.588-3.562 3.496v31.603a2 2 0 0 1-4 0V30.179ZM37.092 46.04a2 2 0 0 1 2 2v13.74a2 2 0 0 1-4 0v-13.74a2 2 0 0 1 2-2Z" clip-rule="evenodd"/>
-    <path class="tw-fill-secondary-600" fill="#89929F" fill-rule="evenodd" d="M31.546 28.375a2 2 0 0 1 2 2v4.908a2 2 0 1 1-4 0v-4.908a2 2 0 0 1 2-2Zm-.018 10.334a2 2 0 0 1 2.001 1.999l.017 22.25a2 2 0 1 1-4 .003l-.017-22.25a2 2 0 0 1 1.999-2.002Z" clip-rule="evenodd"/>
-</svg>
+    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="4 4 88 88">
+    <path class="tw-fill-illustration-bg-primary" d="M4 10a6 6 0 0 1 6-6h50a6 6 0 0 1 6 6v50a6 6 0 0 1-6 6H10a6 6 0 0 1-6-6V10Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M60 6H10a4 4 0 0 0-4 4v50a4 4 0 0 0 4 4h50a4 4 0 0 0 4-4V10a4 4 0 0 0-4-4ZM10 4a6 6 0 0 0-6 6v50a6 6 0 0 0 6 6h50a6 6 0 0 0 6-6V10a6 6 0 0 0-6-6H10Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M14 19a5 5 0 0 1 5-5h7a1 1 0 1 1 0 2h-7a3 3 0 0 0-3 3v7a1 1 0 1 1-2 0v-7Zm29-4a1 1 0 0 1 1-1h7a5 5 0 0 1 5 5v7a1 1 0 1 1-2 0v-7a3 3 0 0 0-3-3h-7a1 1 0 0 1-1-1ZM15 43a1 1 0 0 1 1 1v7a3 3 0 0 0 3 3h7a1 1 0 1 1 0 2h-7a5 5 0 0 1-5-5v-7a1 1 0 0 1 1-1Zm40 0a1 1 0 0 1 1 1v7a5 5 0 0 1-5 5h-7a1 1 0 1 1 0-2h7a3 3 0 0 0 3-3v-7a1 1 0 0 1 1-1ZM26 27a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0v-5a1 1 0 0 1 1-1Zm11 0a1 1 0 1 0-2 0v10a1 1 0 0 1-1 1h-2a1 1 0 1 0 0 2h2a3 3 0 0 0 3-3V27Zm-2 19c-2.234 0-4.411-.64-6.494-1.862a1 1 0 1 0-1.012 1.724C29.845 47.242 32.368 48 35 48c2.632 0 5.155-.758 7.506-2.138a1 1 0 1 0-1.012-1.724C39.41 45.36 37.234 46 35 46ZM23.565 24.825C24.378 24.268 25.192 24 26 24s1.622.268 2.435.825a1 1 0 1 0 1.13-1.65C28.478 22.43 27.277 22 26 22c-1.277 0-2.478.43-3.565 1.175a1 1 0 1 0 1.13 1.65ZM44 24c-.808 0-1.622.268-2.435.825a1 1 0 1 1-1.13-1.65C41.522 22.43 42.722 22 44 22s2.478.43 3.565 1.175a1 1 0 1 1-1.13 1.65C45.622 24.268 44.808 24 44 24Zm1 4a1 1 0 1 0-2 0v5a1 1 0 1 0 2 0v-5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M92 61.5C92 78.345 80.807 92 67 92S42 78.345 42 61.5 53.193 31 67 31s25 13.655 25 30.5Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M67 90c12.349 0 23-12.37 23-28.5C90 45.37 79.349 33 67 33S44 45.37 44 61.5C44 77.63 54.651 90 67 90Zm0 2c13.807 0 25-13.655 25-30.5S80.807 31 67 31 42 44.655 42 61.5 53.193 92 67 92Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M60.351 49.196A18.953 18.953 0 0 1 67.001 48c2.342 0 4.582.423 6.65 1.196a1 1 0 0 0 .7-1.873A20.954 20.954 0 0 0 67.001 46c-2.584 0-5.06.467-7.35 1.323a1 1 0 1 0 .7 1.873ZM67.001 52c-4.58 0-8.646 2.198-11.201 5.6a1 1 0 1 1-1.6-1.2A15.977 15.977 0 0 1 67.001 50c5.198 0 9.537 2.124 12.708 5.293a1 1 0 1 1-1.414 1.414C75.462 53.877 71.618 52 67.001 52Zm-.14 2c-6.453 0-11.555 5.467-11.111 11.905l.09 1.297a15.002 15.002 0 0 0 1.175 4.873l.565 1.319a1 1 0 1 0 1.838-.788l-.565-1.319a13 13 0 0 1-1.019-4.223l-.09-1.297C57.382 60.485 61.568 56 66.863 56A9.138 9.138 0 0 1 76 65.138V66a1 1 0 1 1-2 0v-1c0-1.61-.58-3.358-1.827-4.713C70.908 58.912 69.01 58 66.5 58c-2.607 0-4.29 1.188-5.276 2.705C60.276 62.164 60 63.871 60 65c0 2.792.25 4.826.952 6.51.712 1.71 1.848 2.958 3.408 4.258a1 1 0 1 0 1.28-1.536c-1.44-1.2-2.304-2.202-2.842-3.492C62.25 69.424 62 67.708 62 65c0-.871.224-2.164.9-3.205.64-.983 1.707-1.795 3.6-1.795 1.99 0 3.342.707 4.202 1.642A5.018 5.018 0 0 1 72 65v1a3 3 0 1 0 6 0v-.862C78 58.987 73.013 54 66.862 54Zm-.905 10.94c0-.505.417-.94.988-.94.583 0 1.056.473 1.056 1.056v1.636c0 1.768.832 3.432 2.246 4.493l.82.615a6 6 0 0 0 3.6 1.2H75a1 1 0 1 0 0-2h-.333a4 4 0 0 1-2.4-.8l-.82-.615A3.615 3.615 0 0 1 70 66.692v-1.636A3.056 3.056 0 0 0 66.944 62c-1.61 0-2.99 1.267-2.988 2.943.002.984.039 2.22.177 3.365.15 1.243.753 2.218 1.396 3.031.293.372.611.73.909 1.065l.079.09c.328.369.631.715.903 1.072.663.875.84 1.591.651 2.063a1 1 0 0 0 1.858.742c.604-1.51-.165-3.023-.916-4.013a20.143 20.143 0 0 0-1-1.193l-.073-.082c-.306-.344-.587-.66-.842-.983-.546-.692-.893-1.32-.98-2.031-.124-1.034-.16-2.181-.162-3.129Z" clip-rule="evenodd"/>
+    </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/vault-open.ts b/libs/assets/src/svg/svgs/vault-open.ts
index e644e316c05..3ad82b9bbac 100644
--- a/libs/assets/src/svg/svgs/vault-open.ts
+++ b/libs/assets/src/svg/svgs/vault-open.ts
@@ -1,17 +1,25 @@
 import { svgIcon } from "../icon-service";
 
 export const VaultOpen = svgIcon`
-<svg fill="none" width="100" height="90" viewBox="0 0 100 90" xmlns="http://www.w3.org/2000/svg">
-<g>
-<path d="m73.446 81.044h17.001v3.4685c0 2.7615-2.2385 5-5 5h-7.0011c-2.7615 0-5-2.2385-5-5v-3.4685zm2 2v1.4685c0 1.6569 1.3431 3 3 3h7.0011c1.6569 0 3-1.3431 3-3v-1.4685h-13.001z" clip-rule="evenodd" class="tw-fill-art-accent" fill-rule="evenodd"/>
-<path d="m10.108 81.044h17.001v3.4685c0 2.7615-2.2385 5-5 5h-7.0011c-2.7614 0-5-2.2385-5-5v-3.4685zm2 2v1.4685c0 1.6569 1.3431 3 3 3h7.0011c1.6569 0 3-1.3431 3-3v-1.4685h-13.001z" clip-rule="evenodd" class="tw-fill-art-accent" fill-rule="evenodd"/>
-<path d="m4.2281 2.4304c-1.1655 0-2.1208 0.95235-2.1208 2.1402v74.318c0 1.1878 0.95534 2.1402 2.1208 2.1402h91.544c1.1655 0 2.1208-0.9524 2.1208-2.1402v-74.318c0-1.1878-0.9553-2.1402-2.1208-2.1402h-91.544zm-4.1208 2.1402c0-2.2807 1.8391-4.1402 4.1208-4.1402h91.544c2.2817 0 4.1208 1.8595 4.1208 4.1402v74.318c0 2.2807-1.8391 4.1402-4.1208 4.1402h-91.544c-2.2817 0-4.1208-1.8595-4.1208-4.1402v-74.318z" clip-rule="evenodd" class="tw-fill-art-primary" fill-rule="evenodd"/>
-<path d="m89.258 21.816c-0.7304 0-1.3307 0.5963-1.3307 1.3421v9.3686c0 0.7459 0.6003 1.3422 1.3307 1.3422 0.7303 0 1.3307-0.5963 1.3307-1.3422v-9.3686c0-0.7458-0.6004-1.3421-1.3307-1.3421zm-3.3307 1.3421c0-1.8412 1.4866-3.3421 3.3307-3.3421s3.3307 1.5009 3.3307 3.3421v9.3686c0 1.8412-1.4866 3.3422-3.3307 3.3422s-3.3307-1.501-3.3307-3.3422v-9.3686z" clip-rule="evenodd" class="tw-fill-art-accent" fill-rule="evenodd"/>
-<path d="m89.258 45.237c-0.7304 0-1.3307 0.5962-1.3307 1.3421v9.3686c0 0.7459 0.6003 1.3422 1.3307 1.3422 0.7303 0 1.3307-0.5963 1.3307-1.3422v-9.3686c0-0.7459-0.6004-1.3421-1.3307-1.3421zm-3.3307 1.3421c0-1.8412 1.4866-3.3421 3.3307-3.3421s3.3307 1.5009 3.3307 3.3421v9.3686c0 1.8412-1.4866 3.3422-3.3307 3.3422s-3.3307-1.501-3.3307-3.3422v-9.3686z" clip-rule="evenodd" class="tw-fill-art-accent" fill-rule="evenodd"/>
-<path d="m33.443 25.468c0-0.5523 0.4477-1 1-1 1.4163 0 2.6668 1.0953 2.6668 2.5705v21.595c0 1.4752-1.2505 2.5705-2.6668 2.5705-0.5523 0-1-0.4477-1-1s0.4477-1 1-1c0.4255 0 0.6668-0.3103 0.6668-0.5705v-21.595c0-0.2602-0.2413-0.5705-0.6668-0.5705-0.5523 0-1-0.4477-1-1z" clip-rule="evenodd" class="tw-fill-art-accent" fill-rule="evenodd"/>
-<path d="m60.556 48.551c-3.2028 0-5.7978-3.1022-5.7978-6.9179 0-3.8156 2.595-6.9114 5.7978-6.9114 3.2029 0 5.7913 3.1022 5.7913 6.9114 0 3.8093-2.5949 6.9179-5.7913 6.9179zm0-14.791c-3.6408 0-6.6018 3.529-6.6018 7.8733 0 4.3444 2.961 7.8798 6.6018 7.8798s6.5953-3.529 6.5953-7.8798c0-4.3507-2.961-7.8733-6.5953-7.8733z" class="tw-fill-art-accent"/>
-<path d="m60.556 26.027c-0.4379 0-0.804 0.4267-0.804 0.9555l-0.0201 3.257c-2.0247 0.2075-3.8681 1.1748-5.3381 2.6521l-1.9561-2.2909c-0.156-0.1901-0.3638-0.2856-0.5654-0.2866h0.0033-0.0065 0.0032c-0.2015 1e-3 -0.4028 0.0965-0.5588 0.2866-0.3138 0.3695-0.3138 0.9746 0 1.3441l1.9348 2.3123 0.0034 0.0042c-1.2532 1.7574-2.0625 3.9789-2.2323 6.4166h0.7647c0.0488 0 0.0966 0.0053 0.143 0.0154-0.0465-0.01-0.0942-0.0152-0.143-0.0152h-3.497c-0.438 0-0.804 0.4268-0.804 0.9491 0 0.5224 0.366 0.9555 0.804 0.9555h2.7323c0.1698 2.4381 0.986 4.66 2.2331 6.4175l-0.0028 0.0034-1.9297 2.3187c-0.3138 0.3694-0.3138 0.9746 0 1.344 0.1568 0.1848 0.3595 0.2803 0.5621 0.2803s0.4118-0.0955 0.5687-0.2803l1.9282-2.3123 1e-4 -1e-4c1.4757 1.4954 3.3361 2.4695 5.3729 2.6684v3.2622c0 0.5287 0.3661 0.9555 0.804 0.9555 0.438 0 0.7975-0.4268 0.7975-0.9555l0.0212-3.263c2.0293-0.2066 3.8833-1.1701 5.3555-2.6581l0.0028 0.0033 1.9282 2.306c0.1569 0.1847 0.3661 0.2803 0.5687 0.2803s0.4118-0.0956 0.5687-0.2803c0.3137-0.3695 0.3137-0.9746 0-1.3441l-1.9269-2.3334c1.2466-1.7626 2.0628-3.9762 2.2337-6.4125h2.7195c0.438 0 0.804-0.4268 0.804-0.9555s-0.366-0.9491-0.804-0.9491l-2.7198-0.0166c-0.1709-2.4276-0.9825-4.634-2.2222-6.3932l1.9157-2.3235c0.3137-0.3695 0.3137-0.9746 0-1.3441-0.1569-0.1911-0.3661-0.2866-0.5687-0.2866s-0.4118 0.0955-0.5687 0.2866l-1.9222 2.2988c-1.4756-1.4884-3.3591-2.454-5.3855-2.665v-3.252c0-0.5288-0.353-0.9555-0.7975-0.9555zm6.72 8.9311c0.0201-0.02 0.0396-0.0413 0.0584-0.0642l0.0144-0.0173-0.021 0.0239c-0.0167 0.0203-0.034 0.0395-0.0518 0.0576zm1.2545 6.6691c-0.0028-0.0609-0.0032-0.1186-0.0013-0.1732-0.0775-5.1648-3.6205-9.3364-7.9594-9.3438l-0.0138 1e-4 -0.0114-1e-4c-4.3862 0.0089-7.9565 4.2734-7.9565 9.5168 0 5.2239 3.5479 9.4824 7.9117 9.5229 0.0178-9e-4 0.036-0.0014 0.0546-0.0014 0.0194 0 0.0385 5e-4 0.0572 0.0015 4.3591-0.0317 7.9116-4.2849 7.9189-9.5068v-0.016zm-13.411 7.6696c0.0205-0.0858 0.0307-0.174 0.0307-0.2615 0-0.242-0.0784-0.4904-0.2353-0.6752-0.1503-0.1911-0.3595-0.2803-0.5621-0.2803l-0.0114 1e-4h0.0113c0.2026 0 0.4118 0.0892 0.5621 0.2803 0.1569 0.1847 0.2353 0.4332 0.2353 0.6752 0 0.0874-0.0102 0.1757-0.0306 0.2614zm-2.5382-7.6696c0-0.0236-7e-4 -0.0471-0.0021-0.0702 0.0014 0.0231 0.0022 0.0465 0.0022 0.07 0 0.0175-4e-4 0.0349-0.0012 0.0521 7e-4 -0.0172 0.0011-0.0345 0.0011-0.0519z" clip-rule="evenodd" class="tw-fill-art-primary" fill-rule="evenodd"/>
-<path d="m25.442 10.125c0-1.2133 1.0146-2.1704 2.2154-2.1008l58.262 3.4199c1.1054 0.0669 1.9723 0.9842 1.9723 2.1009v7.3296h2v-7.3296c0-2.1736-1.6899-3.9673-3.853-4.0974l-58.264-3.42c-2.1001-0.12216-3.8976 1.356-4.264 3.347h-8.7578c-2.2641 0-4.0891 1.845-4.0891 4.1081v55.945c0 2.2631 1.825 4.1081 4.0891 4.1081h8.7036c0.1798 2.1936 2.0771 3.8865 4.3187 3.7561l58.264-3.4201c2.1631-0.1301 3.853-1.9237 3.853-4.0973v-11.184h-2v11.184c0 1.117-0.8674 2.0344-1.9731 2.1009l-58.261 3.4199c-1.2008 0.0696-2.2155-0.8875-2.2155-2.1009v-63.07zm-2 61.411v-60.162h-8.6897c-1.148 0-2.0891 0.9381-2.0891 2.1081v55.945c0 1.1701 0.9411 2.1081 2.0891 2.1081h8.6897zm64.449-36.67v9.4289h2v-9.4289h-2z" clip-rule="evenodd" class="tw-fill-art-primary" fill-rule="evenodd"/>
-</g>
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 10 96 80">
+    <path class="tw-fill-illustration-bg-primary" d="M10 80h14l-2 10H12l-2-10Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="m10 80 2 10h10l2-10H10Zm2.44 2 1.2 6h6.72l1.2-6h-9.12Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M72 80h14l-2 10H74l-2-10Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="m72 80 2 10h10l2-10H72Zm2.44 2 1.2 6h6.72l1.2-6h-9.12Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="m12.5 82 .5 3h8l.5-3h-9ZM74.5 82l.5 3h8l.5-3h-9Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M0 18a8 8 0 0 1 8-8h80a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8H8a8 8 0 0 1-8-8V18Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M88 12H8a6 6 0 0 0-6 6v56a6 6 0 0 0 6 6h80a6 6 0 0 0 6-6V18a6 6 0 0 0-6-6ZM8 10a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h80a8 8 0 0 0 8-8V18a8 8 0 0 0-8-8H8Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M8 22a4 4 0 0 1 4-4h72a4 4 0 0 1 4 4v48a4 4 0 0 1-4 4H12a4 4 0 0 1-4-4V22Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M84 20H12a2 2 0 0 0-2 2v48a2 2 0 0 0 2 2h72a2 2 0 0 0 2-2V22a2 2 0 0 0-2-2Zm-72-2a4 4 0 0 0-4 4v48a4 4 0 0 0 4 4h72a4 4 0 0 0 4-4V22a4 4 0 0 0-4-4H12Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M84 26a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-4a2 2 0 0 1-2-2V26Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M90 26h-4v10h4V26Zm-4-2a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V26a2 2 0 0 0-2-2h-4Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M84 56a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-4a2 2 0 0 1-2-2V56Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M90 56h-4v10h4V56Zm-4-2a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V56a2 2 0 0 0-2-2h-4Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M86 62v4h4v-4h-4ZM86 32v4h4v-4h-4Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" d="M64 46c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M48 60c7.732 0 14-6.268 14-14s-6.268-14-14-14-14 6.268-14 14 6.268 14 14 14Zm0 2c8.837 0 16-7.163 16-16s-7.163-16-16-16-16 7.163-16 16 7.163 16 16 16Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M48 55a1 1 0 0 1-1-1V40.414l-5.293 5.293a1 1 0 0 1-1.414-1.414l7-7a1 1 0 0 1 1.414 0l7 7a1 1 0 0 1-1.414 1.414L49 40.414V54a1 1 0 0 1-1 1Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M76 22a4 4 0 0 1 4-4h4a4 4 0 0 1 4 4v48a4 4 0 0 1-4 4h-4a4 4 0 0 1-4-4V22Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M84 20h-4a2 2 0 0 0-2 2v48a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V22a2 2 0 0 0-2-2Zm-4-2a4 4 0 0 0-4 4v48a4 4 0 0 0 4 4h4a4 4 0 0 0 4-4V22a4 4 0 0 0-4-4h-4Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/vault.icon.ts b/libs/assets/src/svg/svgs/vault.icon.ts
index 21fcac24e7e..61ec2589b34 100644
--- a/libs/assets/src/svg/svgs/vault.icon.ts
+++ b/libs/assets/src/svg/svgs/vault.icon.ts
@@ -1,23 +1,23 @@
 import { svgIcon } from "../icon-service";
 
 export const VaultIcon = svgIcon`
-  <svg viewBox="0 0 120 100" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect x="5.61279" y="1.5" width="108.775" height="89.1503" rx="9.25741" class="tw-stroke-art-primary" stroke-width="2"/>
-    <path d="M49.5854 61.4941L49.5854 70.4652" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-    <path d="M49.5854 21.6851L49.5854 30.6562" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-    <path d="M38.6827 56.978L32.3392 63.3215" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-    <path d="M66.8324 28.8286L60.4889 35.1721" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-    <path d="M38.6827 35.1721L32.3392 28.8286" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-    <path d="M66.8324 63.3215L60.4889 56.978" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-    <path d="M74.1788 46.0513L65.2077 46.0513" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-    <path d="M33.6777 46.0513L24.7066 46.0514" class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round"/>
-    <ellipse cx="49.5855" cy="46.0513" rx="15.0433" ry="15.0433" class="tw-stroke-art-primary" stroke-width="2"/>
-    <ellipse cx="49.5855" cy="46.0513" rx="10.4146" ry="10.4146" class="tw-stroke-art-accent" />
-    <path d="M14.0227 90.6504V95.0286C14.0227 96.9458 15.577 98.5001 17.4942 98.5001H27.9327C29.8499 98.5001 31.4042 96.9458 31.4042 95.0286V90.6504" class="tw-stroke-art-primary" stroke-width="2"/>
-    <path d="M88.595 90.6504V95.0286C88.595 96.9458 90.1492 98.5001 92.0665 98.5001H102.505C104.422 98.5001 105.976 96.9458 105.976 95.0286V90.6504" class="tw-stroke-art-primary" stroke-width="2"/>
-    <path d="M105.977 32.3381L107.588 32.3381C108.866 32.3381 109.902 31.302 109.902 30.0238L109.902 17.271C109.902 15.9928 108.866 14.9566 107.588 14.9566L105.977 14.9566" class="tw-stroke-art-primary" stroke-width="2"/>
-    <path d="M105.977 77.1936L107.588 77.1936C108.866 77.1936 109.902 76.1574 109.902 74.8793L109.902 62.1265C109.902 60.8483 108.866 59.8121 107.588 59.8121L105.977 59.8121" class="tw-stroke-art-primary" stroke-width="2"/>
-    <rect x="14.0227" y="9.9104" width="91.9537" height="72.8902" rx="4.6287" class="tw-stroke-art-accent" />
-    <path d="M101.08 61.8082V75.5593C101.08 76.8375 100.044 77.8737 98.7654 77.8737H45.8796M19.4989 28.7961V17.122C19.4989 15.8438 20.5351 14.8076 21.8133 14.8076H74.5501" class="tw-stroke-art-accent"  stroke-linecap="round"/>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 8.33 80 66.67">
+    <path class="tw-fill-illustration-bg-primary" d="M8.333 66.667H20L18.333 75H10l-1.667-8.333Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M8.333 66.667 10 75h8.333L20 66.667H8.333Zm2.033 1.667 1 5h5.601l1-5h-7.6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M60 66.667h11.667L70 75h-8.333L60 66.667Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M60 66.667 61.667 75H70l1.667-8.333H60Zm2.033 1.667 1 5h5.6l1-5h-7.6Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="m10.417 68.334.416 2.5H17.5l.417-2.5h-7.5ZM62.084 68.334l.416 2.5h6.667l.416-2.5h-7.5Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M0 15a6.667 6.667 0 0 1 6.667-6.666h66.666A6.667 6.667 0 0 1 80 15.001v46.666a6.667 6.667 0 0 1-6.666 6.667H6.666A6.667 6.667 0 0 1 0 61.667V15.001Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M73.334 10H6.666a5 5 0 0 0-5 5v46.667a5 5 0 0 0 5 5h66.666a5 5 0 0 0 5-5V15.001a5 5 0 0 0-5-5ZM6.666 8.335A6.667 6.667 0 0 0 0 15.001v46.666a6.667 6.667 0 0 0 6.667 6.667h66.666A6.667 6.667 0 0 0 80 61.667V15.001a6.667 6.667 0 0 0-6.666-6.667H6.666Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-tertiary" d="M6.667 18.333A3.333 3.333 0 0 1 10 15h60a3.333 3.333 0 0 1 3.333 3.333v40A3.333 3.333 0 0 1 70 61.667H10a3.333 3.333 0 0 1-3.333-3.334v-40Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M70 16.667H10c-.92 0-1.667.746-1.667 1.666v40C8.333 59.253 9.08 60 10 60h60c.92 0 1.667-.746 1.667-1.667v-40c0-.92-.746-1.666-1.667-1.666ZM10 15a3.333 3.333 0 0 0-3.333 3.333v40A3.333 3.333 0 0 0 10 61.667h60a3.333 3.333 0 0 0 3.333-3.334v-40A3.333 3.333 0 0 0 70 15H10Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M45 38.333c0 8.745-7.089 15.834-15.833 15.834-8.745 0-15.834-7.09-15.834-15.834S20.423 22.5 29.167 22.5 45 29.589 45 38.333Z"/>
+    <path class="tw-fill-illustration-tertiary" d="M36.667 38.334a7.5 7.5 0 1 1-15 0 7.5 7.5 0 0 1 15 0Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M30 25a.833.833 0 0 0-1.666 0v4.204A9.125 9.125 0 0 0 23.3 31.29l-2.973-2.973a.834.834 0 0 0-1.179 1.179l2.973 2.973a9.125 9.125 0 0 0-2.084 5.032h-4.204a.833.833 0 1 0 0 1.667h4.204a9.125 9.125 0 0 0 2.084 5.032l-2.973 2.974a.833.833 0 1 0 1.179 1.178l2.973-2.973a9.127 9.127 0 0 0 5.033 2.085v4.204a.833.833 0 0 0 1.666 0v-4.204a9.127 9.127 0 0 0 5.033-2.085l2.973 2.973a.833.833 0 0 0 1.178-1.178l-2.973-2.974a9.125 9.125 0 0 0 2.085-5.032H42.5a.833.833 0 1 0 0-1.667h-4.204a9.125 9.125 0 0 0-2.085-5.032l2.973-2.973a.833.833 0 1 0-1.178-1.179l-2.973 2.973A9.125 9.125 0 0 0 30 29.204V25Zm4.468 18.64a7.5 7.5 0 1 1 0-10.61h.002l.003.003a7.476 7.476 0 0 1 2.194 5.297v.004c0 2.07-.839 3.944-2.195 5.301l-.002.002-.002.002ZM32.5 38.333a3.333 3.333 0 1 1-6.667 0 3.333 3.333 0 0 1 6.667 0Zm1.667 0a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M69.167 21.667c0-.92.746-1.667 1.666-1.667h3.334c.92 0 1.666.746 1.666 1.667V30c0 .92-.746 1.667-1.666 1.667h-3.334c-.92 0-1.666-.747-1.666-1.667v-8.333Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M74.167 21.667h-3.334V30h3.334v-8.333ZM70.833 20c-.92 0-1.666.746-1.666 1.667V30c0 .92.746 1.667 1.666 1.667h3.334c.92 0 1.666-.747 1.666-1.667v-8.333c0-.92-.746-1.667-1.666-1.667h-3.334Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-primary" d="M69.167 46.667c0-.92.746-1.667 1.666-1.667h3.334c.92 0 1.666.746 1.666 1.667V55c0 .92-.746 1.667-1.666 1.667h-3.334c-.92 0-1.666-.747-1.666-1.667v-8.333Z"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M74.167 46.667h-3.334V55h3.334v-8.333ZM70.833 45c-.92 0-1.666.746-1.666 1.667V55c0 .92.746 1.667 1.666 1.667h3.334c.92 0 1.666-.747 1.666-1.667v-8.333c0-.92-.746-1.667-1.666-1.667h-3.334Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M70.834 51.667V55h3.333v-3.333h-3.334ZM70.834 26.667V30h3.333v-3.333h-3.334Z" clip-rule="evenodd"/>
   </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/wave.icon.ts b/libs/assets/src/svg/svgs/wave.icon.ts
index b7e16213d0f..6c97d0fbbb3 100644
--- a/libs/assets/src/svg/svgs/wave.icon.ts
+++ b/libs/assets/src/svg/svgs/wave.icon.ts
@@ -1,34 +1,11 @@
 import { svgIcon } from "../icon-service";
 
 export const WaveIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
-  <path
-    class="tw-stroke-art-primary"
-    stroke-linejoin="round"
-    stroke-width="2"
-    d="M48.603 49.08c.188-.341.365-.688.566-1.022 4.409-7.312 8.826-14.62 13.228-21.936 2.131-3.54.316-7.806-3.688-8.72-2.335-.533-4.776.562-6.204 2.844-2.924 4.673-5.823 9.362-8.732 14.043-2.2 3.542-4.384 7.094-6.609 10.62-1.844 2.926-4.231 5.315-7.246 7.035-1.851 1.057-2.841.543-3.122-1.554-.548-4.105-1.184-8.194-2.445-12.155-1.625-5.1-6.98-7.558-11.909-5.469-1.134.482-1.361.949-1.091 2.137.703 3.086 1.53 6.152 2.06 9.27.79 4.638.403 9.275-.4 13.894a90.84 90.84 0 0 0-1.352 14.404c-.062 4.798 1.476 8.947 4.824 12.337 3.655 3.702 7.422 7.313 11.933 9.989 7.128 4.23 14.348 4.162 21.605.282 3.89-2.08 7.273-4.84 10.478-7.827 8.691-8.101 5.227-5.375 16.072-11.488 4.7-2.65 9.434-5.242 14.15-7.863 2.708-1.505 3.593-4.521 2.146-7.276-1.4-2.666-4.426-3.627-7.186-2.228-6.594 3.345-13.174 6.717-19.76 10.076-.325.165-.652.323-1.085.344.371-.304.734-.619 1.116-.91 7.578-5.801 15.158-11.601 22.737-17.401 1.86-1.425 2.714-3.3 2.344-5.624-.36-2.26-1.707-3.769-3.873-4.483-1.897-.626-3.628-.245-5.257.928-7.792 5.607-15.604 11.188-23.41 16.776-.274.196-.551.389-.974.452.234-.278.454-.572.705-.835 7.24-7.632 14.493-15.25 21.72-22.893 3.354-3.549 1.622-9.313-3.127-10.382-2.274-.512-4.275.06-5.936 1.796-7.056 7.373-14.134 14.721-21.197 22.087-.293.306-.51.686-.764 1.031l-.317-.278Z"
-  />
-  <path
-    class="tw-stroke-art-primary"
-    stroke-linecap="round"
-    stroke-width="2"
-    d="M49.237 2.496c-13.4 0-24.262 10.863-24.262 24.262"
-  />
-  <path
-    class="tw-stroke-art-accent"
-    stroke-linecap="round"
-    d="M46.57 8.895c-8.393 0-15.196 6.804-15.196 15.197"
-  />
-  <path
-    class="tw-stroke-art-primary"
-    stroke-linecap="round"
-    stroke-width="2"
-    d="M84.49 93.027c13.4 0 24.262-10.863 24.262-24.262"
-  />
-  <path
-    class="tw-stroke-art-accent"
-    stroke-linecap="round"
-    d="M87.157 86.628c8.393 0 15.197-6.804 15.197-15.197"
-  />
-</svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="3.33 3.33 73.33 73.33">
+    <path class="tw-fill-illustration-bg-primary" d="m16.921 66.662-1.673-1.674a17.425 17.425 0 0 1-3.735-19.09l3.215-7.627c.717-1.7 1.283-3.46 1.692-5.26l3.285-14.46a2.222 2.222 0 0 1 2.666-1.673 5.079 5.079 0 0 1 3.855 5.857l-2.025 11.138a4.14 4.14 0 0 0 .58 2.963c.433.68 1.443.626 1.8-.097l9.292-18.772L41.46 8.09a2.163 2.163 0 0 1 2.85-.87 4.944 4.944 0 0 1 2.158 6.735l-3.95 7.46-4.144 10.261a3.619 3.619 0 0 0 .252 3.218.905.905 0 0 0 1.478.105l9.44-11.595 10.003-10.718a2.359 2.359 0 0 1 3.474.026 5.392 5.392 0 0 1-.048 7.287l-7.595 8.178-8.34 10.405a3.512 3.512 0 0 0-.649 3.12.878.878 0 0 0 1.344.493l11.092-7.608 11.191-5.598a2.29 2.29 0 0 1 3.215 1.375 5.236 5.236 0 0 1-2.74 6.26l-8.625 4.14c-.26.124-.51.267-.749.428l-9.414 6.322a3.73 3.73 0 0 0-1.64 3.383.933.933 0 0 0 1.284.792l8.651-3.544 8.318-2.138a1.731 1.731 0 0 1 2.057 1.084 3.957 3.957 0 0 1-2.402 5.088l-6.886 2.428-9.987 4.926c-.446.22-.863.495-1.241.818l-8.522 7.274c-7.143 6.098-17.774 5.68-24.415-.962Z"/>
+    <path class="tw-fill-illustration-bg-secondary" fill-rule="evenodd" d="M24.185 36.4a.833.833 0 0 1 1.175-.082c6.917 6.003 7.658 16.477 1.655 23.394a.833.833 0 1 1-1.259-1.093c5.4-6.221 4.734-15.643-1.488-21.043a.833.833 0 0 1-.083-1.175Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" fill-rule="evenodd" d="M75.833 61.667c.46 0 .834.373.834.833 0 7.824-6.343 14.167-14.167 14.167a.833.833 0 1 1 0-1.667C69.403 75 75 69.404 75 62.5c0-.46.373-.833.833-.833ZM4.167 18.334a.833.833 0 0 1-.834-.833c0-7.824 6.343-14.167 14.167-14.167a.833.833 0 0 1 0 1.667C10.596 5 5 10.597 5 17.5c0 .46-.373.833-.833.833Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-tertiary" fill-rule="evenodd" d="M71.667 61.667c.46 0 .833.373.833.833 0 5.523-4.477 10-10 10a.833.833 0 0 1 0-1.666 8.333 8.333 0 0 0 8.333-8.334c0-.46.373-.833.834-.833ZM8.333 18.334a.833.833 0 0 1-.833-.833c0-5.523 4.477-10 10-10a.833.833 0 0 1 0 1.666 8.333 8.333 0 0 0-8.333 8.334c0 .46-.373.833-.834.833Z" clip-rule="evenodd"/>
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M58.968 12.05a3.16 3.16 0 0 1 4.632.058 6.15 6.15 0 0 1-.164 8.427l-7.431 7.597-8.351 10.945a2.74 2.74 0 0 0-.466 2.384c.004.014.01.02.014.025a.063.063 0 0 0 .024.015c.01.004.02.005.028.004a.056.056 0 0 0 .027-.01l11.12-7.63 11.244-5.622a3.124 3.124 0 0 1 4.383 1.875 6.07 6.07 0 0 1-3.175 7.257l-7.942 3.811c-.678.325-1.332.7-1.957 1.119l-8.785 5.9a2.898 2.898 0 0 0-1.274 2.628.1.1 0 0 0 .137.084l8.705-3.565 8.372-2.153a2.565 2.565 0 0 1 3.048 1.605 4.79 4.79 0 0 1-2.907 6.16l-6.84 2.41-9.942 4.905c-.384.19-.743.426-1.069.704l-8.522 7.275c-7.474 6.38-18.597 5.942-25.545-1.007l-1.674-1.673a18.259 18.259 0 0 1-3.913-20.004l3.215-7.627a30.676 30.676 0 0 0 1.647-5.12l3.285-14.461a3.055 3.055 0 0 1 3.667-2.3 5.912 5.912 0 0 1 4.487 6.818l-2.025 11.138a3.306 3.306 0 0 0 .463 2.366c.085.133.281.122.351-.018l9.301-18.793 5.6-9.899a2.996 2.996 0 0 1 3.947-1.204 5.777 5.777 0 0 1 2.522 7.87l-3.93 7.422-4.128 10.223a2.782 2.782 0 0 0 .194 2.473.07.07 0 0 0 .115.008l10.415-12.856 9.096-9.564Zm3.396 1.176a1.493 1.493 0 0 0-2.189-.027l-9.05 9.516L40.75 35.52a1.737 1.737 0 0 1-2.84-.2 4.45 4.45 0 0 1-.31-3.955l4.16-10.302 3.971-7.499a4.11 4.11 0 0 0-1.794-5.6 1.33 1.33 0 0 0-1.752.535l-5.576 9.859-9.281 18.75c-.646 1.305-2.47 1.403-3.25.175a4.972 4.972 0 0 1-.698-3.559l2.025-11.138a4.246 4.246 0 0 0-3.222-4.896 1.389 1.389 0 0 0-1.667 1.045l-3.284 14.461c-.42 1.847-1.001 3.654-1.737 5.399l-3.215 7.627a16.592 16.592 0 0 0 3.556 18.177l1.674 1.674c6.333 6.333 16.472 6.733 23.284.918l8.522-7.275c.43-.368.906-.68 1.414-.931l10.031-4.949 6.933-2.444a3.124 3.124 0 0 0 1.897-4.017.898.898 0 0 0-1.068-.562l-8.261 2.124-8.6 3.522a1.766 1.766 0 0 1-2.43-1.499 4.564 4.564 0 0 1 2.007-4.139l8.785-5.9c.691-.464 1.414-.877 2.165-1.237l7.942-3.812a4.403 4.403 0 0 0 2.303-5.264 1.457 1.457 0 0 0-2.045-.875l-11.14 5.572-11.027 7.564c-.98.672-2.33.177-2.642-.97a4.407 4.407 0 0 1 .748-3.833l8.413-11.026 7.502-7.67a4.483 4.483 0 0 0 .12-6.144Z" clip-rule="evenodd"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/webauthn.icon.ts b/libs/assets/src/svg/svgs/webauthn.icon.ts
deleted file mode 100644
index 923c75b43c4..00000000000
--- a/libs/assets/src/svg/svgs/webauthn.icon.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { svgIcon } from "../icon-service";
-
-export const WebAuthnIcon = svgIcon`
- <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="62.176998"
-    height="60.152"
-    fill="none"
-    class="tw-text-primary-600"
-    role="img"
-    aria-label="[title]"
-  >
-    <title>Webauthn</title>
-    <g stroke="currentColor" clip-path="url(#webauthn-clip)" transform="translate(-6.081,-1.143)">
-      <path
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-miterlimit="10"
-        stroke-width="2"
-        d="M20.418 33.19c5.614 0 10.42 3.56 12.396 8.533h29.012l5.434 5.522-4.491 4.563h-6.602l-3.413-3.468-3.279 3.24-1.167-1.187-1.303 1.323-3.188-3.24-3.1 3.149H32.86c-1.932 5.065-6.782 8.67-12.44 8.67-7.366 0-13.339-6.069-13.339-13.553 0-7.483 5.928-13.552 13.338-13.552Zm-6.152 16.975c1.841 0 3.368-1.506 3.368-3.422 0-1.871-1.482-3.423-3.368-3.423-1.887 0-3.369 1.506-3.369 3.422 0 1.917 1.527 3.423 3.369 3.423Z"
-      />
-      <path
-        stroke-linecap="round"
-        d="M59.78 44.722H36.32M19.99 36.722c4.036 0 7.569 2.405 9.51 6"
-      />
-      <circle
-        cx="12.24"
-        cy="12.24"
-        r="12.24"
-        stroke-width="2"
-        transform="matrix(-1 0 0 1 50.6 2.143)"
-      />
-      <path
-        stroke-width="2"
-        d="M22.753 33.423c3.836-4.174 9.41-6.8 15.615-6.8 9.698 0 17.857 6.417 20.243 15.13"
-      />
-    </g>
-    <defs>
-      <clipPath id="webauthn-clip"><path fill="#fff" d="M68.5.62H.5v61h68z" /></clipPath>
-    </defs>
-  </svg>
-`;
diff --git a/libs/auth/package.json b/libs/auth/package.json
index 52c1be63f81..cab83bd3b8d 100644
--- a/libs/auth/package.json
+++ b/libs/auth/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest"
   }
 }
diff --git a/libs/auth/project.json b/libs/auth/project.json
new file mode 100644
index 00000000000..753e7d929b1
--- /dev/null
+++ b/libs/auth/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/auth",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/auth/src",
+  "projectType": "library",
+  "tags": ["scope:auth", "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/auth/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/auth/src/angular/index.ts b/libs/auth/src/angular/index.ts
index fdd06509511..454a9091c25 100644
--- a/libs/auth/src/angular/index.ts
+++ b/libs/auth/src/angular/index.ts
@@ -59,6 +59,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.ts b/libs/auth/src/angular/input-password/input-password.component.ts
index 32b02bf016a..dda471c7129 100644
--- a/libs/auth/src/angular/input-password/input-password.component.ts
+++ b/libs/auth/src/angular/input-password/input-password.component.ts
@@ -303,6 +303,14 @@ export class InputPasswordComponent implements OnInit {
         throw new Error("KdfConfig is required to create master key.");
       }
 
+      const salt =
+        this.userId != null
+          ? await firstValueFrom(this.masterPasswordService.saltForUser$(this.userId))
+          : this.masterPasswordService.emailToSalt(this.email);
+      if (salt == null) {
+        throw new Error("Salt is required to create master key.");
+      }
+
       // 2. Verify current password is correct (if necessary)
       if (
         this.flow === InputPasswordFlow.ChangePassword ||
@@ -348,6 +356,7 @@ export class InputPasswordComponent implements OnInit {
 
       const passwordInputResult: PasswordInputResult = {
         newPassword,
+        salt,
         newMasterKey,
         newServerMasterKeyHash,
         newLocalMasterKeyHash,
diff --git a/libs/auth/src/angular/input-password/password-input-result.ts b/libs/auth/src/angular/input-password/password-input-result.ts
index 37f337291e5..11c8f0d274d 100644
--- a/libs/auth/src/angular/input-password/password-input-result.ts
+++ b/libs/auth/src/angular/input-password/password-input-result.ts
@@ -1,18 +1,26 @@
+import { MasterPasswordSalt } from "@bitwarden/common/key-management/master-password/types/master-password.types";
 import { MasterKey } from "@bitwarden/common/types/key";
 import { KdfConfig } from "@bitwarden/key-management";
 
 export interface PasswordInputResult {
   currentPassword?: string;
+  newPassword: string;
+  kdfConfig?: KdfConfig;
+  salt?: MasterPasswordSalt;
+  newPasswordHint?: string;
+  rotateUserKey?: boolean;
+
+  /** @deprecated This low-level cryptographic state will be removed. It will be replaced by high level calls to masterpassword service, in the consumers of this interface. */
   currentMasterKey?: MasterKey;
+  /** @deprecated */
   currentServerMasterKeyHash?: string;
+  /** @deprecated */
   currentLocalMasterKeyHash?: string;
 
-  newPassword: string;
-  newPasswordHint?: string;
+  /** @deprecated */
   newMasterKey?: MasterKey;
+  /** @deprecated */
   newServerMasterKeyHash?: string;
+  /** @deprecated */
   newLocalMasterKeyHash?: string;
-
-  kdfConfig?: KdfConfig;
-  rotateUserKey?: boolean;
 }
diff --git a/libs/auth/src/angular/login/login.component.html b/libs/auth/src/angular/login/login.component.html
index e74d3a2f5a1..26e19f11147 100644
--- a/libs/auth/src/angular/login/login.component.html
+++ b/libs/auth/src/angular/login/login.component.html
@@ -38,7 +38,14 @@
 
     <div class="tw-grid tw-gap-3">
       <!-- Continue button -->
-      <button type="button" bitButton block buttonType="primary" (click)="continuePressed()">
+      <button
+        type="button"
+        bitButton
+        block
+        buttonType="primary"
+        (click)="continuePressed()"
+        [disabled]="ssoRequired"
+      >
         {{ "continue" | i18n }}
       </button>
 
@@ -52,6 +59,7 @@
           block
           buttonType="secondary"
           (click)="handleLoginWithPasskeyClick()"
+          [disabled]="ssoRequired"
         >
           <i class="bwi bwi-passkey tw-mr-1" aria-hidden="true"></i>
           {{ "logInWithPasskey" | i18n }}
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts
index b6941682236..9ade2c1d0af 100644
--- a/libs/auth/src/angular/login/login.component.ts
+++ b/libs/auth/src/angular/login/login.component.ts
@@ -1,5 +1,14 @@
 import { CommonModule } from "@angular/common";
-import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from "@angular/core";
+import {
+  Component,
+  DestroyRef,
+  ElementRef,
+  NgZone,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from "@angular/forms";
 import { ActivatedRoute, Router, RouterModule } from "@angular/router";
 import { firstValueFrom, Subject, take, takeUntil } from "rxjs";
@@ -17,13 +26,15 @@ import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.d
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { DevicesApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices-api.service.abstraction";
+import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { ClientType, HttpStatusCode } from "@bitwarden/common/enums";
-import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 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";
@@ -83,6 +94,7 @@ export class LoginComponent implements OnInit, OnDestroy {
   LoginUiState = LoginUiState;
   isKnownDevice = false;
   loginUiState: LoginUiState = LoginUiState.EMAIL_ENTRY;
+  ssoRequired = false;
 
   formGroup = this.formBuilder.group(
     {
@@ -108,6 +120,7 @@ export class LoginComponent implements OnInit, OnDestroy {
     private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
     private appIdService: AppIdService,
     private broadcasterService: BroadcasterService,
+    private destroyRef: DestroyRef,
     private devicesApiService: DevicesApiServiceAbstraction,
     private formBuilder: FormBuilder,
     private i18nService: I18nService,
@@ -124,8 +137,9 @@ export class LoginComponent implements OnInit, OnDestroy {
     private logService: LogService,
     private validationService: ValidationService,
     private loginSuccessHandlerService: LoginSuccessHandlerService,
-    private masterPasswordService: MasterPasswordServiceAbstraction,
     private configService: ConfigService,
+    private ssoLoginService: SsoLoginServiceAbstraction,
+    private environmentService: EnvironmentService,
   ) {
     this.clientType = this.platformUtilsService.getClientType();
   }
@@ -184,6 +198,15 @@ export class LoginComponent implements OnInit, OnDestroy {
     if (!this.activatedRoute) {
       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();
+    }
   }
 
   private async desktopOnInit(): Promise<void> {
@@ -210,6 +233,40 @@ export class LoginComponent implements OnInit, OnDestroy {
     this.messagingService.send("getWindowIsFocused");
   }
 
+  private async determineIfSsoRequired() {
+    const ssoRequiredCache = await firstValueFrom(this.ssoLoginService.ssoRequiredCache$);
+
+    // Only perform initial update and setup a subscription if there is actually a populated ssoRequiredCache
+    if (ssoRequiredCache != null && ssoRequiredCache.size > 0) {
+      // If the pre-filled/remembered email field value exists in the cache, set to true
+      if (
+        this.emailFormControl.value &&
+        ssoRequiredCache.has(this.emailFormControl.value.toLowerCase())
+      ) {
+        this.ssoRequired = true;
+      }
+
+      this.listenForEmailChanges(ssoRequiredCache);
+    }
+  }
+
+  private listenForEmailChanges(ssoRequiredCache: Set<string>) {
+    // On subsequent email field value changes, check and set again. This allows alternate login buttons
+    // to dynamically enable/disable depending on whether or not the entered email is in the ssoRequiredCache
+    this.formGroup.controls.email.valueChanges
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe(() => {
+        if (
+          this.emailFormControl.value &&
+          ssoRequiredCache.has(this.emailFormControl.value.toLowerCase())
+        ) {
+          this.ssoRequired = true;
+        } else {
+          this.ssoRequired = false;
+        }
+      });
+  }
+
   submit = async (): Promise<void> => {
     if (this.clientType === ClientType.Desktop) {
       if (this.loginUiState !== LoginUiState.MASTER_PASSWORD_ENTRY) {
@@ -252,7 +309,7 @@ export class LoginComponent implements OnInit, OnDestroy {
       await this.handleAuthResult(authResult);
     } catch (error) {
       this.logService.error(error);
-      this.handleSubmitError(error);
+      await this.handleSubmitError(error);
     }
   };
 
@@ -261,15 +318,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 {
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..2211b3390a7 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,6 +25,8 @@ 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).
  */
@@ -57,6 +58,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 +68,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 +184,8 @@ export class NewDeviceVerificationComponent implements OnInit, OnDestroy {
       codeControl.markAsTouched();
     }
   };
+
+  protected goBack() {
+    this.location.back();
+  }
 }
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 d4267dba1e4..9e75a8b888c 100644
--- a/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts
+++ b/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts
@@ -6,7 +6,7 @@ import { ActivatedRoute, RouterModule } from "@angular/router";
 import { Subject, firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { RegistrationExpiredLinkIcon } from "@bitwarden/assets/svg";
+import { TwoFactorTimeoutIcon } from "@bitwarden/assets/svg";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import { ButtonModule, IconModule } from "@bitwarden/components";
@@ -29,7 +29,7 @@ export class RegistrationLinkExpiredComponent implements OnInit, OnDestroy {
 
   loginRoute: string;
 
-  readonly Icons = { RegistrationExpiredLinkIcon };
+  readonly Icons = { TwoFactorTimeoutIcon };
 
   constructor(private activatedRoute: ActivatedRoute) {}
 
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 98257de500a..16018cecfa7 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
@@ -161,6 +161,7 @@ export class RegistrationStartComponent implements OnInit, OnDestroy {
       await this.router.navigate(["/finish-signup"], {
         queryParams: { token: result, email: this.email.value },
       });
+      return;
     }
 
     // Result is null, so email verification is required
diff --git a/libs/auth/src/angular/sso/sso.component.html b/libs/auth/src/angular/sso/sso.component.html
index 7a3fa8db973..be38f63987e 100644
--- a/libs/auth/src/angular/sso/sso.component.html
+++ b/libs/auth/src/angular/sso/sso.component.html
@@ -8,7 +8,6 @@
       <bit-label>{{ "ssoIdentifier" | i18n }}</bit-label>
       <input bitInput type="text" formControlName="identifier" appAutofocus />
     </bit-form-field>
-    <hr />
     <div class="tw-flex tw-gap-2">
       <button type="submit" bitButton bitFormButton buttonType="primary" [block]="true">
         {{ "continue" | i18n }}
diff --git a/libs/auth/src/angular/sso/sso.component.ts b/libs/auth/src/angular/sso/sso.component.ts
index 8cc30bd62a6..8636595759e 100644
--- a/libs/auth/src/angular/sso/sso.component.ts
+++ b/libs/auth/src/angular/sso/sso.component.ts
@@ -290,6 +290,7 @@ export class SsoComponent implements OnInit {
     this.identifier = this.identifierFormControl.value ?? "";
     await this.ssoLoginService.setOrganizationSsoIdentifier(this.identifier);
     this.ssoComponentService.setDocumentCookies?.();
+
     try {
       await this.submitSso();
     } catch (error) {
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 56bce040d2f..70d8836edd5 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
@@ -41,7 +41,9 @@
       "
     >
       <div class="tw-flex tw-flex-col tw-items-center">
-        <bit-icon [icon]="Icons.UserVerificationBiometricsIcon" class="tw-mb-4"></bit-icon>
+        <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>
         <div *ngIf="!biometricsVerificationFailed">
           <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
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 87b2dda46a5..e2f326d836d 100644
--- a/libs/auth/src/common/login-strategies/login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/login.strategy.spec.ts
@@ -38,7 +38,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { FakeAccountService, makeEncString, mockAccountServiceWith } from "@bitwarden/common/spec";
+import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
 import {
   PasswordStrengthServiceAbstraction,
   PasswordStrengthService,
@@ -61,7 +61,7 @@ const masterPassword = "password";
 const deviceId = Utils.newGuid();
 const accessToken = "ACCESS_TOKEN";
 const refreshToken = "REFRESH_TOKEN";
-const encryptedUserKey = makeEncString("USER_KEY");
+const encryptedUserKey = "USER_KEY";
 const privateKey = "PRIVATE_KEY";
 const kdf = 0;
 const kdfIterations = 10000;
@@ -76,7 +76,7 @@ const defaultUserDecryptionOptionsServerResponse: IUserDecryptionOptionsServerRe
       KdfType: kdf,
       Iterations: kdfIterations,
     },
-    MasterKeyEncryptedUserKey: encryptedUserKey.encryptedString,
+    MasterKeyEncryptedUserKey: encryptedUserKey,
   },
 };
 
@@ -99,7 +99,7 @@ export function identityTokenResponseFactory(
     ForcePasswordReset: false,
     Kdf: kdf,
     KdfIterations: kdfIterations,
-    Key: encryptedUserKey.encryptedString,
+    Key: encryptedUserKey,
     PrivateKey: privateKey,
     ResetMasterPassword: false,
     access_token: accessToken,
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
new file mode 100644
index 00000000000..86f7be8dfc7
--- /dev/null
+++ b/libs/auth/src/common/services/login-success-handler/default-login-success-handler.service.spec.ts
@@ -0,0 +1,120 @@
+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";
+import { UserAsymmetricKeysRegenerationService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+
+import { LoginEmailService } from "../login-email/login-email.service";
+
+import { DefaultLoginSuccessHandlerService } from "./default-login-success-handler.service";
+
+describe("DefaultLoginSuccessHandlerService", () => {
+  let service: DefaultLoginSuccessHandlerService;
+
+  let configService: MockProxy<ConfigService>;
+  let loginEmailService: MockProxy<LoginEmailService>;
+  let ssoLoginService: MockProxy<SsoLoginServiceAbstraction>;
+  let syncService: MockProxy<SyncService>;
+  let userAsymmetricKeysRegenerationService: MockProxy<UserAsymmetricKeysRegenerationService>;
+  let logService: MockProxy<LogService>;
+
+  const userId = "USER_ID" as UserId;
+  const testEmail = "test@bitwarden.com";
+
+  beforeEach(() => {
+    configService = mock<ConfigService>();
+    loginEmailService = mock<LoginEmailService>();
+    ssoLoginService = mock<SsoLoginServiceAbstraction>();
+    syncService = mock<SyncService>();
+    userAsymmetricKeysRegenerationService = mock<UserAsymmetricKeysRegenerationService>();
+    logService = mock<LogService>();
+
+    service = new DefaultLoginSuccessHandlerService(
+      configService,
+      loginEmailService,
+      ssoLoginService,
+      syncService,
+      userAsymmetricKeysRegenerationService,
+      logService,
+    );
+
+    syncService.fullSync.mockResolvedValue(true);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe("run", () => {
+    it("should call required services on successful login", async () => {
+      await service.run(userId);
+
+      expect(syncService.fullSync).toHaveBeenCalledWith(true, { skipTokenRefresh: true });
+      expect(userAsymmetricKeysRegenerationService.regenerateIfNeeded).toHaveBeenCalledWith(userId);
+      expect(loginEmailService.clearLoginEmail).toHaveBeenCalled();
+    });
+
+    describe("when PM22110_DisableAlternateLoginMethods flag is disabled", () => {
+      beforeEach(() => {
+        configService.getFeatureFlag.mockResolvedValue(false);
+      });
+
+      it("should not check SSO requirements", async () => {
+        await service.run(userId);
+
+        expect(ssoLoginService.getSsoEmail).not.toHaveBeenCalled();
+        expect(ssoLoginService.updateSsoRequiredCache).not.toHaveBeenCalled();
+      });
+    });
+
+    describe("given PM22110_DisableAlternateLoginMethods flag is enabled", () => {
+      beforeEach(() => {
+        configService.getFeatureFlag.mockResolvedValue(true);
+      });
+
+      it("should check feature flag", 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();
+        });
+      });
+    });
+  });
+});
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 28e509b2c8a..78003a4fca0 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,19 +1,42 @@
+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";
 import { UserAsymmetricKeysRegenerationService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
 
 import { LoginSuccessHandlerService } from "../../abstractions/login-success-handler.service";
 import { LoginEmailService } from "../login-email/login-email.service";
 
 export class DefaultLoginSuccessHandlerService implements LoginSuccessHandlerService {
   constructor(
+    private configService: ConfigService,
+    private loginEmailService: LoginEmailService,
+    private ssoLoginService: SsoLoginServiceAbstraction,
     private syncService: SyncService,
     private userAsymmetricKeysRegenerationService: UserAsymmetricKeysRegenerationService,
-    private loginEmailService: LoginEmailService,
+    private logService: LogService,
   ) {}
   async run(userId: UserId): Promise<void> {
     await this.syncService.fullSync(true, { skipTokenRefresh: true });
     await this.userAsymmetricKeysRegenerationService.regenerateIfNeeded(userId);
     await this.loginEmailService.clearLoginEmail();
+
+    const disableAlternateLoginMethodsFlagEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.PM22110_DisableAlternateLoginMethods,
+    );
+
+    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();
+    }
   }
 }
diff --git a/libs/billing/package.json b/libs/billing/package.json
index 8858cfaa266..3afd267cc23 100644
--- a/libs/billing/package.json
+++ b/libs/billing/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest --passWithNoTests"
   }
 }
diff --git a/libs/billing/project.json b/libs/billing/project.json
new file mode 100644
index 00000000000..829f65a9eb0
--- /dev/null
+++ b/libs/billing/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/billing",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/billing/src",
+  "projectType": "library",
+  "tags": ["scope:billing", "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/billing/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/client-type/package.json b/libs/client-type/package.json
index 1db72603bf9..9a18cf28181 100644
--- a/libs/client-type/package.json
+++ b/libs/client-type/package.json
@@ -4,8 +4,8 @@
   "description": "Exports the ClientType enum",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/client-type/project.json b/libs/client-type/project.json
index 8231e6634e4..1e6268afdf1 100644
--- a/libs/client-type/project.json
+++ b/libs/client-type/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/client-type",
         "main": "libs/client-type/src/index.ts",
         "tsConfig": "libs/client-type/tsconfig.lib.json",
-        "assets": ["libs/client-type/*.md"]
+        "assets": ["libs/client-type/*.md"],
+        "rootDir": "libs/client-type/src"
       }
     },
     "lint": {
diff --git a/libs/common/project.json b/libs/common/project.json
new file mode 100644
index 00000000000..848bcd73c20
--- /dev/null
+++ b/libs/common/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/common",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/common/src",
+  "projectType": "library",
+  "tags": ["scope:common", "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/common/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts
index ab217c56fc4..aea52d7310d 100644
--- a/libs/common/src/abstractions/api.service.ts
+++ b/libs/common/src/abstractions/api.service.ts
@@ -24,7 +24,6 @@ import {
   OrganizationConnectionConfigApis,
   OrganizationConnectionResponse,
 } from "../admin-console/models/response/organization-connection.response";
-import { OrganizationExportResponse } from "../admin-console/models/response/organization-export.response";
 import { OrganizationSponsorshipSyncStatusResponse } from "../admin-console/models/response/organization-sponsorship-sync-status.response";
 import { PreValidateSponsorshipResponse } from "../admin-console/models/response/pre-validate-sponsorship.response";
 import {
@@ -78,14 +77,10 @@ import {
 } 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";
@@ -98,7 +93,6 @@ import { UpdateAvatarRequest } from "../models/request/update-avatar.request";
 import { UpdateDomainsRequest } from "../models/request/update-domains.request";
 import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request";
 import { VerifyEmailRequest } from "../models/request/verify-email.request";
-import { BreachAccountResponse } from "../models/response/breach-account.response";
 import { DomainsResponse } from "../models/response/domains.response";
 import { EventResponse } from "../models/response/event.response";
 import { ListResponse } from "../models/response/list.response";
@@ -173,10 +167,8 @@ export abstract class ApiService {
 
   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>;
@@ -187,7 +179,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>;
@@ -211,7 +202,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>;
@@ -471,6 +461,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,
@@ -517,8 +514,6 @@ export abstract class ApiService {
 
   abstract getUserPublicKey(id: string): Promise<UserKeyResponse>;
 
-  abstract getHibpBreach(username: string): Promise<BreachAccountResponse[]>;
-
   abstract postBitPayInvoice(request: BitPayInvoiceRequest): Promise<string>;
   abstract postSetupPayment(): Promise<string>;
 
@@ -552,5 +547,4 @@ export abstract class ApiService {
     request: KeyConnectorUserKeyRequest,
   ): Promise<void>;
   abstract getKeyConnectorAlive(keyConnectorUrl: string): Promise<void>;
-  abstract getOrganizationExport(organizationId: string): Promise<OrganizationExportResponse>;
 }
diff --git a/libs/common/src/abstractions/audit.service.ts b/libs/common/src/abstractions/audit.service.ts
index b019ebe1fe8..a00b2bf038a 100644
--- a/libs/common/src/abstractions/audit.service.ts
+++ b/libs/common/src/abstractions/audit.service.ts
@@ -1,4 +1,4 @@
-import { BreachAccountResponse } from "../models/response/breach-account.response";
+import { BreachAccountResponse } from "../dirt/models/response/breach-account.response";
 
 export abstract class AuditService {
   /**
@@ -14,4 +14,10 @@ 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/policy/policy-api.service.abstraction.ts b/libs/common/src/admin-console/abstractions/policy/policy-api.service.abstraction.ts
index 4db0fc16750..79055d3cb11 100644
--- a/libs/common/src/admin-console/abstractions/policy/policy-api.service.abstraction.ts
+++ b/libs/common/src/admin-console/abstractions/policy/policy-api.service.abstraction.ts
@@ -24,4 +24,5 @@ export abstract class PolicyApiServiceAbstraction {
     type: PolicyType,
     request: PolicyRequest,
   ) => Promise<any>;
+  abstract putPolicyVNext: (organizationId: string, type: PolicyType, request: any) => Promise<any>;
 }
diff --git a/libs/common/src/admin-console/abstractions/provider.service.ts b/libs/common/src/admin-console/abstractions/provider.service.ts
index 340156020ff..3f2c7f68a9a 100644
--- a/libs/common/src/admin-console/abstractions/provider.service.ts
+++ b/libs/common/src/admin-console/abstractions/provider.service.ts
@@ -5,8 +5,7 @@ import { ProviderData } from "../models/data/provider.data";
 import { Provider } from "../models/domain/provider";
 
 export abstract class ProviderService {
-  abstract get$(id: string): Observable<Provider>;
-  abstract get(id: string): Promise<Provider>;
-  abstract getAll(): Promise<Provider[]>;
-  abstract save(providers: { [id: string]: ProviderData }, userId?: UserId): Promise<any>;
+  abstract providers$(userId: UserId): Observable<Provider[]>;
+  abstract get$(id: string, userId: UserId): Observable<Provider | undefined>;
+  abstract save(providers: { [id: string]: ProviderData }, userId: UserId): Promise<any>;
 }
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 91f3a8229f8..a4a860a2f3f 100644
--- a/libs/common/src/admin-console/enums/policy-type.enum.ts
+++ b/libs/common/src/admin-console/enums/policy-type.enum.ts
@@ -17,4 +17,5 @@ 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
+  AutotypeDefaultSetting = 17, // Sets the default autotype setting for desktop app
 }
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 cc158c71056..ddf1010eea9 100644
--- a/libs/common/src/admin-console/models/domain/organization.spec.ts
+++ b/libs/common/src/admin-console/models/domain/organization.spec.ts
@@ -111,28 +111,6 @@ 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;
diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts
index 88895383876..1372150bd81 100644
--- a/libs/common/src/admin-console/models/domain/organization.ts
+++ b/libs/common/src/admin-console/models/domain/organization.ts
@@ -309,12 +309,7 @@ export class Organization {
   }
 
   get canManageDeviceApprovals() {
-    return (
-      (this.isAdmin || this.permissions.manageResetPassword) &&
-      this.useSso &&
-      this.ssoEnabled &&
-      this.ssoMemberDecryptionType === MemberDecryptionType.TrustedDeviceEncryption
-    );
+    return (this.isAdmin || this.permissions.manageResetPassword) && this.useSso;
   }
 
   get isExemptFromPolicies() {
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/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/policy-api.service.ts b/libs/common/src/admin-console/services/policy/policy-api.service.ts
index 8f9854f49c4..c0a5c74f1e3 100644
--- a/libs/common/src/admin-console/services/policy/policy-api.service.ts
+++ b/libs/common/src/admin-console/services/policy/policy-api.service.ts
@@ -116,16 +116,32 @@ export class PolicyApiService implements PolicyApiServiceAbstraction {
   }
 
   async putPolicy(organizationId: string, type: PolicyType, request: PolicyRequest): Promise<any> {
-    const r = await this.apiService.send(
+    const response = await this.apiService.send(
       "PUT",
       "/organizations/" + organizationId + "/policies/" + type,
       request,
       true,
       true,
     );
+    await this.handleResponse(response);
+  }
+
+  async putPolicyVNext(organizationId: string, type: PolicyType, request: any): Promise<any> {
+    const response = await this.apiService.send(
+      "PUT",
+      `/organizations/${organizationId}/policies/${type}/vnext`,
+      request,
+      true,
+      true,
+    );
+
+    await this.handleResponse(response);
+  }
+
+  private async handleResponse(response: any): Promise<void> {
     const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    const response = new PolicyResponse(r);
-    const data = new PolicyData(response);
+    const policyResponse = new PolicyResponse(response);
+    const data = new PolicyData(policyResponse);
     await this.policyService.upsert(data, userId);
   }
 }
diff --git a/libs/common/src/admin-console/services/provider.service.spec.ts b/libs/common/src/admin-console/services/provider.service.spec.ts
index 92d5ae2e801..e7e8a6ba293 100644
--- a/libs/common/src/admin-console/services/provider.service.spec.ts
+++ b/libs/common/src/admin-console/services/provider.service.spec.ts
@@ -1,7 +1,7 @@
 import { firstValueFrom } from "rxjs";
 
 import { FakeAccountService, FakeStateProvider, mockAccountServiceWith } from "../../../spec";
-import { FakeActiveUserState, FakeSingleUserState } from "../../../spec/fake-state";
+import { FakeSingleUserState } from "../../../spec/fake-state";
 import { Utils } from "../../platform/misc/utils";
 import { UserId } from "../../types/guid";
 import {
@@ -20,11 +20,11 @@ import { PROVIDERS, ProviderService } from "./provider.service";
  * in state. This helper methods lets us build provider arrays in tests
  * and easily map them to records before storing them in state.
  */
-function arrayToRecord(input: ProviderData[]): Record<string, ProviderData> {
-  if (input == null) {
-    return undefined;
+function arrayToRecord(input: ProviderData[] | undefined): Record<string, ProviderData> | null {
+  if (input == null || input.length < 1) {
+    return null;
   }
-  return Object.fromEntries(input?.map((i) => [i.id, i]));
+  return Object.fromEntries(input.map((i) => [i.id, i]));
 }
 
 /**
@@ -39,7 +39,7 @@ function arrayToRecord(input: ProviderData[]): Record<string, ProviderData> {
  */
 function buildMockProviders(count = 1, suffix?: string): ProviderData[] {
   if (count < 1) {
-    return undefined;
+    return [];
   }
 
   function buildMockProvider(id: string, name: string): ProviderData {
@@ -87,30 +87,28 @@ describe("ProviderService", () => {
   let fakeAccountService: FakeAccountService;
   let fakeStateProvider: FakeStateProvider;
   let fakeUserState: FakeSingleUserState<Record<string, ProviderData>>;
-  let fakeActiveUserState: FakeActiveUserState<Record<string, ProviderData>>;
 
   beforeEach(async () => {
     fakeAccountService = mockAccountServiceWith(fakeUserId);
     fakeStateProvider = new FakeStateProvider(fakeAccountService);
     fakeUserState = fakeStateProvider.singleUser.getFake(fakeUserId, PROVIDERS);
-    fakeActiveUserState = fakeStateProvider.activeUser.getFake(PROVIDERS);
 
     providerService = new ProviderService(fakeStateProvider);
   });
 
-  describe("getAll()", () => {
+  describe("providers$()", () => {
     it("Returns an array of all providers stored in state", async () => {
-      const mockData: ProviderData[] = buildMockProviders(5);
+      const mockData = buildMockProviders(5);
       fakeUserState.nextState(arrayToRecord(mockData));
-      const providers = await providerService.getAll();
+      const providers = await firstValueFrom(providerService.providers$(fakeUserId));
       expect(providers).toHaveLength(5);
       expect(providers).toEqual(mockData.map((x) => new Provider(x)));
     });
 
     it("Returns an empty array if no providers are found in state", async () => {
-      const mockData: ProviderData[] = undefined;
+      let mockData;
       fakeUserState.nextState(arrayToRecord(mockData));
-      const result = await providerService.getAll();
+      const result = await firstValueFrom(providerService.providers$(fakeUserId));
       expect(result).toEqual([]);
     });
   });
@@ -119,50 +117,38 @@ describe("ProviderService", () => {
     it("Returns an observable of a single provider from state that matches the specified id", async () => {
       const mockData = buildMockProviders(5);
       fakeUserState.nextState(arrayToRecord(mockData));
-      const result = providerService.get$(mockData[3].id);
+      const result = providerService.get$(mockData[3].id, fakeUserId);
       const provider = await firstValueFrom(result);
       expect(provider).toEqual(new Provider(mockData[3]));
     });
 
     it("Returns an observable of undefined if the specified provider is not found", async () => {
-      const result = providerService.get$("this-provider-does-not-exist");
+      const result = providerService.get$("this-provider-does-not-exist", fakeUserId);
       const provider = await firstValueFrom(result);
       expect(provider).toBe(undefined);
     });
   });
 
-  describe("get()", () => {
-    it("Returns a single provider from state that matches the specified id", async () => {
-      const mockData = buildMockProviders(5);
-      fakeUserState.nextState(arrayToRecord(mockData));
-      const result = await providerService.get(mockData[3].id);
-      expect(result).toEqual(new Provider(mockData[3]));
-    });
-
-    it("Returns undefined if the specified provider id is not found", async () => {
-      const result = await providerService.get("this-provider-does-not-exist");
-      expect(result).toBe(undefined);
-    });
-  });
-
   describe("save()", () => {
-    it("replaces the entire provider list in state for the active user", async () => {
+    it("replaces the entire provider list in state for the specified user", async () => {
       const originalData = buildMockProviders(10);
       fakeUserState.nextState(arrayToRecord(originalData));
 
       const newData = arrayToRecord(buildMockProviders(10, "newData"));
-      await providerService.save(newData);
+      if (newData) {
+        await providerService.save(newData, fakeUserId);
+      }
 
-      expect(fakeActiveUserState.nextMock).toHaveBeenCalledWith([fakeUserId, newData]);
+      expect(fakeUserState.nextMock).toHaveBeenCalledWith(newData);
     });
 
     // This is more or less a test for logouts
     it("can replace state with null", async () => {
       const originalData = buildMockProviders(2);
-      fakeActiveUserState.nextState(arrayToRecord(originalData));
-      await providerService.save(null);
+      fakeUserState.nextState(arrayToRecord(originalData));
+      await providerService.save(null, fakeUserId);
 
-      expect(fakeActiveUserState.nextMock).toHaveBeenCalledWith([fakeUserId, null]);
+      expect(fakeUserState.nextMock).toHaveBeenCalledWith(null);
     });
   });
 });
diff --git a/libs/common/src/admin-console/services/provider.service.ts b/libs/common/src/admin-console/services/provider.service.ts
index 05909f9d8a1..7385055c3b4 100644
--- a/libs/common/src/admin-console/services/provider.service.ts
+++ b/libs/common/src/admin-console/services/provider.service.ts
@@ -1,7 +1,6 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { firstValueFrom, map, Observable, of, switchMap, take } from "rxjs";
+import { map, Observable } from "rxjs";
 
+import { getById } from "../../platform/misc";
 import { PROVIDERS_DISK, StateProvider, UserKeyDefinition } from "../../platform/state";
 import { UserId } from "../../types/guid";
 import { ProviderService as ProviderServiceAbstraction } from "../abstractions/provider.service";
@@ -13,46 +12,26 @@ export const PROVIDERS = UserKeyDefinition.record<ProviderData>(PROVIDERS_DISK,
   clearOn: ["logout"],
 });
 
-function mapToSingleProvider(providerId: string) {
-  return map<Provider[], Provider>((providers) => providers?.find((p) => p.id === providerId));
-}
-
 export class ProviderService implements ProviderServiceAbstraction {
   constructor(private stateProvider: StateProvider) {}
 
-  private providers$(userId?: UserId): Observable<Provider[] | undefined> {
-    // FIXME: Can be replaced with `getUserStateOrDefault$` if we weren't trying to pick this.
-    return (
-      userId != null
-        ? this.stateProvider.getUser(userId, PROVIDERS).state$
-        : this.stateProvider.activeUserId$.pipe(
-            take(1),
-            switchMap((userId) =>
-              userId != null ? this.stateProvider.getUser(userId, PROVIDERS).state$ : of(null),
-            ),
-          )
-    ).pipe(this.mapProviderRecordToArray());
+  providers$(userId: UserId): Observable<Provider[]> {
+    return this.stateProvider
+      .getUser(userId, PROVIDERS)
+      .state$.pipe(this.mapProviderRecordToArray());
   }
 
   private mapProviderRecordToArray() {
-    return map<Record<string, ProviderData>, Provider[]>((providers) =>
-      Object.values(providers ?? {})?.map((o) => new Provider(o)),
+    return map<Record<string, ProviderData> | null, Provider[]>((providers) =>
+      Object.values(providers ?? {}).map((o) => new Provider(o)),
     );
   }
 
-  get$(id: string): Observable<Provider> {
-    return this.providers$().pipe(mapToSingleProvider(id));
+  get$(id: string, userId: UserId): Observable<Provider | undefined> {
+    return this.providers$(userId).pipe(getById(id));
   }
 
-  async get(id: string): Promise<Provider> {
-    return await firstValueFrom(this.providers$().pipe(mapToSingleProvider(id)));
-  }
-
-  async getAll(): Promise<Provider[]> {
-    return await firstValueFrom(this.providers$());
-  }
-
-  async save(providers: { [id: string]: ProviderData }, userId?: UserId) {
+  async save(providers: { [id: string]: ProviderData }, userId: UserId) {
     await this.stateProvider.setUserState(PROVIDERS, providers, userId);
   }
 }
diff --git a/libs/common/src/auth/abstractions/sso-login.service.abstraction.ts b/libs/common/src/auth/abstractions/sso-login.service.abstraction.ts
index b30739d94a8..d4583950df5 100644
--- a/libs/common/src/auth/abstractions/sso-login.service.abstraction.ts
+++ b/libs/common/src/auth/abstractions/sso-login.service.abstraction.ts
@@ -1,3 +1,5 @@
+import { Observable } from "rxjs";
+
 import { UserId } from "@bitwarden/common/types/guid";
 
 export abstract class SsoLoginServiceAbstraction {
@@ -70,6 +72,10 @@ export abstract class SsoLoginServiceAbstraction {
    *
    */
   abstract setSsoEmail: (email: string) => Promise<void>;
+  /**
+   * Clear the SSO email
+   */
+  abstract clearSsoEmail: () => Promise<void>;
   /**
    * Gets the value of the active user's organization sso identifier.
    *
@@ -86,4 +92,24 @@ export abstract class SsoLoginServiceAbstraction {
     organizationIdentifier: string,
     userId: UserId | undefined,
   ) => Promise<void>;
+
+  /**
+   * A cache list of user emails for whom the `PolicyType.RequireSso` policy is applied (that is, a list
+   * of users who are required to authenticate via SSO only). The cache lives on the current device only.
+   */
+  abstract ssoRequiredCache$: Observable<Set<string> | null>;
+
+  /**
+   * Remove an email from the cached list of emails that must authenticate via SSO.
+   */
+  abstract removeFromSsoRequiredCacheIfPresent: (email: string) => Promise<void>;
+
+  /**
+   * Check if the user is required to authenticate via SSO. If so, add their email to a cache list.
+   * We'll use this cache list to display ONLY the "Use single sign-on" button to the
+   * user the next time they are on the /login page.
+   *
+   * If the user is not required to authenticate via SSO, remove their email from the cache list if it is present.
+   */
+  abstract updateSsoRequiredCache: (ssoLoginEmail: string, userId: UserId) => Promise<void>;
 }
diff --git a/libs/common/src/auth/models/request/email.request.ts b/libs/common/src/auth/models/request/email.request.ts
index 12fdff149cc..10a2385a3e0 100644
--- a/libs/common/src/auth/models/request/email.request.ts
+++ b/libs/common/src/auth/models/request/email.request.ts
@@ -1,9 +1,27 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import {
+  MasterPasswordAuthenticationData,
+  MasterPasswordUnlockData,
+} from "@bitwarden/common/key-management/master-password/types/master-password.types";
+
 import { EmailTokenRequest } from "./email-token.request";
 
 export class EmailRequest extends EmailTokenRequest {
   newMasterPasswordHash: string;
   token: string;
   key: string;
+
+  // This will eventually be changed to be an actual constructor, once all callers are updated.
+  // The body of this request will be changed to carry the authentication data and unlock data.
+  // https://bitwarden.atlassian.net/browse/PM-23234
+  static newConstructor(
+    authenticationData: MasterPasswordAuthenticationData,
+    unlockData: MasterPasswordUnlockData,
+  ): EmailRequest {
+    const request = new EmailRequest();
+    request.newMasterPasswordHash = authenticationData.masterPasswordAuthenticationHash;
+    request.key = unlockData.masterKeyWrappedUserKey;
+    return request;
+  }
 }
diff --git a/libs/common/src/auth/models/request/password.request.ts b/libs/common/src/auth/models/request/password.request.ts
index 674754ff41a..e359540140b 100644
--- a/libs/common/src/auth/models/request/password.request.ts
+++ b/libs/common/src/auth/models/request/password.request.ts
@@ -1,9 +1,31 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import {
+  MasterPasswordAuthenticationData,
+  MasterPasswordUnlockData,
+} from "@bitwarden/common/key-management/master-password/types/master-password.types";
+
 import { SecretVerificationRequest } from "./secret-verification.request";
 
 export class PasswordRequest extends SecretVerificationRequest {
   newMasterPasswordHash: string;
   masterPasswordHint: string;
   key: string;
+
+  authenticationData?: MasterPasswordAuthenticationData;
+  unlockData?: MasterPasswordUnlockData;
+
+  // This will eventually be changed to be an actual constructor, once all callers are updated.
+  // https://bitwarden.atlassian.net/browse/PM-23234
+  static newConstructor(
+    authenticationData: MasterPasswordAuthenticationData,
+    unlockData: MasterPasswordUnlockData,
+  ): PasswordRequest {
+    const request = new PasswordRequest();
+    request.newMasterPasswordHash = authenticationData.masterPasswordAuthenticationHash;
+    request.key = unlockData.masterKeyWrappedUserKey;
+    request.authenticationData = authenticationData;
+    request.unlockData = unlockData;
+    return request;
+  }
 }
diff --git a/libs/common/src/auth/models/request/secret-verification.request.ts b/libs/common/src/auth/models/request/secret-verification.request.ts
index bb5d913656e..0572b11bac5 100644
--- a/libs/common/src/auth/models/request/secret-verification.request.ts
+++ b/libs/common/src/auth/models/request/secret-verification.request.ts
@@ -1,7 +1,20 @@
 // FIXME: Update this file to be type safe and remove this and next line
+
+import { MasterPasswordAuthenticationData } from "@bitwarden/common/key-management/master-password/types/master-password.types";
+
 // @ts-strict-ignore
 export class SecretVerificationRequest {
   masterPasswordHash: string;
   otp: string;
   authRequestAccessCode: string;
+
+  /**
+   * Mutates this request to include the master password authentication data, to authenticate the request.
+   */
+  authenticateWith(
+    masterPasswordAuthenticationData: MasterPasswordAuthenticationData,
+  ): SecretVerificationRequest {
+    this.masterPasswordHash = masterPasswordAuthenticationData.masterPasswordAuthenticationHash;
+    return this;
+  }
 }
diff --git a/libs/common/src/auth/models/request/set-password.request.ts b/libs/common/src/auth/models/request/set-password.request.ts
index 7206cd98623..b48c060198e 100644
--- a/libs/common/src/auth/models/request/set-password.request.ts
+++ b/libs/common/src/auth/models/request/set-password.request.ts
@@ -1,6 +1,11 @@
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+
+import {
+  MasterPasswordAuthenticationData,
+  MasterPasswordUnlockData,
+} from "@bitwarden/common/key-management/master-password/types/master-password.types";
 // eslint-disable-next-line no-restricted-imports
-import { KdfType } from "@bitwarden/key-management";
+import { KdfConfig, KdfType } from "@bitwarden/key-management";
 
 import { KeysRequest } from "../../../models/request/keys.request";
 
@@ -21,19 +26,45 @@ export class SetPasswordRequest {
     masterPasswordHint: string,
     orgIdentifier: string,
     keys: KeysRequest | null,
-    kdf: KdfType,
-    kdfIterations: number,
-    kdfMemory?: number,
-    kdfParallelism?: number,
+    kdf: KdfConfig,
   ) {
     this.masterPasswordHash = masterPasswordHash;
     this.key = key;
     this.masterPasswordHint = masterPasswordHint;
-    this.kdf = kdf;
-    this.kdfIterations = kdfIterations;
-    this.kdfMemory = kdfMemory;
-    this.kdfParallelism = kdfParallelism;
     this.orgIdentifier = orgIdentifier;
     this.keys = keys;
+
+    if (kdf.kdfType === KdfType.PBKDF2_SHA256) {
+      this.kdf = KdfType.PBKDF2_SHA256;
+      this.kdfIterations = kdf.iterations;
+    } else if (kdf.kdfType === KdfType.Argon2id) {
+      this.kdf = KdfType.Argon2id;
+      this.kdfIterations = kdf.iterations;
+      this.kdfMemory = kdf.memory;
+      this.kdfParallelism = kdf.parallelism;
+    } else {
+      throw new Error(`Unsupported KDF type: ${kdf}`);
+    }
+  }
+
+  // This will eventually be changed to be an actual constructor, once all callers are updated.
+  // The body of this request will be changed to carry the authentication data and unlock data.
+  // https://bitwarden.atlassian.net/browse/PM-23234
+  static newConstructor(
+    authenticationData: MasterPasswordAuthenticationData,
+    unlockData: MasterPasswordUnlockData,
+    masterPasswordHint: string,
+    orgIdentifier: string,
+    keys: KeysRequest | null,
+  ): SetPasswordRequest {
+    const request = new SetPasswordRequest(
+      authenticationData.masterPasswordAuthenticationHash,
+      unlockData.masterKeyWrappedUserKey,
+      masterPasswordHint,
+      orgIdentifier,
+      keys,
+      unlockData.kdf,
+    );
+    return request;
   }
 }
diff --git a/libs/common/src/auth/models/response/user-decryption-options/user-decryption-options.response.spec.ts b/libs/common/src/auth/models/response/user-decryption-options/user-decryption-options.response.spec.ts
index b74648b418b..01f918f403d 100644
--- a/libs/common/src/auth/models/response/user-decryption-options/user-decryption-options.response.spec.ts
+++ b/libs/common/src/auth/models/response/user-decryption-options/user-decryption-options.response.spec.ts
@@ -1,14 +1,12 @@
 // eslint-disable-next-line no-restricted-imports
 import { KdfType } from "@bitwarden/key-management";
 
-import { makeEncString } from "../../../../../spec";
-
 import { UserDecryptionOptionsResponse } from "./user-decryption-options.response";
 
 describe("UserDecryptionOptionsResponse", () => {
   it("should create response when master password unlock is present", () => {
     const salt = "test@example.com";
-    const encryptedUserKey = makeEncString("testUserKey");
+    const encryptedUserKey = "testUserKey";
 
     const response = new UserDecryptionOptionsResponse({
       HasMasterPassword: true,
@@ -18,7 +16,7 @@ describe("UserDecryptionOptionsResponse", () => {
           KdfType: KdfType.PBKDF2_SHA256,
           Iterations: 600_000,
         },
-        MasterKeyEncryptedUserKey: encryptedUserKey.encryptedString,
+        MasterKeyEncryptedUserKey: encryptedUserKey,
       },
     });
 
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..3ecdc101892
--- /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 is expired, then it returns a {@link TryGetSendAccessTokenError} expired error.
+   * 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..4d3376fd5b6
--- /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
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+          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/master-password/master-password-api.service.spec.ts b/libs/common/src/auth/services/master-password/master-password-api.service.spec.ts
index 7a3b8762c13..2c26472174a 100644
--- a/libs/common/src/auth/services/master-password/master-password-api.service.spec.ts
+++ b/libs/common/src/auth/services/master-password/master-password-api.service.spec.ts
@@ -4,7 +4,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.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.
 // eslint-disable-next-line no-restricted-imports
-import { KdfType } from "@bitwarden/key-management";
+import { PBKDF2KdfConfig } from "@bitwarden/key-management";
 
 import { PasswordRequest } from "../../models/request/password.request";
 import { SetPasswordRequest } from "../../models/request/set-password.request";
@@ -42,8 +42,7 @@ describe("MasterPasswordApiService", () => {
           publicKey: "publicKey",
           encryptedPrivateKey: "encryptedPrivateKey",
         },
-        KdfType.PBKDF2_SHA256,
-        600_000,
+        new PBKDF2KdfConfig(600_000),
       );
 
       // Act
diff --git a/libs/common/src/auth/services/sso-login.service.spec.ts b/libs/common/src/auth/services/sso-login.service.spec.ts
index 6764755e6ca..c8627f438d0 100644
--- a/libs/common/src/auth/services/sso-login.service.spec.ts
+++ b/libs/common/src/auth/services/sso-login.service.spec.ts
@@ -1,9 +1,13 @@
 import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
 
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import {
   CODE_VERIFIER,
   GLOBAL_ORGANIZATION_SSO_IDENTIFIER,
   SSO_EMAIL,
+  SSO_REQUIRED_CACHE,
   SSO_STATE,
   SsoLoginService,
   USER_ORGANIZATION_SSO_IDENTIFIER,
@@ -18,8 +22,9 @@ describe("SSOLoginService ", () => {
   let sut: SsoLoginService;
 
   let accountService: FakeAccountService;
-  let mockSingleUserStateProvider: FakeStateProvider;
+  let mockStateProvider: FakeStateProvider;
   let mockLogService: MockProxy<LogService>;
+  let mockPolicyService: MockProxy<PolicyService>;
   let userId: UserId;
 
   beforeEach(() => {
@@ -27,10 +32,11 @@ describe("SSOLoginService ", () => {
 
     userId = Utils.newGuid() as UserId;
     accountService = mockAccountServiceWith(userId);
-    mockSingleUserStateProvider = new FakeStateProvider(accountService);
+    mockStateProvider = new FakeStateProvider(accountService);
     mockLogService = mock<LogService>();
+    mockPolicyService = mock<PolicyService>();
 
-    sut = new SsoLoginService(mockSingleUserStateProvider, mockLogService);
+    sut = new SsoLoginService(mockStateProvider, mockLogService, mockPolicyService);
   });
 
   it("instantiates", () => {
@@ -40,7 +46,7 @@ describe("SSOLoginService ", () => {
   it("gets and sets code verifier", async () => {
     const codeVerifier = "test-code-verifier";
     await sut.setCodeVerifier(codeVerifier);
-    mockSingleUserStateProvider.getGlobal(CODE_VERIFIER);
+    mockStateProvider.getGlobal(CODE_VERIFIER);
 
     const result = await sut.getCodeVerifier();
     expect(result).toBe(codeVerifier);
@@ -49,7 +55,7 @@ describe("SSOLoginService ", () => {
   it("gets and sets SSO state", async () => {
     const ssoState = "test-sso-state";
     await sut.setSsoState(ssoState);
-    mockSingleUserStateProvider.getGlobal(SSO_STATE);
+    mockStateProvider.getGlobal(SSO_STATE);
 
     const result = await sut.getSsoState();
     expect(result).toBe(ssoState);
@@ -58,7 +64,7 @@ describe("SSOLoginService ", () => {
   it("gets and sets organization SSO identifier", async () => {
     const orgIdentifier = "test-org-identifier";
     await sut.setOrganizationSsoIdentifier(orgIdentifier);
-    mockSingleUserStateProvider.getGlobal(GLOBAL_ORGANIZATION_SSO_IDENTIFIER);
+    mockStateProvider.getGlobal(GLOBAL_ORGANIZATION_SSO_IDENTIFIER);
 
     const result = await sut.getOrganizationSsoIdentifier();
     expect(result).toBe(orgIdentifier);
@@ -67,7 +73,7 @@ describe("SSOLoginService ", () => {
   it("gets and sets SSO email", async () => {
     const email = "test@example.com";
     await sut.setSsoEmail(email);
-    mockSingleUserStateProvider.getGlobal(SSO_EMAIL);
+    mockStateProvider.getGlobal(SSO_EMAIL);
 
     const result = await sut.getSsoEmail();
     expect(result).toBe(email);
@@ -77,7 +83,7 @@ describe("SSOLoginService ", () => {
     const userId = Utils.newGuid() as UserId;
     const orgIdentifier = "test-active-org-identifier";
     await sut.setActiveUserOrganizationSsoIdentifier(orgIdentifier, userId);
-    mockSingleUserStateProvider.getUser(userId, USER_ORGANIZATION_SSO_IDENTIFIER);
+    mockStateProvider.getUser(userId, USER_ORGANIZATION_SSO_IDENTIFIER);
 
     const result = await sut.getActiveUserOrganizationSsoIdentifier(userId);
     expect(result).toBe(orgIdentifier);
@@ -91,4 +97,153 @@ describe("SSOLoginService ", () => {
       "Tried to set a user organization sso identifier with an undefined user id.",
     );
   });
+
+  describe("updateSsoRequiredCache()", () => {
+    it("should add email to cache when SSO is required", async () => {
+      const email = "test@example.com";
+
+      mockStateProvider.global.getFake(SSO_REQUIRED_CACHE).stateSubject.next([]);
+      mockStateProvider.global.getFake(SSO_EMAIL).stateSubject.next(email);
+      mockPolicyService.policyAppliesToUser$.mockReturnValue(of(true));
+
+      await sut.updateSsoRequiredCache(email, userId);
+
+      const cacheState = mockStateProvider.global.getFake(SSO_REQUIRED_CACHE);
+      expect(cacheState.nextMock).toHaveBeenCalledWith([email.toLowerCase()]);
+    });
+
+    it("should add email to existing cache when SSO is required and email is not already present", async () => {
+      const existingEmail = "existing@example.com";
+      const newEmail = "new@example.com";
+
+      mockStateProvider.global.getFake(SSO_REQUIRED_CACHE).stateSubject.next([existingEmail]);
+      mockStateProvider.global.getFake(SSO_EMAIL).stateSubject.next(newEmail);
+      mockPolicyService.policyAppliesToUser$.mockReturnValue(of(true));
+
+      await sut.updateSsoRequiredCache(newEmail, userId);
+
+      const cacheState = mockStateProvider.global.getFake(SSO_REQUIRED_CACHE);
+      expect(cacheState.nextMock).toHaveBeenCalledWith([existingEmail, newEmail.toLowerCase()]);
+    });
+
+    it("should not add duplicate email to cache when SSO is required", async () => {
+      const duplicateEmail = "duplicate@example.com";
+
+      mockStateProvider.global.getFake(SSO_REQUIRED_CACHE).stateSubject.next([duplicateEmail]);
+      mockStateProvider.global.getFake(SSO_EMAIL).stateSubject.next(duplicateEmail);
+      mockPolicyService.policyAppliesToUser$.mockReturnValue(of(true));
+
+      await sut.updateSsoRequiredCache(duplicateEmail, userId);
+
+      const cacheState = mockStateProvider.global.getFake(SSO_REQUIRED_CACHE);
+      expect(cacheState.nextMock).not.toHaveBeenCalled();
+    });
+
+    it("should initialize new cache with email when SSO is required and no cache exists", async () => {
+      const email = "test@example.com";
+
+      mockStateProvider.global.getFake(SSO_REQUIRED_CACHE).stateSubject.next(null);
+      mockStateProvider.global.getFake(SSO_EMAIL).stateSubject.next(email);
+      mockPolicyService.policyAppliesToUser$.mockReturnValue(of(true));
+
+      await sut.updateSsoRequiredCache(email, userId);
+
+      const cacheState = mockStateProvider.global.getFake(SSO_REQUIRED_CACHE);
+      expect(cacheState.nextMock).toHaveBeenCalledWith([email.toLowerCase()]);
+    });
+
+    it("should remove email from cache when SSO is not required", async () => {
+      const emailToRemove = "remove@example.com";
+      const remainingEmail = "keep@example.com";
+
+      mockStateProvider.global
+        .getFake(SSO_REQUIRED_CACHE)
+        .stateSubject.next([emailToRemove, remainingEmail]);
+      mockStateProvider.global.getFake(SSO_EMAIL).stateSubject.next(emailToRemove);
+      mockPolicyService.policyAppliesToUser$.mockReturnValue(of(false));
+
+      await sut.updateSsoRequiredCache(emailToRemove, userId);
+
+      const cacheState = mockStateProvider.global.getFake(SSO_REQUIRED_CACHE);
+      expect(cacheState.nextMock).toHaveBeenCalledWith([remainingEmail]);
+    });
+
+    it("should not update cache when SSO is not required and email is not present", async () => {
+      const existingEmail = "existing@example.com";
+      const nonExistentEmail = "nonexistent@example.com";
+
+      mockStateProvider.global.getFake(SSO_REQUIRED_CACHE).stateSubject.next([existingEmail]);
+      mockStateProvider.global.getFake(SSO_EMAIL).stateSubject.next(nonExistentEmail);
+      mockPolicyService.policyAppliesToUser$.mockReturnValue(of(false));
+
+      await sut.updateSsoRequiredCache(nonExistentEmail, userId);
+
+      const cacheState = mockStateProvider.global.getFake(SSO_REQUIRED_CACHE);
+      expect(cacheState.nextMock).not.toHaveBeenCalled();
+    });
+
+    it("should check policy for correct PolicyType and userId", async () => {
+      const email = "test@example.com";
+
+      mockStateProvider.global.getFake(SSO_REQUIRED_CACHE).stateSubject.next([]);
+      mockPolicyService.policyAppliesToUser$.mockReturnValue(of(true));
+
+      await sut.updateSsoRequiredCache(email, userId);
+
+      expect(mockPolicyService.policyAppliesToUser$).toHaveBeenCalledWith(
+        PolicyType.RequireSso,
+        userId,
+      );
+    });
+  });
+
+  describe("removeFromSsoRequiredCacheIfPresent()", () => {
+    it("should remove email from cache when present", async () => {
+      const emailToRemove = "remove@example.com";
+      const remainingEmail = "keep@example.com";
+
+      mockStateProvider.global
+        .getFake(SSO_REQUIRED_CACHE)
+        .stateSubject.next([emailToRemove, remainingEmail]);
+
+      await sut.removeFromSsoRequiredCacheIfPresent(emailToRemove);
+
+      const cacheState = mockStateProvider.global.getFake(SSO_REQUIRED_CACHE);
+      expect(cacheState.nextMock).toHaveBeenCalledWith([remainingEmail]);
+    });
+
+    it("should not update cache when email is not present", async () => {
+      const existingEmail = "existing@example.com";
+      const nonExistentEmail = "nonexistent@example.com";
+
+      mockStateProvider.global.getFake(SSO_REQUIRED_CACHE).stateSubject.next([existingEmail]);
+
+      await sut.removeFromSsoRequiredCacheIfPresent(nonExistentEmail);
+
+      const cacheState = mockStateProvider.global.getFake(SSO_REQUIRED_CACHE);
+      expect(cacheState.nextMock).not.toHaveBeenCalled();
+    });
+
+    it("should not update cache when cache is already null", async () => {
+      const email = "test@example.com";
+
+      mockStateProvider.global.getFake(SSO_REQUIRED_CACHE).stateSubject.next(null);
+
+      await sut.removeFromSsoRequiredCacheIfPresent(email);
+
+      const cacheState = mockStateProvider.global.getFake(SSO_REQUIRED_CACHE);
+      expect(cacheState.nextMock).not.toHaveBeenCalled();
+    });
+
+    it("should result in an empty array when removing last email", async () => {
+      const email = "test@example.com";
+
+      mockStateProvider.global.getFake(SSO_REQUIRED_CACHE).stateSubject.next([email]);
+
+      await sut.removeFromSsoRequiredCacheIfPresent(email);
+
+      const cacheState = mockStateProvider.global.getFake(SSO_REQUIRED_CACHE);
+      expect(cacheState.nextMock).toHaveBeenCalledWith([]);
+    });
+  });
 });
diff --git a/libs/common/src/auth/services/sso-login.service.ts b/libs/common/src/auth/services/sso-login.service.ts
index 9b4b8656782..14778efc1f1 100644
--- a/libs/common/src/auth/services/sso-login.service.ts
+++ b/libs/common/src/auth/services/sso-login.service.ts
@@ -1,5 +1,7 @@
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, map, Observable } from "rxjs";
 
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { UserId } from "@bitwarden/common/types/guid";
 
@@ -8,6 +10,7 @@ import {
   KeyDefinition,
   SingleUserState,
   SSO_DISK,
+  SSO_DISK_LOCAL,
   StateProvider,
   UserKeyDefinition,
 } from "../../platform/state";
@@ -57,20 +60,35 @@ export const SSO_EMAIL = new KeyDefinition<string>(SSO_DISK, "ssoEmail", {
   deserializer: (state) => state,
 });
 
+/**
+ * A cache list of user emails for whom the `PolicyType.RequireSso` policy is applied (that is, a list
+ * of users who are required to authenticate via SSO only). The cache lives on the current device only.
+ */
+export const SSO_REQUIRED_CACHE = new KeyDefinition<string[]>(SSO_DISK_LOCAL, "ssoRequiredCache", {
+  deserializer: (ssoRequiredCache) => ssoRequiredCache,
+});
+
 export class SsoLoginService implements SsoLoginServiceAbstraction {
   private codeVerifierState: GlobalState<string>;
   private ssoState: GlobalState<string>;
   private orgSsoIdentifierState: GlobalState<string>;
   private ssoEmailState: GlobalState<string>;
+  private ssoRequiredCacheState: GlobalState<string[]>;
+
+  ssoRequiredCache$: Observable<Set<string> | null>;
 
   constructor(
     private stateProvider: StateProvider,
     private logService: LogService,
+    private policyService: PolicyService,
   ) {
     this.codeVerifierState = this.stateProvider.getGlobal(CODE_VERIFIER);
     this.ssoState = this.stateProvider.getGlobal(SSO_STATE);
     this.orgSsoIdentifierState = this.stateProvider.getGlobal(GLOBAL_ORGANIZATION_SSO_IDENTIFIER);
     this.ssoEmailState = this.stateProvider.getGlobal(SSO_EMAIL);
+    this.ssoRequiredCacheState = this.stateProvider.getGlobal(SSO_REQUIRED_CACHE);
+
+    this.ssoRequiredCache$ = this.ssoRequiredCacheState.state$.pipe(map((cache) => new Set(cache)));
   }
 
   getCodeVerifier(): Promise<string | null> {
@@ -105,6 +123,10 @@ export class SsoLoginService implements SsoLoginServiceAbstraction {
     await this.ssoEmailState.update((_) => email);
   }
 
+  async clearSsoEmail(): Promise<void> {
+    await this.ssoEmailState.update((_) => null);
+  }
+
   getActiveUserOrganizationSsoIdentifier(userId: UserId): Promise<string | null> {
     return firstValueFrom(this.userOrgSsoIdentifierState(userId).state$);
   }
@@ -125,4 +147,53 @@ export class SsoLoginService implements SsoLoginServiceAbstraction {
   private userOrgSsoIdentifierState(userId: UserId): SingleUserState<string> {
     return this.stateProvider.getUser(userId, USER_ORGANIZATION_SSO_IDENTIFIER);
   }
+
+  /**
+   * Add an email to the cached list of emails that must authenticate via SSO.
+   */
+  private async addToSsoRequiredCache(email: string): Promise<void> {
+    await this.ssoRequiredCacheState.update(
+      (cache) => (cache == null ? [email] : [...cache, email]),
+      {
+        shouldUpdate: (cache) => {
+          if (cache == null) {
+            return true;
+          }
+          return !cache.includes(email);
+        },
+      },
+    );
+  }
+
+  async removeFromSsoRequiredCacheIfPresent(email: string): Promise<void> {
+    await this.ssoRequiredCacheState.update(
+      (cache) => cache?.filter((cachedEmail) => cachedEmail !== email) ?? cache,
+      {
+        shouldUpdate: (cache) => {
+          if (cache == null) {
+            return false;
+          }
+          return cache.includes(email);
+        },
+      },
+    );
+  }
+
+  async updateSsoRequiredCache(ssoLoginEmail: string, userId: UserId): Promise<void> {
+    const ssoRequired = await firstValueFrom(
+      this.policyService.policyAppliesToUser$(PolicyType.RequireSso, userId),
+    );
+
+    if (ssoRequired) {
+      await this.addToSsoRequiredCache(ssoLoginEmail.toLowerCase());
+    } else {
+      /**
+       * If user is not required to authenticate via SSO, remove email from the cache
+       * list (if it was on the list). This is necessary because the user may have been
+       * required to authenticate via SSO at some point in the past, but now their org
+       * no longer requires SSO authenticaiton.
+       */
+      await this.removeFromSsoRequiredCacheIfPresent(ssoLoginEmail.toLowerCase());
+    }
+  }
 }
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..b5695e2e8a0 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 { 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 { 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 {
@@ -29,14 +22,10 @@ export abstract class BillingApiServiceAbstraction {
     request: CreateClientOrganizationRequest,
   ): Promise<void>;
 
-  abstract createSetupIntent(paymentMethodType: PaymentMethodType): Promise<string>;
-
   abstract getOrganizationBillingMetadata(
     organizationId: string,
   ): Promise<OrganizationBillingMetadataResponse>;
 
-  abstract getOrganizationPaymentMethod(organizationId: string): Promise<PaymentMethodResponse>;
-
   abstract getPlans(): Promise<ListResponse<PlanResponse>>;
 
   abstract getProviderClientInvoiceReport(providerId: string, invoiceId: string): Promise<string>;
@@ -49,44 +38,12 @@ export abstract class BillingApiServiceAbstraction {
 
   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/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/bitwarden-product-type.enum.ts b/libs/common/src/billing/enums/bitwarden-product-type.enum.ts
deleted file mode 100644
index 4389d283c00..00000000000
--- a/libs/common/src/billing/enums/bitwarden-product-type.enum.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// 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,
-}
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/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/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/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..a34809e9f02 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 { 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 { 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";
 
@@ -54,21 +47,6 @@ export class BillingApiService implements BillingApiServiceAbstraction {
     );
   }
 
-  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,
   ): Promise<OrganizationBillingMetadataResponse> {
@@ -83,17 +61,6 @@ export class BillingApiService implements BillingApiServiceAbstraction {
     return new OrganizationBillingMetadataResponse(r);
   }
 
-  async getOrganizationPaymentMethod(organizationId: string): Promise<PaymentMethodResponse> {
-    const response = await this.apiService.send(
-      "GET",
-      "/organizations/" + organizationId + "/billing/payment-method",
-      null,
-      true,
-      true,
-    );
-    return new PaymentMethodResponse(response);
-  }
-
   async getPlans(): Promise<ListResponse<PlanResponse>> {
     const r = await this.apiService.send("GET", "/plans", null, false, true);
     return new ListResponse(r, PlanResponse);
@@ -145,43 +112,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,
@@ -196,55 +126,6 @@ export class BillingApiService implements BillingApiServiceAbstraction {
     );
   }
 
-  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..4120047a15f 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,
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/libs/common/src/dirt/index.ts b/libs/common/src/dirt/index.ts
new file mode 100644
index 00000000000..3c3b6b6476a
--- /dev/null
+++ b/libs/common/src/dirt/index.ts
@@ -0,0 +1,2 @@
+export * from "./models";
+export * from "./services";
diff --git a/libs/common/src/dirt/models/index.ts b/libs/common/src/dirt/models/index.ts
new file mode 100644
index 00000000000..9d2cfb1f79c
--- /dev/null
+++ b/libs/common/src/dirt/models/index.ts
@@ -0,0 +1 @@
+export * from "./response";
diff --git a/libs/common/src/models/response/breach-account.response.ts b/libs/common/src/dirt/models/response/breach-account.response.ts
similarity index 93%
rename from libs/common/src/models/response/breach-account.response.ts
rename to libs/common/src/dirt/models/response/breach-account.response.ts
index 5c3c1f762eb..b5885f58931 100644
--- a/libs/common/src/models/response/breach-account.response.ts
+++ b/libs/common/src/dirt/models/response/breach-account.response.ts
@@ -1,4 +1,4 @@
-import { BaseResponse } from "./base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class BreachAccountResponse extends BaseResponse {
   addedDate: string;
diff --git a/libs/common/src/dirt/models/response/index.ts b/libs/common/src/dirt/models/response/index.ts
new file mode 100644
index 00000000000..46b91d7d0dd
--- /dev/null
+++ b/libs/common/src/dirt/models/response/index.ts
@@ -0,0 +1 @@
+export * from "./breach-account.response";
diff --git a/libs/common/src/dirt/services/dirt-api.service.spec.ts b/libs/common/src/dirt/services/dirt-api.service.spec.ts
new file mode 100644
index 00000000000..de87cb1888a
--- /dev/null
+++ b/libs/common/src/dirt/services/dirt-api.service.spec.ts
@@ -0,0 +1,20 @@
+import { ApiService } from "../../abstractions/api.service";
+
+import { DirtApiService } from "./dirt-api.service";
+
+describe("DirtApiService", () => {
+  let sut: DirtApiService;
+  let apiService: jest.Mocked<ApiService>;
+
+  beforeEach(() => {
+    apiService = {
+      send: jest.fn(),
+    } as any;
+
+    sut = new DirtApiService(apiService);
+  });
+
+  it("should be created", () => {
+    expect(sut).toBeTruthy();
+  });
+});
diff --git a/libs/common/src/dirt/services/dirt-api.service.ts b/libs/common/src/dirt/services/dirt-api.service.ts
new file mode 100644
index 00000000000..de7e85d521a
--- /dev/null
+++ b/libs/common/src/dirt/services/dirt-api.service.ts
@@ -0,0 +1,8 @@
+import { ApiService } from "../../abstractions/api.service";
+
+export class DirtApiService {
+  constructor(private apiService: ApiService) {}
+
+  // This service can be used for general DIRT-related API methods
+  // For specific domains like HIBP, use dedicated services like HibpApiService
+}
diff --git a/libs/common/src/dirt/services/hibp-api.service.spec.ts b/libs/common/src/dirt/services/hibp-api.service.spec.ts
new file mode 100644
index 00000000000..fd2a54bdd10
--- /dev/null
+++ b/libs/common/src/dirt/services/hibp-api.service.spec.ts
@@ -0,0 +1,39 @@
+import { ApiService } from "../../abstractions/api.service";
+import { BreachAccountResponse } from "../models";
+
+import { HibpApiService } from "./hibp-api.service";
+
+describe("HibpApiService", () => {
+  let sut: HibpApiService;
+  let apiService: jest.Mocked<ApiService>;
+
+  beforeEach(() => {
+    apiService = {
+      send: jest.fn(),
+    } as any;
+
+    sut = new HibpApiService(apiService);
+  });
+
+  describe("getHibpBreach", () => {
+    it("should properly URL encode username with special characters", async () => {
+      const mockResponse = [{ name: "test" }];
+      const username = "connect#bwpm@simplelogin.co";
+
+      apiService.send.mockResolvedValue(mockResponse);
+
+      const result = await sut.getHibpBreach(username);
+
+      expect(apiService.send).toHaveBeenCalledWith(
+        "GET",
+        "/hibp/breach?username=" + encodeURIComponent(username),
+        null,
+        true,
+        true,
+      );
+      expect(result).toBeInstanceOf(Array);
+      expect(result).toHaveLength(1);
+      expect(result[0]).toBeInstanceOf(BreachAccountResponse);
+    });
+  });
+});
diff --git a/libs/common/src/dirt/services/hibp-api.service.ts b/libs/common/src/dirt/services/hibp-api.service.ts
new file mode 100644
index 00000000000..79ec7351f9d
--- /dev/null
+++ b/libs/common/src/dirt/services/hibp-api.service.ts
@@ -0,0 +1,18 @@
+import { ApiService } from "../../abstractions/api.service";
+import { BreachAccountResponse } from "../models";
+
+export class HibpApiService {
+  constructor(private apiService: ApiService) {}
+
+  async getHibpBreach(username: string): Promise<BreachAccountResponse[]> {
+    const encodedUsername = encodeURIComponent(username);
+    const r = await this.apiService.send(
+      "GET",
+      "/hibp/breach?username=" + encodedUsername,
+      null,
+      true,
+      true,
+    );
+    return r.map((a: any) => new BreachAccountResponse(a));
+  }
+}
diff --git a/libs/common/src/dirt/services/index.ts b/libs/common/src/dirt/services/index.ts
new file mode 100644
index 00000000000..2f2a64f1aaf
--- /dev/null
+++ b/libs/common/src/dirt/services/index.ts
@@ -0,0 +1,2 @@
+export * from "./dirt-api.service";
+export * from "./hibp-api.service";
diff --git a/libs/common/src/enums/event-category.enum.ts b/libs/common/src/enums/event-category.enum.ts
new file mode 100644
index 00000000000..a00de477301
--- /dev/null
+++ b/libs/common/src/enums/event-category.enum.ts
@@ -0,0 +1,110 @@
+import { EventType } from "./event-type.enum";
+
+export const EventCategory = {
+  UserEvents: "userEvents",
+  ItemEvents: "itemEvents",
+  CollectionEvents: "collectionEvents",
+  GroupEvents: "groupEvents",
+  OrganizationMemberEvents: "organizationMemberEvents",
+  OrganizationEvents: "organizationEvents",
+  ProviderEvents: "providerEvents",
+} as const;
+
+export type EventCategory = (typeof EventCategory)[keyof typeof EventCategory];
+
+export const EventCategoryEventTypes: Record<EventCategory, EventType[]> = {
+  [EventCategory.UserEvents]: [
+    EventType.User_LoggedIn,
+    EventType.User_ChangedPassword,
+    EventType.User_Updated2fa,
+    EventType.User_Disabled2fa,
+    EventType.User_Recovered2fa,
+    EventType.User_FailedLogIn,
+    EventType.User_FailedLogIn2fa,
+    EventType.User_ClientExportedVault,
+    EventType.User_UpdatedTempPassword,
+    EventType.User_MigratedKeyToKeyConnector,
+    EventType.User_RequestedDeviceApproval,
+    EventType.User_TdeOffboardingPasswordSet,
+  ],
+  [EventCategory.ItemEvents]: [
+    EventType.Cipher_Created,
+    EventType.Cipher_Updated,
+    EventType.Cipher_Deleted,
+    EventType.Cipher_AttachmentCreated,
+    EventType.Cipher_AttachmentDeleted,
+    EventType.Cipher_Shared,
+    EventType.Cipher_UpdatedCollections,
+    EventType.Cipher_ClientViewed,
+    EventType.Cipher_ClientToggledPasswordVisible,
+    EventType.Cipher_ClientToggledHiddenFieldVisible,
+    EventType.Cipher_ClientToggledCardCodeVisible,
+    EventType.Cipher_ClientCopiedPassword,
+    EventType.Cipher_ClientCopiedHiddenField,
+    EventType.Cipher_ClientCopiedCardCode,
+    EventType.Cipher_ClientAutofilled,
+    EventType.Cipher_SoftDeleted,
+    EventType.Cipher_Restored,
+    EventType.Cipher_ClientToggledCardNumberVisible,
+    EventType.Cipher_ClientToggledTOTPSeedVisible,
+  ],
+  [EventCategory.CollectionEvents]: [
+    EventType.Collection_Created,
+    EventType.Collection_Updated,
+    EventType.Collection_Deleted,
+  ],
+  [EventCategory.GroupEvents]: [
+    EventType.Group_Created,
+    EventType.Group_Updated,
+    EventType.Group_Deleted,
+  ],
+  [EventCategory.OrganizationMemberEvents]: [
+    EventType.OrganizationUser_Invited,
+    EventType.OrganizationUser_Confirmed,
+    EventType.OrganizationUser_Updated,
+    EventType.OrganizationUser_Removed,
+    EventType.OrganizationUser_UpdatedGroups,
+    EventType.OrganizationUser_UnlinkedSso,
+    EventType.OrganizationUser_ResetPassword_Enroll,
+    EventType.OrganizationUser_ResetPassword_Withdraw,
+    EventType.OrganizationUser_AdminResetPassword,
+    EventType.OrganizationUser_ResetSsoLink,
+    EventType.OrganizationUser_FirstSsoLogin,
+    EventType.OrganizationUser_Revoked,
+    EventType.OrganizationUser_Restored,
+    EventType.OrganizationUser_ApprovedAuthRequest,
+    EventType.OrganizationUser_RejectedAuthRequest,
+    EventType.OrganizationUser_Deleted,
+    EventType.OrganizationUser_Left,
+  ],
+  [EventCategory.OrganizationEvents]: [
+    EventType.Organization_Updated,
+    EventType.Organization_PurgedVault,
+    EventType.Organization_ClientExportedVault,
+    EventType.Organization_VaultAccessed,
+    EventType.Organization_EnabledSso,
+    EventType.Organization_DisabledSso,
+    EventType.Organization_EnabledKeyConnector,
+    EventType.Organization_DisabledKeyConnector,
+    EventType.Organization_SponsorshipsSynced,
+    EventType.Organization_CollectionManagementUpdated,
+    EventType.Organization_CollectionManagement_LimitCollectionCreationEnabled,
+    EventType.Organization_CollectionManagement_LimitCollectionCreationDisabled,
+    EventType.Organization_CollectionManagement_LimitCollectionDeletionEnabled,
+    EventType.Organization_CollectionManagement_LimitCollectionDeletionDisabled,
+    EventType.Organization_CollectionManagement_LimitItemDeletionEnabled,
+    EventType.Organization_CollectionManagement_LimitItemDeletionDisabled,
+    EventType.Organization_CollectionManagement_AllowAdminAccessToAllCollectionItemsEnabled,
+    EventType.Organization_CollectionManagement_AllowAdminAccessToAllCollectionItemsDisabled,
+  ],
+  [EventCategory.ProviderEvents]: [
+    EventType.ProviderUser_Invited,
+    EventType.ProviderUser_Confirmed,
+    EventType.ProviderUser_Updated,
+    EventType.ProviderUser_Removed,
+    EventType.ProviderOrganization_Created,
+    EventType.ProviderOrganization_Added,
+    EventType.ProviderOrganization_Removed,
+    EventType.ProviderOrganization_VaultAccessed,
+  ],
+};
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 b339798f914..578d09c9aea 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -12,21 +12,17 @@ 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",
 
   /* Auth */
-  PM14938_BrowserExtensionLoginApproval = "pm-14938-browser-extension-login-approvals",
+  PM22110_DisableAlternateLoginMethods = "pm-22110-disable-alternate-login-methods",
 
   /* Autofill */
-  NotificationRefresh = "notification-refresh",
   MacOsNativeCredentialSync = "macos-native-credential-sync",
   WindowsDesktopAutotype = "windows-desktop-autotype",
 
   /* Billing */
   TrialPaymentOptional = "PM-8163-trial-payment",
   PM17772_AdminInitiatedSponsorships = "pm-17772-admin-initiated-sponsorships",
-  UseOrganizationWarningsService = "use-organization-warnings-service",
-  PM21881_ManagePaymentDetailsOutsideCheckout = "pm-21881-manage-payment-details-outside-checkout",
   PM21821_ProviderPortalTakeover = "pm-21821-provider-portal-takeover",
   PM22415_TaxIDWarnings = "pm-22415-tax-id-warnings",
 
@@ -42,18 +38,22 @@ export enum FeatureFlag {
 
   /* DIRT */
   EventBasedOrganizationIntegrations = "event-based-organization-integrations",
+  PhishingDetection = "phishing-detection",
+  PM22887_RiskInsightsActivityTab = "pm-22887-risk-insights-activity-tab",
 
   /* Vault */
   PM19941MigrateCipherDomainToSdk = "pm-19941-migrate-cipher-domain-to-sdk",
   PM22134SdkCipherListView = "pm-22134-sdk-cipher-list-view",
   PM22136_SdkCipherEncryption = "pm-22136-sdk-cipher-encryption",
   CipherKeyEncryption = "cipher-key-encryption",
-  RemoveCardItemTypePolicy = "pm-16442-remove-card-item-type-policy",
 
   /* Platform */
   IpcChannelFramework = "ipc-channel-framework",
   InactiveUserServerNotification = "pm-25130-receive-push-notifications-for-inactive-users",
   PushNotificationsWhenLocked = "pm-19388-push-notifications-when-locked",
+
+  /* Innovation */
+  PM19148_InnovationArchive = "pm-19148-innovation-archive",
 }
 
 export type AllowedFeatureFlagTypes = boolean | number | string;
@@ -72,10 +72,8 @@ const FALSE = false as boolean;
 export const DefaultFeatureFlagValue = {
   /* Admin Console Team */
   [FeatureFlag.CreateDefaultLocation]: FALSE,
-  [FeatureFlag.CollectionVaultRefactor]: FALSE,
 
   /* Autofill */
-  [FeatureFlag.NotificationRefresh]: FALSE,
   [FeatureFlag.MacOsNativeCredentialSync]: FALSE,
   [FeatureFlag.WindowsDesktopAutotype]: FALSE,
 
@@ -86,22 +84,21 @@ export const DefaultFeatureFlagValue = {
 
   /* DIRT */
   [FeatureFlag.EventBasedOrganizationIntegrations]: FALSE,
+  [FeatureFlag.PhishingDetection]: FALSE,
+  [FeatureFlag.PM22887_RiskInsightsActivityTab]: FALSE,
 
   /* Vault */
   [FeatureFlag.CipherKeyEncryption]: FALSE,
   [FeatureFlag.PM19941MigrateCipherDomainToSdk]: FALSE,
-  [FeatureFlag.RemoveCardItemTypePolicy]: FALSE,
   [FeatureFlag.PM22134SdkCipherListView]: FALSE,
   [FeatureFlag.PM22136_SdkCipherEncryption]: FALSE,
 
   /* Auth */
-  [FeatureFlag.PM14938_BrowserExtensionLoginApproval]: FALSE,
+  [FeatureFlag.PM22110_DisableAlternateLoginMethods]: FALSE,
 
   /* Billing */
   [FeatureFlag.TrialPaymentOptional]: FALSE,
   [FeatureFlag.PM17772_AdminInitiatedSponsorships]: FALSE,
-  [FeatureFlag.UseOrganizationWarningsService]: FALSE,
-  [FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout]: FALSE,
   [FeatureFlag.PM21821_ProviderPortalTakeover]: FALSE,
   [FeatureFlag.PM22415_TaxIDWarnings]: FALSE,
 
@@ -114,6 +111,9 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.IpcChannelFramework]: FALSE,
   [FeatureFlag.InactiveUserServerNotification]: FALSE,
   [FeatureFlag.PushNotificationsWhenLocked]: FALSE,
+
+  /* Innovation */
+  [FeatureFlag.PM19148_InnovationArchive]: FALSE,
 } satisfies Record<FeatureFlag, AllowedFeatureFlagTypes>;
 
 export type DefaultFeatureFlagValueType = typeof DefaultFeatureFlagValue;
diff --git a/libs/common/src/key-management/kdf/change-kdf-api.service.abstraction.ts b/libs/common/src/key-management/kdf/change-kdf-api.service.abstraction.ts
new file mode 100644
index 00000000000..04a454a0537
--- /dev/null
+++ b/libs/common/src/key-management/kdf/change-kdf-api.service.abstraction.ts
@@ -0,0 +1,9 @@
+import { KdfRequest } from "@bitwarden/common/models/request/kdf.request";
+
+export abstract class ChangeKdfApiService {
+  /**
+   * Sends a request to update the user's KDF parameters.
+   * @param request The KDF request containing authentication data, unlock data, and old authentication data
+   */
+  abstract updateUserKdfParams(request: KdfRequest): Promise<void>;
+}
diff --git a/libs/common/src/key-management/kdf/change-kdf-api.service.ts b/libs/common/src/key-management/kdf/change-kdf-api.service.ts
new file mode 100644
index 00000000000..0420dbbdfb2
--- /dev/null
+++ b/libs/common/src/key-management/kdf/change-kdf-api.service.ts
@@ -0,0 +1,15 @@
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { KdfRequest } from "@bitwarden/common/models/request/kdf.request";
+
+import { ChangeKdfApiService } from "./change-kdf-api.service.abstraction";
+
+/**
+ * @internal
+ */
+export class DefaultChangeKdfApiService implements ChangeKdfApiService {
+  constructor(private apiService: ApiService) {}
+
+  async updateUserKdfParams(request: KdfRequest): Promise<void> {
+    return this.apiService.send("POST", "/accounts/kdf", request, true, false);
+  }
+}
diff --git a/libs/common/src/key-management/kdf/change-kdf-service.abstraction.ts b/libs/common/src/key-management/kdf/change-kdf-service.abstraction.ts
new file mode 100644
index 00000000000..b0eb06f9037
--- /dev/null
+++ b/libs/common/src/key-management/kdf/change-kdf-service.abstraction.ts
@@ -0,0 +1,20 @@
+import { UserId } from "@bitwarden/common/types/guid";
+// eslint-disable-next-line no-restricted-imports
+import { KdfConfig } from "@bitwarden/key-management";
+
+export abstract class ChangeKdfService {
+  /**
+   * Updates the user's KDF parameters
+   * @param masterPassword The user's current master password
+   * @param kdf The new KDF configuration to apply
+   * @param userId The ID of the user whose KDF parameters are being updated
+   * @throws If any of the parameters is null
+   * @throws If the user is locked or logged out
+   * @throws If the kdf change request fails
+   */
+  abstract updateUserKdfParams(
+    masterPassword: string,
+    kdf: KdfConfig,
+    userId: UserId,
+  ): Promise<void>;
+}
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
new file mode 100644
index 00000000000..07cba1cc7eb
--- /dev/null
+++ b/libs/common/src/key-management/kdf/change-kdf-service.spec.ts
@@ -0,0 +1,167 @@
+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 { MasterPasswordServiceAbstraction } from "../master-password/abstractions/master-password.service.abstraction";
+import {
+  MasterKeyWrappedUserKey,
+  MasterPasswordAuthenticationHash,
+  MasterPasswordSalt,
+  MasterPasswordUnlockData,
+} from "../master-password/types/master-password.types";
+
+import { ChangeKdfApiService } from "./change-kdf-api.service.abstraction";
+import { DefaultChangeKdfService } from "./change-kdf-service";
+
+describe("ChangeKdfService", () => {
+  const changeKdfApiService = mock<ChangeKdfApiService>();
+  const masterPasswordService = mock<MasterPasswordServiceAbstraction>();
+  const keyService = mock<KeyService>();
+  const kdfConfigService = mock<KdfConfigService>();
+
+  let sut: DefaultChangeKdfService = mock<DefaultChangeKdfService>();
+
+  const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+  const mockOldKdfConfig = new PBKDF2KdfConfig(100000);
+  const mockNewKdfConfig = new PBKDF2KdfConfig(200000);
+  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";
+
+  beforeEach(() => {
+    sut = new DefaultChangeKdfService(
+      masterPasswordService,
+      keyService,
+      kdfConfigService,
+      changeKdfApiService,
+    );
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe("updateUserKdfParams", () => {
+    it("should throw an error if masterPassword is null", async () => {
+      await expect(
+        sut.updateUserKdfParams(null as unknown as string, mockNewKdfConfig, mockUserId),
+      ).rejects.toThrow("masterPassword");
+    });
+
+    it("should throw an error if masterPassword is undefined", async () => {
+      await expect(
+        sut.updateUserKdfParams(undefined as unknown as string, mockNewKdfConfig, mockUserId),
+      ).rejects.toThrow("masterPassword");
+    });
+
+    it("should throw an error if kdf is null", async () => {
+      await expect(
+        sut.updateUserKdfParams("masterPassword", null as unknown as PBKDF2KdfConfig, mockUserId),
+      ).rejects.toThrow("kdf");
+    });
+
+    it("should throw an error if kdf is undefined", async () => {
+      await expect(
+        sut.updateUserKdfParams(
+          "masterPassword",
+          undefined as unknown as PBKDF2KdfConfig,
+          mockUserId,
+        ),
+      ).rejects.toThrow("kdf");
+    });
+
+    it("should throw an error if userId is null", async () => {
+      await expect(
+        sut.updateUserKdfParams("masterPassword", mockNewKdfConfig, null as unknown as UserId),
+      ).rejects.toThrow("userId");
+    });
+
+    it("should throw an error if userId is undefined", async () => {
+      await expect(
+        sut.updateUserKdfParams("masterPassword", mockNewKdfConfig, undefined as unknown as UserId),
+      ).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));
+      await expect(
+        sut.updateUserKdfParams("masterPassword", mockNewKdfConfig, mockUserId),
+      ).rejects.toThrow();
+    });
+
+    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 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");
+    });
+
+    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,
+        ),
+      );
+
+      await sut.updateUserKdfParams("masterPassword", mockNewKdfConfig, mockUserId);
+
+      const expected = new KdfRequest(
+        {
+          salt: mockSalt,
+          kdf: mockNewKdfConfig,
+          masterPasswordAuthenticationHash: mockNewHash,
+        },
+        new MasterPasswordUnlockData(
+          mockSalt,
+          mockNewKdfConfig,
+          mockWrappedUserKey as MasterKeyWrappedUserKey,
+        ),
+      ).authenticateWith({
+        salt: mockSalt,
+        kdf: mockOldKdfConfig,
+        masterPasswordAuthenticationHash: mockOldHash,
+      });
+
+      expect(changeKdfApiService.updateUserKdfParams).toHaveBeenCalledWith(expected);
+    });
+  });
+});
diff --git a/libs/common/src/key-management/kdf/change-kdf-service.ts b/libs/common/src/key-management/kdf/change-kdf-service.ts
new file mode 100644
index 00000000000..d8bc3e21c1a
--- /dev/null
+++ b/libs/common/src/key-management/kdf/change-kdf-service.ts
@@ -0,0 +1,59 @@
+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 { MasterPasswordServiceAbstraction } from "../master-password/abstractions/master-password.service.abstraction";
+import { firstValueFromOrThrow } from "../utils";
+
+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,
+  ) {}
+
+  async updateUserKdfParams(masterPassword: string, kdf: KdfConfig, userId: UserId): Promise<void> {
+    assertNonNullish(masterPassword, "masterPassword");
+    assertNonNullish(kdf, "kdf");
+    assertNonNullish(userId, "userId");
+
+    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",
+    );
+
+    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 request = new KdfRequest(authenticationData, unlockData);
+    request.authenticateWith(oldAuthenticationData);
+    await this.changeKdfApiService.updateUserKdfParams(request);
+  }
+}
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 002cce662c0..8ef14904bce 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
@@ -27,6 +27,11 @@ export abstract class MasterPasswordServiceAbstraction {
    * @throws If the user ID is provided, but the user is not found.
    */
   abstract saltForUser$: (userId: UserId) => Observable<MasterPasswordSalt>;
+  /**
+   * Converts an email to a master password salt. This is a canonical encoding of the
+   * email, no matter how the email is capitalized.
+   */
+  abstract emailToSalt(email: string): MasterPasswordSalt;
   /**
    * An observable that emits the master key for the user.
    * @deprecated Interacting with the master-key directly is deprecated. Please use {@link makeMasterPasswordUnlockData}, {@link makeMasterPasswordAuthenticationData} or {@link unwrapUserKeyFromMasterPasswordUnlockData} instead.
diff --git a/libs/common/src/key-management/master-password/models/response/master-password-unlock.response.spec.ts b/libs/common/src/key-management/master-password/models/response/master-password-unlock.response.spec.ts
index 3dd1a28cc43..38701f2dc1c 100644
--- a/libs/common/src/key-management/master-password/models/response/master-password-unlock.response.spec.ts
+++ b/libs/common/src/key-management/master-password/models/response/master-password-unlock.response.spec.ts
@@ -1,13 +1,11 @@
 // eslint-disable-next-line no-restricted-imports
 import { KdfType, PBKDF2KdfConfig } from "@bitwarden/key-management";
 
-import { makeEncString } from "../../../../../spec";
-
 import { MasterPasswordUnlockResponse } from "./master-password-unlock.response";
 
 describe("MasterPasswordUnlockResponse", () => {
   const salt = "test@example.com";
-  const encryptedUserKey = makeEncString("testUserKey");
+  const encryptedUserKey = "testUserKey";
   const testKdfResponse = { KdfType: KdfType.PBKDF2_SHA256, Iterations: 600_000 };
 
   it("should throw error when salt is not provided", () => {
@@ -15,7 +13,7 @@ describe("MasterPasswordUnlockResponse", () => {
       new MasterPasswordUnlockResponse({
         Salt: undefined,
         Kdf: testKdfResponse,
-        MasterKeyEncryptedUserKey: encryptedUserKey.encryptedString,
+        MasterKeyEncryptedUserKey: encryptedUserKey,
       });
     }).toThrow("MasterPasswordUnlockResponse does not contain a valid salt");
   });
@@ -36,7 +34,7 @@ describe("MasterPasswordUnlockResponse", () => {
     const response = new MasterPasswordUnlockResponse({
       Salt: salt,
       Kdf: testKdfResponse,
-      MasterKeyEncryptedUserKey: encryptedUserKey.encryptedString,
+      MasterKeyEncryptedUserKey: encryptedUserKey,
     });
 
     expect(response.salt).toBe(salt);
@@ -50,7 +48,7 @@ describe("MasterPasswordUnlockResponse", () => {
       const response = new MasterPasswordUnlockResponse({
         Salt: salt,
         Kdf: testKdfResponse,
-        MasterKeyEncryptedUserKey: encryptedUserKey.encryptedString,
+        MasterKeyEncryptedUserKey: encryptedUserKey,
       });
 
       const unlockData = response.toMasterPasswordUnlockData();
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 294d5f48a73..41b16d43f56 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
@@ -1,5 +1,4 @@
 import { BaseResponse } from "../../../../models/response/base.response";
-import { EncString } from "../../../crypto/models/enc-string";
 import { KdfConfigResponse } from "../../../models/response/kdf-config.response";
 import {
   MasterKeyWrappedUserKey,
@@ -29,9 +28,7 @@ export class MasterPasswordUnlockResponse extends BaseResponse {
         "MasterPasswordUnlockResponse does not contain a valid master key encrypted user key",
       );
     }
-    this.masterKeyWrappedUserKey = new EncString(
-      masterKeyEncryptedUserKey,
-    ) as MasterKeyWrappedUserKey;
+    this.masterKeyWrappedUserKey = masterKeyEncryptedUserKey as MasterKeyWrappedUserKey;
   }
 
   toMasterPasswordUnlockData() {
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 246132e2c85..81aea5e480a 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
@@ -33,6 +33,10 @@ export class FakeMasterPasswordService implements InternalMasterPasswordServiceA
     this.masterKeyHashSubject.next(initialMasterKeyHash);
   }
 
+  emailToSalt(email: string): MasterPasswordSalt {
+    return this.mock.emailToSalt(email);
+  }
+
   saltForUser$(userId: UserId): Observable<MasterPasswordSalt> {
     return this.mock.saltForUser$(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 8fd3f0b85c2..02b4e9a895a 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
@@ -10,7 +10,6 @@ import { Argon2KdfConfig, KdfConfig, KdfType, PBKDF2KdfConfig } from "@bitwarden
 
 import {
   FakeAccountService,
-  makeEncString,
   makeSymmetricCryptoKey,
   mockAccountServiceWith,
 } from "../../../../spec";
@@ -385,7 +384,7 @@ describe("MasterPasswordService", () => {
       const kdfPBKDF2: KdfConfig = new PBKDF2KdfConfig(600_000);
       const kdfArgon2: KdfConfig = new Argon2KdfConfig(4, 64, 3);
       const salt = "test@bitwarden.com" as MasterPasswordSalt;
-      const encryptedUserKey = makeEncString("testUserKet") as MasterKeyWrappedUserKey;
+      const encryptedUserKey = "testUserKet" as MasterKeyWrappedUserKey;
 
       it("returns null when value is null", () => {
         const deserialized = MASTER_PASSWORD_UNLOCK_KEY.deserializer(
@@ -401,7 +400,7 @@ describe("MasterPasswordService", () => {
             kdfType: KdfType.PBKDF2_SHA256,
             iterations: kdfPBKDF2.iterations,
           },
-          masterKeyWrappedUserKey: encryptedUserKey.encryptedString as string,
+          masterKeyWrappedUserKey: encryptedUserKey as string,
         };
 
         const deserialized = MASTER_PASSWORD_UNLOCK_KEY.deserializer(data);
@@ -419,7 +418,7 @@ describe("MasterPasswordService", () => {
             memory: kdfArgon2.memory,
             parallelism: kdfArgon2.parallelism,
           },
-          masterKeyWrappedUserKey: encryptedUserKey.encryptedString as string,
+          masterKeyWrappedUserKey: encryptedUserKey as string,
         };
 
         const deserialized = MASTER_PASSWORD_UNLOCK_KEY.deserializer(data);
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 94465bd24fd..9f7e054d64c 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
@@ -132,7 +132,7 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
     return EncString.fromJSON(key);
   }
 
-  private emailToSalt(email: string): MasterPasswordSalt {
+  emailToSalt(email: string): MasterPasswordSalt {
     return email.toLowerCase().trim() as MasterPasswordSalt;
   }
 
@@ -256,6 +256,9 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
     assertNonNullish(password, "password");
     assertNonNullish(kdf, "kdf");
     assertNonNullish(salt, "salt");
+    if (password === "") {
+      throw new Error("Master password cannot be empty.");
+    }
 
     // We don't trust callers to use masterpasswordsalt correctly. They may type assert incorrectly.
     salt = salt.toLowerCase().trim() as MasterPasswordSalt;
@@ -294,18 +297,19 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
     assertNonNullish(kdf, "kdf");
     assertNonNullish(salt, "salt");
     assertNonNullish(userKey, "userKey");
+    if (password === "") {
+      throw new Error("Master password cannot be empty.");
+    }
 
     // We don't trust callers to use masterpasswordsalt correctly. They may type assert incorrectly.
     salt = salt.toLowerCase().trim() as MasterPasswordSalt;
 
     await SdkLoadService.Ready;
-    const masterKeyWrappedUserKey = new EncString(
-      PureCrypto.encrypt_user_key_with_master_password(
-        userKey.toEncoded(),
-        password,
-        salt,
-        kdf.toSdkConfig(),
-      ),
+    const masterKeyWrappedUserKey = PureCrypto.encrypt_user_key_with_master_password(
+      userKey.toEncoded(),
+      password,
+      salt,
+      kdf.toSdkConfig(),
     ) as MasterKeyWrappedUserKey;
     return new MasterPasswordUnlockData(salt, kdf, masterKeyWrappedUserKey);
   }
@@ -320,7 +324,7 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
     await SdkLoadService.Ready;
     const userKey = new SymmetricCryptoKey(
       PureCrypto.decrypt_user_key_with_master_password(
-        masterPasswordUnlockData.masterKeyWrappedUserKey.encryptedString,
+        masterPasswordUnlockData.masterKeyWrappedUserKey,
         password,
         masterPasswordUnlockData.salt,
         masterPasswordUnlockData.kdf.toSdkConfig(),
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 f71bb0c317c..416b296623f 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
@@ -2,8 +2,7 @@ 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 "../../crypto/models/enc-string";
+import { EncString } from "@bitwarden/sdk-internal";
 
 /**
  * The Base64-encoded master password authentication hash, that is sent to the server for authentication.
@@ -13,7 +12,7 @@ export type MasterPasswordAuthenticationHash = Opaque<string, "MasterPasswordAut
  * You MUST obtain this through the emailToSalt function in MasterPasswordService
  */
 export type MasterPasswordSalt = Opaque<string, "MasterPasswordSalt">;
-export type MasterKeyWrappedUserKey = Opaque<EncString, "MasterPasswordSalt">;
+export type MasterKeyWrappedUserKey = Opaque<EncString, "MasterKeyWrappedUserKey">;
 
 /**
  * The data required to unlock with the master password.
@@ -29,7 +28,7 @@ export class MasterPasswordUnlockData {
     return {
       salt: this.salt,
       kdf: this.kdf,
-      masterKeyWrappedUserKey: this.masterKeyWrappedUserKey.toJSON(),
+      masterKeyWrappedUserKey: this.masterKeyWrappedUserKey,
     };
   }
 
@@ -43,7 +42,7 @@ export class MasterPasswordUnlockData {
       obj.kdf.kdfType === KdfType.PBKDF2_SHA256
         ? PBKDF2KdfConfig.fromJSON(obj.kdf)
         : Argon2KdfConfig.fromJSON(obj.kdf),
-      EncString.fromJSON(obj.masterKeyWrappedUserKey) as MasterKeyWrappedUserKey,
+      obj.masterKeyWrappedUserKey as MasterKeyWrappedUserKey,
     );
   }
 }
diff --git a/libs/common/src/key-management/models/response/user-decryption.response.spec.ts b/libs/common/src/key-management/models/response/user-decryption.response.spec.ts
index 20596a75ef2..06c19829900 100644
--- a/libs/common/src/key-management/models/response/user-decryption.response.spec.ts
+++ b/libs/common/src/key-management/models/response/user-decryption.response.spec.ts
@@ -1,14 +1,12 @@
 // eslint-disable-next-line no-restricted-imports
 import { KdfType } from "@bitwarden/key-management";
 
-import { makeEncString } from "../../../../spec";
-
 import { UserDecryptionResponse } from "./user-decryption.response";
 
 describe("UserDecryptionResponse", () => {
   it("should create response when masterPasswordUnlock provided", () => {
     const salt = "test@example.com";
-    const encryptedUserKey = makeEncString("testUserKey");
+    const encryptedUserKey = "testUserKey";
     const kdfIterations = 600_000;
 
     const response = {
@@ -18,7 +16,7 @@ describe("UserDecryptionResponse", () => {
           KdfType: KdfType.PBKDF2_SHA256 as number,
           Iterations: kdfIterations,
         },
-        MasterKeyEncryptedUserKey: encryptedUserKey.encryptedString,
+        MasterKeyEncryptedUserKey: encryptedUserKey,
       },
     };
 
diff --git a/libs/common/src/key-management/utils.ts b/libs/common/src/key-management/utils.ts
new file mode 100644
index 00000000000..d0d8854df58
--- /dev/null
+++ b/libs/common/src/key-management/utils.ts
@@ -0,0 +1,12 @@
+import { firstValueFrom, Observable } from "rxjs";
+
+export async function firstValueFromOrThrow<T>(
+  value: Observable<T | null>,
+  name: string,
+): Promise<T> {
+  const result = await firstValueFrom(value);
+  if (result == null) {
+    throw new Error(`Failed to get ${name}`);
+  }
+  return result;
+}
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 8b523498c31..9b1350fc3a7 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
@@ -144,6 +144,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
 
     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);
 
diff --git a/libs/common/src/models/export/cipher.export.ts b/libs/common/src/models/export/cipher.export.ts
index 846a56dac85..0861bd39d61 100644
--- a/libs/common/src/models/export/cipher.export.ts
+++ b/libs/common/src/models/export/cipher.export.ts
@@ -36,6 +36,7 @@ export class CipherExport {
     req.creationDate = null;
     req.revisionDate = null;
     req.deletedDate = null;
+    req.archivedDate = null;
     return req;
   }
 
@@ -84,6 +85,7 @@ export class CipherExport {
     view.creationDate = req.creationDate ? new Date(req.creationDate) : view.creationDate;
     view.revisionDate = req.revisionDate ? new Date(req.revisionDate) : view.revisionDate;
     view.deletedDate = req.deletedDate ? new Date(req.deletedDate) : view.deletedDate;
+    view.archivedDate = req.archivedDate ? new Date(req.archivedDate) : view.archivedDate;
     return view;
   }
 
@@ -128,6 +130,7 @@ export class CipherExport {
     domain.creationDate = req.creationDate ? new Date(req.creationDate) : null;
     domain.revisionDate = req.revisionDate ? new Date(req.revisionDate) : null;
     domain.deletedDate = req.deletedDate ? new Date(req.deletedDate) : null;
+    domain.archivedDate = req.archivedDate ? new Date(req.archivedDate) : null;
     return domain;
   }
 
@@ -149,6 +152,7 @@ export class CipherExport {
   revisionDate: Date = null;
   creationDate: Date = null;
   deletedDate: Date = null;
+  archivedDate: Date = null;
   key: string;
 
   // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
@@ -195,5 +199,6 @@ export class CipherExport {
     this.creationDate = o.creationDate;
     this.revisionDate = o.revisionDate;
     this.deletedDate = o.deletedDate;
+    this.archivedDate = o.archivedDate;
   }
 }
diff --git a/libs/common/src/models/request/kdf.request.ts b/libs/common/src/models/request/kdf.request.ts
index 7ffdbcb4a4b..e49d8ffe6b8 100644
--- a/libs/common/src/models/request/kdf.request.ts
+++ b/libs/common/src/models/request/kdf.request.ts
@@ -1,14 +1,20 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-// 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 { KdfType } from "@bitwarden/key-management";
+import {
+  MasterPasswordAuthenticationData,
+  MasterPasswordUnlockData,
+} from "@bitwarden/common/key-management/master-password/types/master-password.types";
 
 import { PasswordRequest } from "../../auth/models/request/password.request";
 
 export class KdfRequest extends PasswordRequest {
-  kdf: KdfType;
-  kdfIterations: number;
-  kdfMemory?: number;
-  kdfParallelism?: number;
+  constructor(
+    authenticationData: MasterPasswordAuthenticationData,
+    unlockData: MasterPasswordUnlockData,
+  ) {
+    super();
+    // Note, this init code should be in the super constructor, once PasswordRequest's constructor is updated.
+    this.newMasterPasswordHash = authenticationData.masterPasswordAuthenticationHash;
+    this.key = unlockData.masterKeyWrappedUserKey;
+    this.authenticationData = authenticationData;
+    this.unlockData = unlockData;
+  }
 }
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/platform/abstractions/platform-utils.service.ts b/libs/common/src/platform/abstractions/platform-utils.service.ts
index 4d3f032052b..4d126aeab88 100644
--- a/libs/common/src/platform/abstractions/platform-utils.service.ts
+++ b/libs/common/src/platform/abstractions/platform-utils.service.ts
@@ -21,6 +21,7 @@ export abstract class PlatformUtilsService {
   abstract isOpera(): boolean;
   abstract isVivaldi(): boolean;
   abstract isSafari(): boolean;
+  abstract isChromium(): boolean;
   abstract isMacAppStore(): boolean;
   abstract isPopupOpen(): Promise<boolean>;
   abstract launchUri(uri: string, options?: any): void;
diff --git a/libs/common/src/platform/messaging/internal.ts b/libs/common/src/platform/messaging/internal.ts
index 9fe261f2264..0d7abe256e6 100644
--- a/libs/common/src/platform/messaging/internal.ts
+++ b/libs/common/src/platform/messaging/internal.ts
@@ -1 +1 @@
-export * from "@bitwarden/messaging-internal";
+export { SubjectMessageSender, tagAsExternal, getCommand } from "@bitwarden/messaging";
diff --git a/libs/common/src/platform/misc/flags.ts b/libs/common/src/platform/misc/flags.ts
index 30531b6799e..5aabd1c59d7 100644
--- a/libs/common/src/platform/misc/flags.ts
+++ b/libs/common/src/platform/misc/flags.ts
@@ -12,6 +12,7 @@ export type SharedDevFlags = {
   skipWelcomeOnInstall: boolean;
   configRetrievalIntervalMs: number;
   showRiskInsightsDebug: boolean;
+  testPhishingUrls: string[];
 };
 
 function getFlags<T>(envFlags: string | T): T {
diff --git a/libs/common/src/platform/misc/utils.spec.ts b/libs/common/src/platform/misc/utils.spec.ts
index 818138863fb..9f01db61fa6 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(...)", () => {
diff --git a/libs/common/src/platform/misc/utils.ts b/libs/common/src/platform/misc/utils.ts
index c103e346a85..c771bee5463 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));
   }
@@ -392,7 +453,7 @@ export class Utils {
     };
   }
 
-  static isNullOrWhitespace(str: string): boolean {
+  static isNullOrWhitespace(str: string | null | undefined): boolean {
     return str == null || typeof str !== "string" || str.trim() === "";
   }
 
diff --git a/libs/common/src/platform/scheduling/scheduled-task-name.enum.ts b/libs/common/src/platform/scheduling/scheduled-task-name.enum.ts
index 990a4c77c94..7cc96873748 100644
--- a/libs/common/src/platform/scheduling/scheduled-task-name.enum.ts
+++ b/libs/common/src/platform/scheduling/scheduled-task-name.enum.ts
@@ -8,6 +8,7 @@ export const ScheduledTaskNames = {
   eventUploadsInterval: "eventUploadsInterval",
   vaultTimeoutCheckInterval: "vaultTimeoutCheckInterval",
   clearPopupViewCache: "clearPopupViewCache",
+  phishingDomainUpdate: "phishingDomainUpdate",
 } as const;
 
 export type ScheduledTaskName = (typeof ScheduledTaskNames)[keyof typeof ScheduledTaskNames];
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.ts b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
index e934dec185d..47af8f5e00c 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
@@ -278,16 +278,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/services/fido2/fido2-client.service.ts b/libs/common/src/platform/services/fido2/fido2-client.service.ts
index 431585441a7..08c0a265100 100644
--- a/libs/common/src/platform/services/fido2/fido2-client.service.ts
+++ b/libs/common/src/platform/services/fido2/fido2-client.service.ts
@@ -251,8 +251,7 @@ export class Fido2ClientService<ParentWindowReference>
       clientDataJSON: Fido2Utils.bufferToString(clientDataJSONBytes),
       publicKey: Fido2Utils.bufferToString(makeCredentialResult.publicKey),
       publicKeyAlgorithm: makeCredentialResult.publicKeyAlgorithm,
-      transports:
-        params.rp.id === "google.com" ? ["internal", "usb", "hybrid"] : ["internal", "hybrid"],
+      transports: ["internal", "hybrid"],
       extensions: { credProps },
     };
   }
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 4fcafd885e4..352e45b88b1 100644
--- a/libs/common/src/platform/sync/default-sync.service.spec.ts
+++ b/libs/common/src/platform/sync/default-sync.service.spec.ts
@@ -15,7 +15,6 @@ import {
 // eslint-disable-next-line no-restricted-imports
 import { KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management";
 
-import { makeEncString } from "../../../spec";
 import { Matrix } from "../../../spec/matrix";
 import { ApiService } from "../../abstractions/api.service";
 import { InternalOrganizationServiceAbstraction } from "../../admin-console/abstractions/organization/organization.service.abstraction";
@@ -247,7 +246,7 @@ describe("DefaultSyncService", () => {
     describe("syncUserDecryption", () => {
       const salt = "test@example.com";
       const kdf = new PBKDF2KdfConfig(600_000);
-      const encryptedUserKey = makeEncString("testUserKey");
+      const encryptedUserKey = "testUserKey";
 
       it("should set master password unlock when present in user decryption", async () => {
         const syncResponse = new SyncResponse({
@@ -261,7 +260,7 @@ describe("DefaultSyncService", () => {
                 KdfType: kdf.kdfType,
                 Iterations: kdf.iterations,
               },
-              MasterKeyEncryptedUserKey: encryptedUserKey.encryptedString,
+              MasterKeyEncryptedUserKey: encryptedUserKey,
             },
           },
         });
@@ -293,5 +292,100 @@ 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);
+
+        // Baseline date/time to compare sync time to, in order to avoid needing to use some kind of fake date provider.
+        const beforeSync = Date.now();
+
+        // send it!
+        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 actualTime = dateCallback() as Date;
+
+        expect(Math.abs(actualTime.getTime() - beforeSync)).toBeLessThan(1);
+      });
+
+      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..a02d602dbf0 100644
--- a/libs/common/src/platform/sync/default-sync.service.ts
+++ b/libs/common/src/platform/sync/default-sync.service.ts
@@ -134,9 +134,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 +146,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);
     }
 
diff --git a/libs/common/src/services/api.service.spec.ts b/libs/common/src/services/api.service.spec.ts
index daef4164029..6d6e96de9e3 100644
--- a/libs/common/src/services/api.service.spec.ts
+++ b/libs/common/src/services/api.service.spec.ts
@@ -14,7 +14,6 @@ import {
   VaultTimeoutSettingsService,
   VaultTimeoutStringType,
 } from "../key-management/vault-timeout";
-import { BreachAccountResponse } from "../models/response/breach-account.response";
 import { ErrorResponse } from "../models/response/error.response";
 import { AppIdService } from "../platform/abstractions/app-id.service";
 import { Environment, EnvironmentService } from "../platform/abstractions/environment.service";
@@ -412,26 +411,4 @@ describe("ApiService", () => {
       ).rejects.toMatchObject(error);
     },
   );
-
-  describe("getHibpBreach", () => {
-    it("should properly URL encode username with special characters", async () => {
-      const mockResponse = [{ name: "test" }];
-      const username = "connect#bwpm@simplelogin.co";
-
-      jest.spyOn(sut, "send").mockResolvedValue(mockResponse);
-
-      const result = await sut.getHibpBreach(username);
-
-      expect(sut.send).toHaveBeenCalledWith(
-        "GET",
-        "/hibp/breach?username=" + encodeURIComponent(username),
-        null,
-        true,
-        true,
-      );
-      expect(result).toBeInstanceOf(Array);
-      expect(result).toHaveLength(1);
-      expect(result[0]).toBeInstanceOf(BreachAccountResponse);
-    });
-  });
 });
diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts
index 3f24414bd23..f000f35f126 100644
--- a/libs/common/src/services/api.service.ts
+++ b/libs/common/src/services/api.service.ts
@@ -33,7 +33,6 @@ import {
   OrganizationConnectionConfigApis,
   OrganizationConnectionResponse,
 } from "../admin-console/models/response/organization-connection.response";
-import { OrganizationExportResponse } from "../admin-console/models/response/organization-export.response";
 import { OrganizationSponsorshipSyncStatusResponse } from "../admin-console/models/response/organization-sponsorship-sync-status.response";
 import { PreValidateSponsorshipResponse } from "../admin-console/models/response/pre-validate-sponsorship.response";
 import {
@@ -91,14 +90,10 @@ import {
 } 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";
@@ -114,7 +109,6 @@ import { UpdateAvatarRequest } from "../models/request/update-avatar.request";
 import { UpdateDomainsRequest } from "../models/request/update-domains.request";
 import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request";
 import { VerifyEmailRequest } from "../models/request/verify-email.request";
-import { BreachAccountResponse } from "../models/response/breach-account.response";
 import { DomainsResponse } from "../models/response/domains.response";
 import { ErrorResponse } from "../models/response/error.response";
 import { EventResponse } from "../models/response/event.response";
@@ -296,11 +290,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);
@@ -311,10 +300,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(
@@ -367,10 +352,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);
   }
@@ -431,11 +412,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> {
@@ -1296,6 +1272,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,
@@ -1431,14 +1429,6 @@ export class ApiService implements ApiServiceAbstraction {
     return new UserKeyResponse(r);
   }
 
-  // HIBP APIs
-
-  async getHibpBreach(username: string): Promise<BreachAccountResponse[]> {
-    const encodedUsername = encodeURIComponent(username);
-    const r = await this.send("GET", "/hibp/breach?username=" + encodedUsername, null, true, true);
-    return r.map((a: any) => new BreachAccountResponse(a));
-  }
-
   // Misc
 
   async postBitPayInvoice(request: BitPayInvoiceRequest): Promise<string> {
@@ -1528,17 +1518,6 @@ export class ApiService implements ApiServiceAbstraction {
     }
   }
 
-  async getOrganizationExport(organizationId: string): Promise<OrganizationExportResponse> {
-    const r = await this.send(
-      "GET",
-      "/organizations/" + organizationId + "/export",
-      null,
-      true,
-      true,
-    );
-    return new OrganizationExportResponse(r);
-  }
-
   // Helpers
 
   async getActiveBearerToken(userId: UserId): Promise<string> {
diff --git a/libs/common/src/services/audit.service.spec.ts b/libs/common/src/services/audit.service.spec.ts
index ce594823a7b..b0e96eb5c5c 100644
--- a/libs/common/src/services/audit.service.spec.ts
+++ b/libs/common/src/services/audit.service.spec.ts
@@ -1,4 +1,5 @@
 import { ApiService } from "../abstractions/api.service";
+import { HibpApiService } from "../dirt/services/hibp-api.service";
 import { CryptoFunctionService } from "../key-management/crypto/abstractions/crypto-function.service";
 import { ErrorResponse } from "../models/response/error.response";
 
@@ -17,6 +18,7 @@ describe("AuditService", () => {
   let auditService: AuditService;
   let mockCrypto: jest.Mocked<CryptoFunctionService>;
   let mockApi: jest.Mocked<ApiService>;
+  let mockHibpApi: jest.Mocked<HibpApiService>;
 
   beforeEach(() => {
     mockCrypto = {
@@ -27,10 +29,13 @@ describe("AuditService", () => {
       nativeFetch: jest.fn().mockResolvedValue({
         text: jest.fn().mockResolvedValue(`CDDEEFF:4\nDDEEFF:2\n123456:1`),
       }),
-      getHibpBreach: jest.fn(),
     } as unknown as jest.Mocked<ApiService>;
 
-    auditService = new AuditService(mockCrypto, mockApi, 2);
+    mockHibpApi = {
+      getHibpBreach: jest.fn(),
+    } as unknown as jest.Mocked<HibpApiService>;
+
+    auditService = new AuditService(mockCrypto, mockApi, mockHibpApi, 2);
   });
 
   it("should not exceed max concurrent passwordLeaked requests", async () => {
@@ -69,13 +74,13 @@ describe("AuditService", () => {
   });
 
   it("should return empty array for breachedAccounts on 404", async () => {
-    mockApi.getHibpBreach.mockRejectedValueOnce({ statusCode: 404 } as ErrorResponse);
+    mockHibpApi.getHibpBreach.mockRejectedValueOnce({ statusCode: 404 } as ErrorResponse);
     const result = await auditService.breachedAccounts("user@example.com");
     expect(result).toEqual([]);
   });
 
   it("should throw error for breachedAccounts on non-404 error", async () => {
-    mockApi.getHibpBreach.mockRejectedValueOnce({ statusCode: 500 } as ErrorResponse);
+    mockHibpApi.getHibpBreach.mockRejectedValueOnce({ statusCode: 500 } as ErrorResponse);
     await expect(auditService.breachedAccounts("user@example.com")).rejects.toThrow();
   });
 });
diff --git a/libs/common/src/services/audit.service.ts b/libs/common/src/services/audit.service.ts
index d1eddbbdf82..8fc9f13476d 100644
--- a/libs/common/src/services/audit.service.ts
+++ b/libs/common/src/services/audit.service.ts
@@ -3,8 +3,9 @@ import { mergeMap } from "rxjs/operators";
 
 import { ApiService } from "../abstractions/api.service";
 import { AuditService as AuditServiceAbstraction } from "../abstractions/audit.service";
+import { BreachAccountResponse } from "../dirt/models/response/breach-account.response";
+import { HibpApiService } from "../dirt/services/hibp-api.service";
 import { CryptoFunctionService } from "../key-management/crypto/abstractions/crypto-function.service";
-import { BreachAccountResponse } from "../models/response/breach-account.response";
 import { ErrorResponse } from "../models/response/error.response";
 import { Utils } from "../platform/misc/utils";
 
@@ -20,6 +21,7 @@ export class AuditService implements AuditServiceAbstraction {
   constructor(
     private cryptoFunctionService: CryptoFunctionService,
     private apiService: ApiService,
+    private hibpApiService: HibpApiService,
     private readonly maxConcurrent: number = 100, // default to 100, can be overridden
   ) {
     this.maxConcurrent = maxConcurrent;
@@ -69,7 +71,7 @@ export class AuditService implements AuditServiceAbstraction {
 
   async breachedAccounts(username: string): Promise<BreachAccountResponse[]> {
     try {
-      return await this.apiService.getHibpBreach(username);
+      return await this.hibpApiService.getHibpBreach(username);
     } catch (e) {
       const error = e as ErrorResponse;
       if (error.statusCode === 404) {
@@ -78,4 +80,9 @@ 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/types/guid.spec.ts b/libs/common/src/types/guid.spec.ts
new file mode 100644
index 00000000000..bb0966bcbd6
--- /dev/null
+++ b/libs/common/src/types/guid.spec.ts
@@ -0,0 +1,35 @@
+import { isId, emptyGuid, OrganizationId } from "./guid";
+
+describe("isId tests", () => {
+  it("should return true for a valid guid string", () => {
+    // Example valid GUID
+    const validGuid = "12345678-1234-1234-1234-123456789abc";
+    expect(isId(validGuid)).toBe(true);
+  });
+
+  it("should return false for an invalid guid string", () => {
+    // Example invalid GUID
+    const invalidGuid = "not-a-guid";
+    expect(isId(invalidGuid)).toBe(false);
+  });
+
+  it("should return false for non-string values", () => {
+    expect(isId(undefined)).toBe(false);
+    expect(isId(null)).toBe(false);
+    expect(isId(123)).toBe(false);
+    expect(isId({})).toBe(false);
+    expect(isId([])).toBe(false);
+  });
+
+  it("should return true for the emptyGuid constant if it is a valid guid", () => {
+    expect(isId(emptyGuid)).toBe(true);
+  });
+
+  it("should infer type OrganizationId when using isId<OrganizationId>", () => {
+    const orgId: string = "12345678-1234-1234-1234-123456789abc";
+    if (isId<OrganizationId>(orgId)) {
+      return;
+    }
+    throw new Error("Type guard failed, orgId is not a valid OrganizationId");
+  });
+});
diff --git a/libs/common/src/types/guid.ts b/libs/common/src/types/guid.ts
index 5a6aaf2ce51..f09b87fef87 100644
--- a/libs/common/src/types/guid.ts
+++ b/libs/common/src/types/guid.ts
@@ -1,5 +1,7 @@
 import { Opaque } from "type-fest";
 
+import { isGuid } from "@bitwarden/guid";
+
 export type Guid = Opaque<string, "Guid">;
 
 // Convenience re-export of UserId from it's original location, any library that
@@ -20,8 +22,29 @@ export type OrganizationIntegrationConfigurationId = Opaque<
   string,
   "OrganizationIntegrationConfigurationId"
 >;
+export type OrganizationReportId = Opaque<string, "OrganizationReportId">;
 
 /**
  * A string representation of an empty guid.
  */
 export const emptyGuid = "00000000-0000-0000-0000-000000000000";
+
+/**
+ * Determines if the provided value is a valid GUID string.
+ *
+ * @typeParam SomeGuid - The input type, defaults to `Guid`.
+ * @typeParam Output - The output type, resolves to `SomeGuid` if it is an opaque string, otherwise to `Guid` if `SomeGuid` is a string, or `never`.
+ * @param id - The value to check.
+ * @returns `true` if `id` is a string and a valid GUID, otherwise `false`.
+ */
+export function isId<
+  SomeGuid extends string = Guid,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  Output = SomeGuid extends Opaque<string, infer T>
+    ? SomeGuid
+    : SomeGuid extends string
+      ? Guid
+      : never,
+>(id: unknown): id is Output {
+  return typeof id === "string" && isGuid(id);
+}
diff --git a/libs/common/src/vault/abstractions/cipher-archive.service.ts b/libs/common/src/vault/abstractions/cipher-archive.service.ts
new file mode 100644
index 00000000000..cb6c38ddf67
--- /dev/null
+++ b/libs/common/src/vault/abstractions/cipher-archive.service.ts
@@ -0,0 +1,12 @@
+import { Observable } from "rxjs";
+
+import { CipherId, UserId } from "@bitwarden/common/types/guid";
+import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
+
+export abstract class CipherArchiveService {
+  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>;
+}
diff --git a/libs/common/src/vault/abstractions/cipher-encryption.service.ts b/libs/common/src/vault/abstractions/cipher-encryption.service.ts
index 35becd4b0e7..6057a91bae5 100644
--- a/libs/common/src/vault/abstractions/cipher-encryption.service.ts
+++ b/libs/common/src/vault/abstractions/cipher-encryption.service.ts
@@ -69,14 +69,19 @@ export abstract class CipherEncryptionService {
    */
   abstract decryptManyLegacy(ciphers: Cipher[], userId: UserId): Promise<CipherView[]>;
   /**
-   * Decrypts many ciphers using the SDK for the given userId.
+   * Decrypts many ciphers using the SDK for the given userId, and returns a list of
+   * failures.
    *
    * @param ciphers The encrypted cipher objects
    * @param userId The user ID whose key will be used for decryption
    *
-   * @returns A promise that resolves to an array of decrypted cipher list views
+   * @returns A promise that resolves to a tuple containing an array of decrypted
+   * cipher list views, and an array of ciphers that failed to decrypt.
    */
-  abstract decryptMany(ciphers: Cipher[], userId: UserId): Promise<CipherListView[]>;
+  abstract decryptManyWithFailures(
+    ciphers: Cipher[],
+    userId: UserId,
+  ): Promise<[CipherListView[], Cipher[]]>;
   /**
    * Decrypts an attachment's content from a response object.
    *
diff --git a/libs/common/src/vault/abstractions/premium-upgrade-prompt.service.ts b/libs/common/src/vault/abstractions/premium-upgrade-prompt.service.ts
index 8733baaa471..312ad910e4c 100644
--- a/libs/common/src/vault/abstractions/premium-upgrade-prompt.service.ts
+++ b/libs/common/src/vault/abstractions/premium-upgrade-prompt.service.ts
@@ -1,7 +1,10 @@
+import { Observable } from "rxjs";
+
 /**
  * This interface defines the a contract for a service that prompts the user to upgrade to premium.
  * It ensures that PremiumUpgradePromptService contains a promptForPremium method.
  */
 export abstract class PremiumUpgradePromptService {
   abstract promptForPremium(organizationId?: string): Promise<void>;
+  abstract upgradeConfirmed$?: Observable<boolean>;
 }
diff --git a/libs/common/src/vault/abstractions/search.service.ts b/libs/common/src/vault/abstractions/search.service.ts
index 6b01302613c..233dee9ec75 100644
--- a/libs/common/src/vault/abstractions/search.service.ts
+++ b/libs/common/src/vault/abstractions/search.service.ts
@@ -30,6 +30,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/data/cipher.data.ts b/libs/common/src/vault/models/data/cipher.data.ts
index 7554f23f6a0..4921cce8df2 100644
--- a/libs/common/src/vault/models/data/cipher.data.ts
+++ b/libs/common/src/vault/models/data/cipher.data.ts
@@ -39,7 +39,8 @@ export class CipherData {
   passwordHistory?: PasswordHistoryData[];
   collectionIds?: string[];
   creationDate: string;
-  deletedDate: string | null;
+  deletedDate: string | undefined;
+  archivedDate: string | undefined;
   reprompt: CipherRepromptType;
   key: string;
 
@@ -63,6 +64,7 @@ export class CipherData {
     this.collectionIds = collectionIds != null ? collectionIds : response.collectionIds;
     this.creationDate = response.creationDate;
     this.deletedDate = response.deletedDate;
+    this.archivedDate = response.archivedDate;
     this.reprompt = response.reprompt;
     this.key = response.key;
 
diff --git a/libs/common/src/vault/models/domain/cipher.spec.ts b/libs/common/src/vault/models/domain/cipher.spec.ts
index 8afd6824379..c2cb99740db 100644
--- a/libs/common/src/vault/models/domain/cipher.spec.ts
+++ b/libs/common/src/vault/models/domain/cipher.spec.ts
@@ -60,13 +60,14 @@ describe("Cipher DTO", () => {
       collectionIds: undefined,
       localData: null,
       creationDate: null,
-      deletedDate: null,
+      deletedDate: undefined,
       reprompt: undefined,
       attachments: null,
       fields: null,
       passwordHistory: null,
       key: null,
       permissions: undefined,
+      archivedDate: undefined,
     });
   });
 
@@ -84,7 +85,7 @@ describe("Cipher DTO", () => {
     cipher.name = mockEnc("EncryptedString");
     cipher.notes = mockEnc("EncryptedString");
     cipher.creationDate = new Date("2022-01-01T12:00:00.000Z");
-    cipher.deletedDate = null;
+    cipher.deletedDate = undefined;
     cipher.reprompt = CipherRepromptType.None;
     cipher.key = mockEnc("EncKey");
     cipher.permissions = new CipherPermissionsApi();
@@ -123,7 +124,7 @@ describe("Cipher DTO", () => {
       collectionIds: undefined,
       revisionDate: new Date("2022-01-31T12:00:00.000Z"),
       creationDate: new Date("2022-01-01T12:00:00.000Z"),
-      deletedDate: null,
+      deletedDate: undefined,
       reprompt: 0,
       localData: undefined,
       permissions: new CipherPermissionsApi(),
@@ -149,10 +150,11 @@ describe("Cipher DTO", () => {
         name: "EncryptedString",
         notes: "EncryptedString",
         creationDate: "2022-01-01T12:00:00.000Z",
-        deletedDate: null,
+        deletedDate: undefined,
         permissions: new CipherPermissionsApi(),
         reprompt: CipherRepromptType.None,
         key: "EncryptedString",
+        archivedDate: undefined,
         login: {
           uris: [
             {
@@ -224,10 +226,11 @@ describe("Cipher DTO", () => {
         collectionIds: undefined,
         localData: null,
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
-        deletedDate: null,
+        deletedDate: undefined,
         permissions: new CipherPermissionsApi(),
         reprompt: 0,
         key: { encryptedString: "EncryptedString", encryptionType: 0 },
+        archivedDate: undefined,
         login: {
           passwordRevisionDate: new Date("2022-01-31T12:00:00.000Z"),
           autofillOnPageLoad: false,
@@ -302,10 +305,11 @@ describe("Cipher DTO", () => {
       cipher.name = mockEnc("EncryptedString");
       cipher.notes = mockEnc("EncryptedString");
       cipher.creationDate = new Date("2022-01-01T12:00:00.000Z");
-      cipher.deletedDate = null;
+      cipher.deletedDate = undefined;
       cipher.reprompt = CipherRepromptType.None;
       cipher.key = mockEnc("EncKey");
       cipher.permissions = new CipherPermissionsApi();
+      cipher.archivedDate = undefined;
 
       const loginView = new LoginView();
       loginView.username = "username";
@@ -347,10 +351,11 @@ describe("Cipher DTO", () => {
         collectionIds: undefined,
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
-        deletedDate: null,
+        deletedDate: undefined,
         reprompt: 0,
         localData: undefined,
         permissions: new CipherPermissionsApi(),
+        archivedDate: undefined,
       });
     });
   });
@@ -372,13 +377,14 @@ describe("Cipher DTO", () => {
         name: "EncryptedString",
         notes: "EncryptedString",
         creationDate: "2022-01-01T12:00:00.000Z",
-        deletedDate: null,
+        deletedDate: undefined,
         reprompt: CipherRepromptType.None,
         key: "EncKey",
         secureNote: {
           type: SecureNoteType.Generic,
         },
         permissions: new CipherPermissionsApi(),
+        archivedDate: undefined,
       };
     });
 
@@ -401,7 +407,7 @@ describe("Cipher DTO", () => {
         collectionIds: undefined,
         localData: null,
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
-        deletedDate: null,
+        deletedDate: undefined,
         reprompt: 0,
         secureNote: { type: SecureNoteType.Generic },
         attachments: null,
@@ -409,6 +415,7 @@ describe("Cipher DTO", () => {
         passwordHistory: null,
         key: { encryptedString: "EncKey", encryptionType: 0 },
         permissions: new CipherPermissionsApi(),
+        archivedDate: undefined,
       });
     });
 
@@ -431,12 +438,13 @@ describe("Cipher DTO", () => {
       cipher.name = mockEnc("EncryptedString");
       cipher.notes = mockEnc("EncryptedString");
       cipher.creationDate = new Date("2022-01-01T12:00:00.000Z");
-      cipher.deletedDate = null;
+      cipher.deletedDate = undefined;
       cipher.reprompt = CipherRepromptType.None;
       cipher.secureNote = new SecureNote();
       cipher.secureNote.type = SecureNoteType.Generic;
       cipher.key = mockEnc("EncKey");
       cipher.permissions = new CipherPermissionsApi();
+      cipher.archivedDate = undefined;
 
       const keyService = mock<KeyService>();
       const encryptService = mock<EncryptService>();
@@ -470,10 +478,11 @@ describe("Cipher DTO", () => {
         collectionIds: undefined,
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
-        deletedDate: null,
+        deletedDate: undefined,
         reprompt: 0,
         localData: undefined,
         permissions: new CipherPermissionsApi(),
+        archivedDate: undefined,
       });
     });
   });
@@ -495,7 +504,7 @@ describe("Cipher DTO", () => {
         name: "EncryptedString",
         notes: "EncryptedString",
         creationDate: "2022-01-01T12:00:00.000Z",
-        deletedDate: null,
+        deletedDate: undefined,
         permissions: new CipherPermissionsApi(),
         reprompt: CipherRepromptType.None,
         card: {
@@ -507,6 +516,7 @@ describe("Cipher DTO", () => {
           code: "EncryptedString",
         },
         key: "EncKey",
+        archivedDate: undefined,
       };
     });
 
@@ -529,7 +539,7 @@ describe("Cipher DTO", () => {
         collectionIds: undefined,
         localData: null,
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
-        deletedDate: null,
+        deletedDate: undefined,
         reprompt: 0,
         card: {
           cardholderName: { encryptedString: "EncryptedString", encryptionType: 0 },
@@ -544,6 +554,7 @@ describe("Cipher DTO", () => {
         passwordHistory: null,
         key: { encryptedString: "EncKey", encryptionType: 0 },
         permissions: new CipherPermissionsApi(),
+        archivedDate: undefined,
       });
     });
 
@@ -566,10 +577,11 @@ describe("Cipher DTO", () => {
       cipher.name = mockEnc("EncryptedString");
       cipher.notes = mockEnc("EncryptedString");
       cipher.creationDate = new Date("2022-01-01T12:00:00.000Z");
-      cipher.deletedDate = null;
+      cipher.deletedDate = undefined;
       cipher.reprompt = CipherRepromptType.None;
       cipher.key = mockEnc("EncKey");
       cipher.permissions = new CipherPermissionsApi();
+      cipher.archivedDate = undefined;
 
       const cardView = new CardView();
       cardView.cardholderName = "cardholderName";
@@ -611,10 +623,11 @@ describe("Cipher DTO", () => {
         collectionIds: undefined,
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
-        deletedDate: null,
+        deletedDate: undefined,
         reprompt: 0,
         localData: undefined,
         permissions: new CipherPermissionsApi(),
+        archivedDate: undefined,
       });
     });
   });
@@ -636,10 +649,11 @@ describe("Cipher DTO", () => {
         name: "EncryptedString",
         notes: "EncryptedString",
         creationDate: "2022-01-01T12:00:00.000Z",
-        deletedDate: null,
+        deletedDate: undefined,
         permissions: new CipherPermissionsApi(),
         reprompt: CipherRepromptType.None,
         key: "EncKey",
+        archivedDate: undefined,
         identity: {
           title: "EncryptedString",
           firstName: "EncryptedString",
@@ -682,8 +696,9 @@ describe("Cipher DTO", () => {
         collectionIds: undefined,
         localData: null,
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
-        deletedDate: null,
+        deletedDate: undefined,
         reprompt: 0,
+        archivedDate: undefined,
         identity: {
           title: { encryptedString: "EncryptedString", encryptionType: 0 },
           firstName: { encryptedString: "EncryptedString", encryptionType: 0 },
@@ -731,10 +746,11 @@ describe("Cipher DTO", () => {
       cipher.name = mockEnc("EncryptedString");
       cipher.notes = mockEnc("EncryptedString");
       cipher.creationDate = new Date("2022-01-01T12:00:00.000Z");
-      cipher.deletedDate = null;
+      cipher.deletedDate = undefined;
       cipher.reprompt = CipherRepromptType.None;
       cipher.key = mockEnc("EncKey");
       cipher.permissions = new CipherPermissionsApi();
+      cipher.archivedDate = undefined;
 
       const identityView = new IdentityView();
       identityView.firstName = "firstName";
@@ -776,10 +792,11 @@ describe("Cipher DTO", () => {
         collectionIds: undefined,
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
-        deletedDate: null,
+        deletedDate: undefined,
         reprompt: 0,
         localData: undefined,
         permissions: new CipherPermissionsApi(),
+        archivedDate: undefined,
       });
     });
   });
@@ -793,6 +810,7 @@ describe("Cipher DTO", () => {
 
       const revisionDate = new Date("2022-08-04T01:06:40.441Z");
       const deletedDate = new Date("2022-09-04T01:06:40.441Z");
+      const archivedDate = new Date("2022-10-04T01:06:40.441Z");
       const actual = Cipher.fromJSON({
         name: "myName",
         notes: "myNotes",
@@ -801,6 +819,7 @@ describe("Cipher DTO", () => {
         fields: ["field1", "field2"] as any,
         passwordHistory: ["ph1", "ph2"] as any,
         deletedDate: deletedDate.toISOString(),
+        archivedDate: archivedDate.toISOString(),
       } as Jsonify<Cipher>);
 
       expect(actual).toMatchObject({
@@ -811,6 +830,7 @@ describe("Cipher DTO", () => {
         fields: ["field1_fromJSON", "field2_fromJSON"],
         passwordHistory: ["ph1_fromJSON", "ph2_fromJSON"],
         deletedDate: deletedDate,
+        archivedDate: archivedDate,
       });
       expect(actual).toBeInstanceOf(Cipher);
     });
@@ -862,7 +882,8 @@ describe("Cipher DTO", () => {
         name: "EncryptedString",
         notes: "EncryptedString",
         creationDate: "2022-01-01T12:00:00.000Z",
-        deletedDate: null,
+        deletedDate: undefined,
+        archivedDate: undefined,
         reprompt: CipherRepromptType.None,
         key: "EncryptedString",
         login: {
@@ -1084,6 +1105,7 @@ describe("Cipher DTO", () => {
         ],
         creationDate: "2022-01-01T12:00:00.000Z",
         deletedDate: undefined,
+        archivedDate: undefined,
         revisionDate: "2022-01-31T12:00:00.000Z",
       };
 
@@ -1105,7 +1127,8 @@ describe("Cipher DTO", () => {
         name: "EncryptedString",
         notes: "EncryptedString",
         creationDate: "2022-01-01T12:00:00.000Z",
-        deletedDate: null,
+        deletedDate: undefined,
+        archivedDate: undefined,
         reprompt: CipherRepromptType.None,
         key: "EncryptedString",
         login: {
diff --git a/libs/common/src/vault/models/domain/cipher.ts b/libs/common/src/vault/models/domain/cipher.ts
index 7364930e29c..c4ee35b2b8f 100644
--- a/libs/common/src/vault/models/domain/cipher.ts
+++ b/libs/common/src/vault/models/domain/cipher.ts
@@ -56,7 +56,8 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
   passwordHistory: Password[];
   collectionIds: string[];
   creationDate: Date;
-  deletedDate: Date;
+  deletedDate: Date | undefined;
+  archivedDate: Date | undefined;
   reprompt: CipherRepromptType;
   key: EncString;
 
@@ -94,7 +95,8 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
     this.collectionIds = obj.collectionIds;
     this.localData = localData;
     this.creationDate = obj.creationDate != null ? new Date(obj.creationDate) : null;
-    this.deletedDate = obj.deletedDate != null ? new Date(obj.deletedDate) : null;
+    this.deletedDate = obj.deletedDate != null ? new Date(obj.deletedDate) : undefined;
+    this.archivedDate = obj.archivedDate != null ? new Date(obj.archivedDate) : undefined;
     this.reprompt = obj.reprompt;
 
     switch (this.type) {
@@ -244,10 +246,11 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
     c.type = this.type;
     c.collectionIds = this.collectionIds;
     c.creationDate = this.creationDate != null ? this.creationDate.toISOString() : null;
-    c.deletedDate = this.deletedDate != null ? this.deletedDate.toISOString() : null;
+    c.deletedDate = this.deletedDate != null ? this.deletedDate.toISOString() : undefined;
     c.reprompt = this.reprompt;
     c.key = this.key?.encryptedString;
     c.permissions = this.permissions;
+    c.archivedDate = this.archivedDate != null ? this.archivedDate.toISOString() : undefined;
 
     this.buildDataModel(this, c, {
       name: null,
@@ -296,11 +299,12 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
     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 ? null : new Date(obj.deletedDate);
+    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,
@@ -312,6 +316,7 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
       fields,
       passwordHistory,
       key,
+      archivedDate,
     });
 
     switch (obj.type) {
@@ -344,7 +349,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),
@@ -369,6 +374,7 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
       revisionDate: this.revisionDate?.toISOString(),
       creationDate: this.creationDate?.toISOString(),
       deletedDate: this.deletedDate?.toISOString(),
+      archivedDate: this.archivedDate?.toISOString(),
       reprompt: this.reprompt,
       // Initialize all cipher-type-specific properties as undefined
       login: undefined,
@@ -434,7 +440,8 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
       sdkCipher.passwordHistory?.map((ph) => Password.fromSdkPasswordHistory(ph)) ?? [];
     cipher.creationDate = new Date(sdkCipher.creationDate);
     cipher.revisionDate = new Date(sdkCipher.revisionDate);
-    cipher.deletedDate = sdkCipher.deletedDate ? new Date(sdkCipher.deletedDate) : null;
+    cipher.deletedDate = sdkCipher.deletedDate ? new Date(sdkCipher.deletedDate) : undefined;
+    cipher.archivedDate = sdkCipher.archivedDate ? new Date(sdkCipher.archivedDate) : undefined;
     cipher.reprompt = sdkCipher.reprompt;
 
     // Cipher type specific properties
diff --git a/libs/common/src/vault/models/domain/login.ts b/libs/common/src/vault/models/domain/login.ts
index 723478b10a8..b34fb011254 100644
--- a/libs/common/src/vault/models/domain/login.ts
+++ b/libs/common/src/vault/models/domain/login.ts
@@ -183,7 +183,7 @@ export class Login extends Domain {
       ? new Date(obj.passwordRevisionDate)
       : undefined;
     login.totp = EncString.fromJSON(obj.totp);
-    login.autofillOnPageLoad = obj.autofillOnPageLoad ?? false;
+    login.autofillOnPageLoad = obj.autofillOnPageLoad;
     login.fido2Credentials = obj.fido2Credentials?.map((f) =>
       Fido2Credential.fromSdkFido2Credential(f),
     );
diff --git a/libs/common/src/vault/models/request/cipher-bulk-archive.request.ts b/libs/common/src/vault/models/request/cipher-bulk-archive.request.ts
new file mode 100644
index 00000000000..a75ab632b3a
--- /dev/null
+++ b/libs/common/src/vault/models/request/cipher-bulk-archive.request.ts
@@ -0,0 +1,17 @@
+import { CipherId } from "@bitwarden/common/types/guid";
+
+export class CipherBulkArchiveRequest {
+  ids: CipherId[];
+
+  constructor(ids: CipherId[]) {
+    this.ids = ids == null ? [] : ids;
+  }
+}
+
+export class CipherBulkUnarchiveRequest {
+  ids: CipherId[];
+
+  constructor(ids: CipherId[]) {
+    this.ids = ids == null ? [] : ids;
+  }
+}
diff --git a/libs/common/src/vault/models/request/cipher.request.ts b/libs/common/src/vault/models/request/cipher.request.ts
index 2e3b2efbedc..63776c8aea6 100644
--- a/libs/common/src/vault/models/request/cipher.request.ts
+++ b/libs/common/src/vault/models/request/cipher.request.ts
@@ -35,6 +35,7 @@ export class CipherRequest {
   attachments: { [id: string]: string };
   attachments2: { [id: string]: AttachmentRequest };
   lastKnownRevisionDate: Date;
+  archivedDate: Date | null;
   reprompt: CipherRepromptType;
   key: string;
 
@@ -47,6 +48,7 @@ export class CipherRequest {
     this.notes = cipher.notes ? cipher.notes.encryptedString : null;
     this.favorite = cipher.favorite;
     this.lastKnownRevisionDate = cipher.revisionDate;
+    this.archivedDate = cipher.archivedDate;
     this.reprompt = cipher.reprompt;
     this.key = cipher.key?.encryptedString;
 
diff --git a/libs/common/src/vault/models/response/change-password-uri.response.ts b/libs/common/src/vault/models/response/change-password-uri.response.ts
new file mode 100644
index 00000000000..1ff3424a269
--- /dev/null
+++ b/libs/common/src/vault/models/response/change-password-uri.response.ts
@@ -0,0 +1,10 @@
+import { BaseResponse } from "../../../models/response/base.response";
+
+export class ChangePasswordUriResponse extends BaseResponse {
+  uri: string | null;
+
+  constructor(response: any) {
+    super(response);
+    this.uri = this.getResponseProperty("uri");
+  }
+}
diff --git a/libs/common/src/vault/models/response/cipher.response.ts b/libs/common/src/vault/models/response/cipher.response.ts
index d4c907ae2b0..bf01e0f08de 100644
--- a/libs/common/src/vault/models/response/cipher.response.ts
+++ b/libs/common/src/vault/models/response/cipher.response.ts
@@ -38,6 +38,7 @@ export class CipherResponse extends BaseResponse {
   collectionIds: string[];
   creationDate: string;
   deletedDate: string;
+  archivedDate: string;
   reprompt: CipherRepromptType;
   key: string;
 
@@ -62,6 +63,7 @@ export class CipherResponse extends BaseResponse {
     this.collectionIds = this.getResponseProperty("CollectionIds");
     this.creationDate = this.getResponseProperty("CreationDate");
     this.deletedDate = this.getResponseProperty("DeletedDate");
+    this.archivedDate = this.getResponseProperty("ArchivedDate");
 
     const login = this.getResponseProperty("Login");
     if (login != null) {
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 5dbdfdbbef2..e9614db6858 100644
--- a/libs/common/src/vault/models/view/cipher.view.spec.ts
+++ b/libs/common/src/vault/models/view/cipher.view.spec.ts
@@ -163,6 +163,7 @@ describe("CipherView", () => {
         creationDate: "2022-01-01T12:00:00.000Z",
         revisionDate: "2022-01-02T12:00:00.000Z",
         deletedDate: undefined,
+        archivedDate: undefined,
       };
     });
 
diff --git a/libs/common/src/vault/models/view/cipher.view.ts b/libs/common/src/vault/models/view/cipher.view.ts
index 015d2585850..b9f717b3a7f 100644
--- a/libs/common/src/vault/models/view/cipher.view.ts
+++ b/libs/common/src/vault/models/view/cipher.view.ts
@@ -49,7 +49,8 @@ export class CipherView implements View, InitializerMetadata {
   collectionIds: string[] = null;
   revisionDate: Date = null;
   creationDate: Date = null;
-  deletedDate: Date = null;
+  deletedDate: Date | null = null;
+  archivedDate: Date | null = null;
   reprompt: CipherRepromptType = CipherRepromptType.None;
   // We need a copy of the encrypted key so we can pass it to
   // the SdkCipherView during encryption
@@ -79,6 +80,7 @@ export class CipherView implements View, InitializerMetadata {
     this.revisionDate = c.revisionDate;
     this.creationDate = c.creationDate;
     this.deletedDate = c.deletedDate;
+    this.archivedDate = c.archivedDate;
     // Old locally stored ciphers might have reprompt == null. If so set it to None.
     this.reprompt = c.reprompt ?? CipherRepromptType.None;
     this.key = c.key;
@@ -143,6 +145,10 @@ export class CipherView implements View, InitializerMetadata {
     return this.deletedDate != null;
   }
 
+  get isArchived(): boolean {
+    return this.archivedDate != null;
+  }
+
   get linkedFieldOptions() {
     return this.item?.linkedFieldOptions;
   }
@@ -197,6 +203,7 @@ export class CipherView implements View, InitializerMetadata {
     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));
@@ -217,6 +224,7 @@ export class CipherView implements View, InitializerMetadata {
       creationDate: creationDate,
       revisionDate: revisionDate,
       deletedDate: deletedDate,
+      archivedDate: archivedDate,
       attachments: attachments,
       fields: fields,
       passwordHistory: passwordHistory,
@@ -277,6 +285,7 @@ export class CipherView implements View, InitializerMetadata {
     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.reprompt = obj.reprompt ?? CipherRepromptType.None;
     cipherView.key = EncString.fromJSON(obj.key);
 
@@ -316,11 +325,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()),
@@ -330,6 +339,7 @@ export class CipherView implements View, InitializerMetadata {
       revisionDate: (this.revisionDate ?? new Date()).toISOString(),
       creationDate: (this.creationDate ?? new Date()).toISOString(),
       deletedDate: this.deletedDate?.toISOString(),
+      archivedDate: this.archivedDate?.toISOString(),
       reprompt: this.reprompt ?? CipherRepromptType.None,
       key: this.key?.toSdk(),
       // Cipher type specific properties are set in the switch statement below
diff --git a/libs/common/src/vault/services/cipher.service.spec.ts b/libs/common/src/vault/services/cipher.service.spec.ts
index 2088f50d1cc..d8e98c75d40 100644
--- a/libs/common/src/vault/services/cipher.service.spec.ts
+++ b/libs/common/src/vault/services/cipher.service.spec.ts
@@ -8,6 +8,7 @@ import { CipherResponse } from "@bitwarden/common/vault/models/response/cipher.r
 // eslint-disable-next-line no-restricted-imports
 import { CipherDecryptionKeys, KeyService } from "@bitwarden/key-management";
 import { MessageSender } from "@bitwarden/messaging";
+import { CipherListView } from "@bitwarden/sdk-internal";
 
 import { FakeAccountService, mockAccountServiceWith } from "../../../spec/fake-account-service";
 import { FakeStateProvider } from "../../../spec/fake-state-provider";
@@ -67,6 +68,7 @@ const cipherData: CipherData = {
   deletedDate: null,
   permissions: new CipherPermissionsApi(),
   key: "EncKey",
+  archivedDate: null,
   reprompt: CipherRepromptType.None,
   login: {
     uris: [
@@ -117,6 +119,12 @@ describe("Cipher Service", () => {
     encryptService.encryptFileData.mockReturnValue(Promise.resolve(ENCRYPTED_BYTES));
     encryptService.encryptString.mockReturnValue(Promise.resolve(new EncString(ENCRYPTED_TEXT)));
 
+    // Mock i18nService collator
+    i18nService.collator = {
+      compare: jest.fn().mockImplementation((a: string, b: string) => a.localeCompare(b)),
+      resolvedOptions: jest.fn().mockReturnValue({}),
+    } as any;
+
     (window as any).bitwardenContainerService = new ContainerService(keyService, encryptService);
 
     cipherService = new CipherService(
@@ -733,4 +741,80 @@ describe("Cipher Service", () => {
       );
     });
   });
+
+  describe("decryptCiphers", () => {
+    let mockCiphers: Cipher[];
+    const cipher1_id = "11111111-1111-1111-1111-111111111111";
+    const cipher2_id = "22222222-2222-2222-2222-222222222222";
+
+    beforeEach(() => {
+      const originalUserKey = new SymmetricCryptoKey(new Uint8Array(32)) as UserKey;
+      const orgKey = new SymmetricCryptoKey(new Uint8Array(32)) as OrgKey;
+      const keys = {
+        userKey: originalUserKey,
+        orgKeys: { [orgId]: orgKey },
+      } as CipherDecryptionKeys;
+      keyService.cipherDecryptionKeys$.mockReturnValue(of(keys));
+
+      mockCiphers = [
+        new Cipher({ ...cipherData, id: cipher1_id }),
+        new Cipher({ ...cipherData, id: cipher2_id }),
+      ];
+
+      //// Mock the SDK response
+      cipherEncryptionService.decryptManyWithFailures.mockResolvedValue([
+        [{ id: mockCiphers[0].id, name: "Success 1" } as unknown as CipherListView],
+        [mockCiphers[1]], // Mock failed cipher
+      ]);
+    });
+
+    it("should use the SDK for decryption when SDK feature flag is enabled", async () => {
+      configService.getFeatureFlag
+        .calledWith(FeatureFlag.PM19941MigrateCipherDomainToSdk)
+        .mockResolvedValue(true);
+
+      // Set up expected results
+      const expectedSuccessCipherViews = [
+        { id: mockCiphers[0].id, name: "Success 1" } as unknown as CipherListView,
+      ];
+
+      const expectedFailedCipher = new CipherView(mockCiphers[1]);
+      expectedFailedCipher.name = "[error: cannot decrypt]";
+      expectedFailedCipher.decryptionFailure = true;
+      const expectedFailedCipherViews = [expectedFailedCipher];
+
+      // Execute
+      const [successes, failures] = await (cipherService as any).decryptCiphers(
+        mockCiphers,
+        userId,
+      );
+
+      // Verify the SDK was used for decryption
+      expect(cipherEncryptionService.decryptManyWithFailures).toHaveBeenCalledWith(
+        mockCiphers,
+        userId,
+      );
+
+      expect(successes).toEqual(expectedSuccessCipherViews);
+      expect(failures).toEqual(expectedFailedCipherViews);
+    });
+
+    it("should use legacy decryption when SDK feature flag is disabled", async () => {
+      configService.getFeatureFlag
+        .calledWith(FeatureFlag.PM19941MigrateCipherDomainToSdk)
+        .mockResolvedValue(false);
+
+      // Execute
+      const [successes, failures] = await (cipherService as any).decryptCiphers(
+        mockCiphers,
+        userId,
+      );
+
+      // Verify the SDK was not used for decryption
+      expect(cipherEncryptionService.decryptManyWithFailures).toHaveBeenCalledTimes(0);
+
+      expect(successes).toHaveLength(2);
+      expect(failures).toHaveLength(0);
+    });
+  });
 });
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index f885a511585..86da7ca1c4f 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -158,11 +158,9 @@ export class CipherService implements CipherServiceAbstraction {
             ),
           ),
           switchMap(async (ciphers) => {
-            // TODO: remove this once failed decrypted ciphers are handled in the SDK
-            await this.setFailedDecryptedCiphers([], userId);
-            return this.cipherEncryptionService
-              .decryptMany(ciphers, userId)
-              .then((ciphers) => ciphers.sort(this.getLocaleSortingFunction()));
+            const [decrypted, failures] = await this.decryptCiphersWithSdk(ciphers, userId);
+            await this.setFailedDecryptedCiphers(failures, userId);
+            return decrypted.sort(this.getLocaleSortingFunction());
           }),
         );
       }),
@@ -288,6 +286,7 @@ export class CipherService implements CipherServiceAbstraction {
     cipher.collectionIds = model.collectionIds;
     cipher.creationDate = model.creationDate;
     cipher.revisionDate = model.revisionDate;
+    cipher.archivedDate = model.archivedDate;
     cipher.reprompt = model.reprompt;
     cipher.edit = model.edit;
 
@@ -489,14 +488,14 @@ export class CipherService implements CipherServiceAbstraction {
   ): Promise<[CipherView[], CipherView[]] | null> {
     if (await this.configService.getFeatureFlag(FeatureFlag.PM19941MigrateCipherDomainToSdk)) {
       const decryptStartTime = performance.now();
-      const decrypted = await this.decryptCiphersWithSdk(ciphers, userId);
+
+      const result = await this.decryptCiphersWithSdk(ciphers, userId);
 
       this.logService.measure(decryptStartTime, "Vault", "CipherService", "decrypt complete", [
         ["Items", ciphers.length],
       ]);
 
-      // With SDK, failed ciphers are not returned
-      return [decrypted, []];
+      return result;
     }
 
     const keys = await firstValueFrom(this.keyService.cipherDecryptionKeys$(userId));
@@ -645,6 +644,10 @@ export class CipherService implements CipherServiceAbstraction {
     );
     defaultMatch ??= await firstValueFrom(this.domainSettingsService.defaultUriMatchStrategy$);
 
+    const archiveFeatureEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.PM19148_InnovationArchive,
+    );
+
     return ciphers.filter((cipher) => {
       const type = CipherViewLikeUtils.getType(cipher);
       const login = CipherViewLikeUtils.getLogin(cipher);
@@ -654,6 +657,10 @@ export class CipherService implements CipherServiceAbstraction {
         return false;
       }
 
+      if (archiveFeatureEnabled && CipherViewLikeUtils.isArchived(cipher)) {
+        return false;
+      }
+
       if (Array.isArray(includeOtherTypes) && includeOtherTypes.includes(type) && !cipherIsLogin) {
         return true;
       }
@@ -677,8 +684,16 @@ export class CipherService implements CipherServiceAbstraction {
     userId: UserId,
   ): Promise<CipherView[]> {
     const ciphers = await this.getAllDecrypted(userId);
+    const archiveFeatureEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.PM19148_InnovationArchive,
+    );
     return ciphers
-      .filter((cipher) => cipher.deletedDate == null && type.includes(cipher.type))
+      .filter(
+        (cipher) =>
+          cipher.deletedDate == null &&
+          (!archiveFeatureEnabled || !cipher.isArchived) &&
+          type.includes(cipher.type),
+      )
       .sort((a, b) => this.sortCiphersByLastUsedThenName(a, b));
   }
 
@@ -2043,10 +2058,23 @@ export class CipherService implements CipherServiceAbstraction {
    * @returns The decrypted ciphers.
    * @private
    */
-  private async decryptCiphersWithSdk(ciphers: Cipher[], userId: UserId): Promise<CipherView[]> {
-    const decryptedViews = await this.cipherEncryptionService.decryptManyLegacy(ciphers, userId);
+  private async decryptCiphersWithSdk(
+    ciphers: Cipher[],
+    userId: UserId,
+  ): Promise<[CipherView[], CipherView[]]> {
+    const [decrypted, failures] = await this.cipherEncryptionService.decryptManyWithFailures(
+      ciphers,
+      userId,
+    );
+    const decryptedViews = await Promise.all(decrypted.map((c) => this.getFullCipherView(c)));
+    const failedViews = failures.map((c) => {
+      const cipher_view = new CipherView(c);
+      cipher_view.name = "[error: cannot decrypt]";
+      cipher_view.decryptionFailure = true;
+      return cipher_view;
+    });
 
-    return decryptedViews.sort(this.getLocaleSortingFunction());
+    return [decryptedViews.sort(this.getLocaleSortingFunction()), failedViews];
   }
 
   /** Fetches the full `CipherView` when a `CipherListView` is passed. */
diff --git a/libs/common/src/vault/services/default-cipher-archive.service.spec.ts b/libs/common/src/vault/services/default-cipher-archive.service.spec.ts
new file mode 100644
index 00000000000..972b04d2c4e
--- /dev/null
+++ b/libs/common/src/vault/services/default-cipher-archive.service.spec.ts
@@ -0,0 +1,236 @@
+import { mock } from "jest-mock-extended";
+import { of, firstValueFrom } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.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, UserId } from "@bitwarden/common/types/guid";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import {
+  CipherBulkArchiveRequest,
+  CipherBulkUnarchiveRequest,
+} from "@bitwarden/common/vault/models/request/cipher-bulk-archive.request";
+import { CipherListView } from "@bitwarden/sdk-internal";
+
+import { DefaultCipherArchiveService } from "./default-cipher-archive.service";
+
+describe("DefaultCipherArchiveService", () => {
+  let service: DefaultCipherArchiveService;
+  let mockCipherService: jest.Mocked<CipherService>;
+  let mockApiService: jest.Mocked<ApiService>;
+  let mockBillingAccountProfileStateService: jest.Mocked<BillingAccountProfileStateService>;
+  let mockConfigService: jest.Mocked<ConfigService>;
+
+  const userId = "user-id" as UserId;
+  const cipherId = "123" as CipherId;
+
+  beforeEach(() => {
+    mockCipherService = mock<CipherService>();
+    mockApiService = mock<ApiService>();
+    mockBillingAccountProfileStateService = mock<BillingAccountProfileStateService>();
+    mockConfigService = mock<ConfigService>();
+
+    service = new DefaultCipherArchiveService(
+      mockCipherService,
+      mockApiService,
+      mockBillingAccountProfileStateService,
+      mockConfigService,
+    );
+  });
+
+  describe("archivedCiphers$", () => {
+    it("should return only archived ciphers", async () => {
+      const mockCiphers: CipherListView[] = [
+        {
+          id: "1",
+          archivedDate: "2024-01-15T10:30:00.000Z",
+          type: "identity",
+        } as unknown as CipherListView,
+        {
+          id: "2",
+          type: "secureNote",
+        } as unknown as CipherListView,
+        {
+          id: "3",
+          archivedDate: "2024-01-15T10:30:00.000Z",
+          deletedDate: "2024-01-16T10:30:00.000Z",
+          type: "sshKey",
+        } as unknown as CipherListView,
+      ];
+
+      mockCipherService.cipherListViews$.mockReturnValue(of(mockCiphers));
+
+      const result = await firstValueFrom(service.archivedCiphers$(userId));
+
+      expect(result).toHaveLength(1);
+      expect(result[0].id).toEqual("1");
+    });
+
+    it("should return empty array when no archived ciphers exist", async () => {
+      const mockCiphers: CipherListView[] = [
+        {
+          id: "1",
+          type: "identity",
+        } as unknown as CipherListView,
+      ];
+
+      mockCipherService.cipherListViews$.mockReturnValue(of(mockCiphers));
+
+      const result = await firstValueFrom(service.archivedCiphers$(userId));
+
+      expect(result).toHaveLength(0);
+    });
+  });
+
+  describe("userCanArchive$", () => {
+    it("should return true when user has premium and feature flag is enabled", async () => {
+      mockBillingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(true));
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+
+      const result = await firstValueFrom(service.userCanArchive$(userId));
+
+      expect(result).toBe(true);
+      expect(mockBillingAccountProfileStateService.hasPremiumFromAnySource$).toHaveBeenCalledWith(
+        userId,
+      );
+      expect(mockConfigService.getFeatureFlag$).toHaveBeenCalledWith(
+        FeatureFlag.PM19148_InnovationArchive,
+      );
+    });
+
+    it("should return false when feature flag is disabled", async () => {
+      mockBillingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(false));
+
+      const result = await firstValueFrom(service.userCanArchive$(userId));
+
+      expect(result).toBe(false);
+    });
+  });
+
+  describe("archiveWithServer", () => {
+    const mockResponse = {
+      data: [
+        {
+          id: cipherId,
+          archivedDate: "2024-01-15T10:30:00.000Z",
+          revisionDate: "2024-01-15T10:31:00.000Z",
+        },
+      ],
+    };
+
+    beforeEach(() => {
+      mockApiService.send.mockResolvedValue(mockResponse);
+      mockCipherService.ciphers$.mockReturnValue(
+        of({
+          [cipherId]: {
+            id: cipherId,
+            revisionDate: "2024-01-15T10:00:00.000Z",
+          } as any,
+        }),
+      );
+      mockCipherService.replace.mockResolvedValue(undefined);
+    });
+
+    it("should archive single cipher", async () => {
+      await service.archiveWithServer(cipherId, userId);
+
+      expect(mockApiService.send).toHaveBeenCalledWith(
+        "PUT",
+        "/ciphers/archive",
+        expect.any(CipherBulkArchiveRequest),
+        true,
+        true,
+      );
+      expect(mockCipherService.ciphers$).toHaveBeenCalledWith(userId);
+      expect(mockCipherService.replace).toHaveBeenCalledWith(
+        expect.objectContaining({
+          [cipherId]: expect.objectContaining({
+            archivedDate: "2024-01-15T10:30:00.000Z",
+            revisionDate: "2024-01-15T10:31:00.000Z",
+          }),
+        }),
+        userId,
+      );
+    });
+
+    it("should archive multiple ciphers", async () => {
+      const cipherIds = [cipherId, "cipher-id-2" as CipherId];
+
+      await service.archiveWithServer(cipherIds, userId);
+
+      expect(mockApiService.send).toHaveBeenCalledWith(
+        "PUT",
+        "/ciphers/archive",
+        expect.objectContaining({
+          ids: cipherIds,
+        }),
+        true,
+        true,
+      );
+    });
+  });
+
+  describe("unarchiveWithServer", () => {
+    const mockResponse = {
+      data: [
+        {
+          id: cipherId,
+          revisionDate: "2024-01-15T10:31:00.000Z",
+        },
+      ],
+    };
+
+    beforeEach(() => {
+      mockApiService.send.mockResolvedValue(mockResponse);
+      mockCipherService.ciphers$.mockReturnValue(
+        of({
+          [cipherId]: {
+            id: cipherId,
+            archivedDate: "2024-01-15T10:30:00.000Z",
+            revisionDate: "2024-01-15T10:00:00.000Z",
+          } as any,
+        }),
+      );
+      mockCipherService.replace.mockResolvedValue(undefined);
+    });
+
+    it("should unarchive single cipher", async () => {
+      await service.unarchiveWithServer(cipherId, userId);
+
+      expect(mockApiService.send).toHaveBeenCalledWith(
+        "PUT",
+        "/ciphers/unarchive",
+        expect.any(CipherBulkUnarchiveRequest),
+        true,
+        true,
+      );
+      expect(mockCipherService.ciphers$).toHaveBeenCalledWith(userId);
+      expect(mockCipherService.replace).toHaveBeenCalledWith(
+        expect.objectContaining({
+          [cipherId]: expect.objectContaining({
+            revisionDate: "2024-01-15T10:31:00.000Z",
+          }),
+        }),
+        userId,
+      );
+    });
+
+    it("should unarchive multiple ciphers", async () => {
+      const cipherIds = [cipherId, "cipher-id-2" as CipherId];
+
+      await service.unarchiveWithServer(cipherIds, userId);
+
+      expect(mockApiService.send).toHaveBeenCalledWith(
+        "PUT",
+        "/ciphers/unarchive",
+        expect.objectContaining({
+          ids: cipherIds,
+        }),
+        true,
+        true,
+      );
+    });
+  });
+});
diff --git a/libs/common/src/vault/services/default-cipher-archive.service.ts b/libs/common/src/vault/services/default-cipher-archive.service.ts
new file mode 100644
index 00000000000..5c627d687b2
--- /dev/null
+++ b/libs/common/src/vault/services/default-cipher-archive.service.ts
@@ -0,0 +1,122 @@
+import { filter, map, Observable, shareReplay, combineLatest, firstValueFrom } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+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 { CipherId, UserId } from "@bitwarden/common/types/guid";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import {
+  CipherBulkArchiveRequest,
+  CipherBulkUnarchiveRequest,
+} from "@bitwarden/common/vault/models/request/cipher-bulk-archive.request";
+import { CipherResponse } from "@bitwarden/common/vault/models/response/cipher.response";
+import {
+  CipherViewLike,
+  CipherViewLikeUtils,
+} from "@bitwarden/common/vault/utils/cipher-view-like-utils";
+
+import { CipherArchiveService } from "../abstractions/cipher-archive.service";
+
+export class DefaultCipherArchiveService implements CipherArchiveService {
+  constructor(
+    private cipherService: CipherService,
+    private apiService: ApiService,
+    private billingAccountProfileStateService: BillingAccountProfileStateService,
+    private configService: ConfigService,
+  ) {}
+
+  /**
+   * Observable that contains the list of ciphers that have been archived.
+   */
+  archivedCiphers$(userId: UserId): Observable<CipherViewLike[]> {
+    return this.cipherService.cipherListViews$(userId).pipe(
+      filter((cipher) => cipher != null),
+      map((ciphers) =>
+        ciphers.filter(
+          (cipher) =>
+            CipherViewLikeUtils.isArchived(cipher) && !CipherViewLikeUtils.isDeleted(cipher),
+        ),
+      ),
+    );
+  }
+
+  /**
+   * User can archive items if:
+   * Feature Flag is enabled
+   * User has premium from any source (personal or organization)
+   */
+  userCanArchive$(userId: UserId): Observable<boolean> {
+    return combineLatest([
+      this.billingAccountProfileStateService.hasPremiumFromAnySource$(userId),
+      this.configService.getFeatureFlag$(FeatureFlag.PM19148_InnovationArchive),
+    ]).pipe(
+      map(([hasPremium, archiveFlagEnabled]) => hasPremium && archiveFlagEnabled),
+      shareReplay({ refCount: true, bufferSize: 1 }),
+    );
+  }
+
+  /**
+   * User can access the archive vault if:
+   * Feature Flag is enabled
+   * There is at least one archived item
+   * ///////////// NOTE /////////////
+   * This is separated from userCanArchive because a user that loses premium status, but has archived items,
+   * should still be able to access their archive vault. The items will be read-only, and can be restored.
+   */
+  showArchiveVault$(userId: UserId): Observable<boolean> {
+    return combineLatest([
+      this.configService.getFeatureFlag$(FeatureFlag.PM19148_InnovationArchive),
+      this.archivedCiphers$(userId),
+    ]).pipe(
+      map(
+        ([archiveFlagEnabled, hasArchivedItems]) =>
+          archiveFlagEnabled && hasArchivedItems.length > 0,
+      ),
+      shareReplay({ refCount: true, bufferSize: 1 }),
+    );
+  }
+
+  async archiveWithServer(ids: CipherId | CipherId[], userId: UserId): Promise<void> {
+    const request = new CipherBulkArchiveRequest(Array.isArray(ids) ? ids : [ids]);
+    const r = await this.apiService.send("PUT", "/ciphers/archive", request, true, true);
+    const response = new ListResponse(r, CipherResponse);
+
+    const currentCiphers = await firstValueFrom(this.cipherService.ciphers$(userId));
+
+    for (const cipher of response.data) {
+      const localCipher = currentCiphers[cipher.id as CipherId];
+
+      if (localCipher == null) {
+        continue;
+      }
+
+      localCipher.archivedDate = cipher.archivedDate;
+      localCipher.revisionDate = cipher.revisionDate;
+    }
+
+    await this.cipherService.replace(currentCiphers, userId);
+  }
+
+  async unarchiveWithServer(ids: CipherId | CipherId[], userId: UserId): Promise<void> {
+    const request = new CipherBulkUnarchiveRequest(Array.isArray(ids) ? ids : [ids]);
+    const r = await this.apiService.send("PUT", "/ciphers/unarchive", request, true, true);
+    const response = new ListResponse(r, CipherResponse);
+
+    const currentCiphers = await firstValueFrom(this.cipherService.ciphers$(userId));
+
+    for (const cipher of response.data) {
+      const localCipher = currentCiphers[cipher.id as CipherId];
+
+      if (localCipher == null) {
+        continue;
+      }
+
+      localCipher.archivedDate = cipher.archivedDate;
+      localCipher.revisionDate = cipher.revisionDate;
+    }
+
+    await this.cipherService.replace(currentCiphers, userId);
+  }
+}
diff --git a/libs/common/src/vault/services/default-cipher-encryption.service.spec.ts b/libs/common/src/vault/services/default-cipher-encryption.service.spec.ts
index 12e5b0b4626..6d6341bd1fa 100644
--- a/libs/common/src/vault/services/default-cipher-encryption.service.spec.ts
+++ b/libs/common/src/vault/services/default-cipher-encryption.service.spec.ts
@@ -48,7 +48,8 @@ const cipherData: CipherData = {
   name: "EncryptedString",
   notes: "EncryptedString",
   creationDate: "2022-01-01T12:00:00.000Z",
-  deletedDate: null,
+  deletedDate: undefined,
+  archivedDate: undefined,
   permissions: new CipherPermissionsApi(),
   key: "EncKey",
   reprompt: CipherRepromptType.None,
@@ -98,6 +99,7 @@ describe("DefaultCipherEncryptionService", () => {
         set_fido2_credentials: jest.fn(),
         decrypt: jest.fn(),
         decrypt_list: jest.fn(),
+        decrypt_list_with_failures: jest.fn(),
         decrypt_fido2_credentials: jest.fn(),
         move_to_organization: jest.fn(),
       }),
@@ -514,36 +516,40 @@ describe("DefaultCipherEncryptionService", () => {
     });
   });
 
-  describe("decryptMany", () => {
-    it("should decrypt multiple ciphers to list views", async () => {
-      const ciphers = [new Cipher(cipherData), new Cipher(cipherData)];
-
-      const expectedListViews = [
-        { id: "list1" as any, name: "List 1" } as CipherListView,
-        { id: "list2" as any, name: "List 2" } as CipherListView,
+  describe("decryptManyWithFailures", () => {
+    const cipher1_id = "11111111-1111-1111-1111-111111111111";
+    const cipher2_id = "22222222-2222-2222-2222-222222222222";
+    it("should decrypt multiple ciphers and return successes and failures", async () => {
+      const ciphers = [
+        new Cipher({ ...cipherData, id: cipher1_id as CipherId }),
+        new Cipher({ ...cipherData, id: cipher2_id as CipherId }),
       ];
 
-      mockSdkClient.vault().ciphers().decrypt_list.mockReturnValue(expectedListViews);
+      const successCipherList = {
+        id: cipher1_id,
+        name: "Decrypted Cipher 1",
+      } as unknown as CipherListView;
+      const failedCipher = { id: cipher2_id, name: "Failed Cipher" } as unknown as SdkCipher;
 
-      const result = await cipherEncryptionService.decryptMany(ciphers, userId);
+      const expectedFailedCiphers = [Cipher.fromSdkCipher(failedCipher)];
 
-      expect(result).toEqual(expectedListViews);
-      expect(mockSdkClient.vault().ciphers().decrypt_list).toHaveBeenCalledWith(
+      const mockResult = {
+        successes: [successCipherList],
+        failures: [failedCipher],
+      };
+
+      mockSdkClient.vault().ciphers().decrypt_list_with_failures.mockReturnValue(mockResult);
+
+      const result = await cipherEncryptionService.decryptManyWithFailures(ciphers, userId);
+
+      expect(result).toEqual([[successCipherList], expectedFailedCiphers]);
+      expect(mockSdkClient.vault().ciphers().decrypt_list_with_failures).toHaveBeenCalledWith(
         expect.arrayContaining([
-          expect.objectContaining({ id: cipherData.id }),
-          expect.objectContaining({ id: cipherData.id }),
+          expect.objectContaining({ id: cipher1_id }),
+          expect.objectContaining({ id: cipher2_id }),
         ]),
       );
-    });
-
-    it("should throw EmptyError when SDK is not available", async () => {
-      sdkService.userClient$ = jest.fn().mockReturnValue(of(null)) as any;
-
-      await expect(cipherEncryptionService.decryptMany([cipherObj], userId)).rejects.toThrow();
-
-      expect(logService.error).toHaveBeenCalledWith(
-        expect.stringContaining("Failed to decrypt cipher list"),
-      );
+      expect(Cipher.fromSdkCipher).toHaveBeenCalledWith(failedCipher);
     });
   });
 
diff --git a/libs/common/src/vault/services/default-cipher-encryption.service.ts b/libs/common/src/vault/services/default-cipher-encryption.service.ts
index b7026fd4cfc..3f03e0f5e9e 100644
--- a/libs/common/src/vault/services/default-cipher-encryption.service.ts
+++ b/libs/common/src/vault/services/default-cipher-encryption.service.ts
@@ -6,6 +6,7 @@ import {
   CipherListView,
   BitwardenClient,
   CipherView as SdkCipherView,
+  DecryptCipherListResult,
 } from "@bitwarden/sdk-internal";
 
 import { LogService } from "../../platform/abstractions/log.service";
@@ -218,7 +219,10 @@ export class DefaultCipherEncryptionService implements CipherEncryptionService {
     );
   }
 
-  async decryptMany(ciphers: Cipher[], userId: UserId): Promise<CipherListView[]> {
+  async decryptManyWithFailures(
+    ciphers: Cipher[],
+    userId: UserId,
+  ): Promise<[CipherListView[], Cipher[]]> {
     return firstValueFrom(
       this.sdkService.userClient$(userId).pipe(
         map((sdk) => {
@@ -228,14 +232,17 @@ export class DefaultCipherEncryptionService implements CipherEncryptionService {
 
           using ref = sdk.take();
 
-          return ref.value
+          const result: DecryptCipherListResult = ref.value
             .vault()
             .ciphers()
-            .decrypt_list(ciphers.map((cipher) => cipher.toSdkCipher()));
-        }),
-        catchError((error: unknown) => {
-          this.logService.error(`Failed to decrypt cipher list: ${error}`);
-          return EMPTY;
+            .decrypt_list_with_failures(ciphers.map((cipher) => cipher.toSdkCipher()));
+
+          const decryptedCiphers = result.successes;
+          const failedCiphers: Cipher[] = result.failures
+            .map((cipher) => Cipher.fromSdkCipher(cipher))
+            .filter((cipher): cipher is Cipher => cipher !== undefined);
+
+          return [decryptedCiphers, failedCiphers];
         }),
       ),
     );
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 f412de08046..3ae68d47c5c 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
@@ -52,12 +52,7 @@ describe("RestrictedItemTypesService", () => {
     organizationService.organizations$.mockReturnValue(of([org1, org2]));
     policyService.policiesByType$.mockReturnValue(of([]));
 
-    service = new RestrictedItemTypesService(
-      configService,
-      accountService,
-      organizationService,
-      policyService,
-    );
+    service = new RestrictedItemTypesService(accountService, organizationService, policyService);
   });
 
   it("emits empty array when feature flag is disabled", async () => {
diff --git a/libs/common/src/vault/services/restricted-item-types.service.ts b/libs/common/src/vault/services/restricted-item-types.service.ts
index 206bc9e2cb7..9e0c0c78510 100644
--- a/libs/common/src/vault/services/restricted-item-types.service.ts
+++ b/libs/common/src/vault/services/restricted-item-types.service.ts
@@ -6,8 +6,6 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getOptionalUserId } 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 { CipherType } from "@bitwarden/common/vault/enums";
 
 import { uuidAsString } from "../../platform/abstractions/sdk/sdk.service";
@@ -25,51 +23,43 @@ export class RestrictedItemTypesService {
    * - cipherType: each type restricted by at least one org-level policy
    * - allowViewOrgIds: org IDs that allow viewing that type
    */
-  readonly restricted$: Observable<RestrictedCipherType[]> = this.configService
-    .getFeatureFlag$(FeatureFlag.RemoveCardItemTypePolicy)
-    .pipe(
-      switchMap((flagOn) => {
-        if (!flagOn) {
-          return of([]);
+  readonly restricted$: Observable<RestrictedCipherType[]> =
+    this.accountService.activeAccount$.pipe(
+      getOptionalUserId,
+      switchMap((userId) => {
+        if (userId == null) {
+          return of([]); // No user logged in, no restrictions
         }
-        return this.accountService.activeAccount$.pipe(
-          getOptionalUserId,
-          switchMap((userId) => {
-            if (userId == null) {
-              return of([]); // No user logged in, no restrictions
-            }
-            return combineLatest([
-              this.organizationService.organizations$(userId),
-              this.policyService.policiesByType$(PolicyType.RestrictedItemTypes, userId),
-            ]).pipe(
-              map(([orgs, enabledPolicies]) => {
-                // Helper to extract restricted types, defaulting to [Card]
-                const restrictedTypes = (p: (typeof enabledPolicies)[number]) =>
-                  (p.data as CipherType[]) ?? [CipherType.Card];
+        return combineLatest([
+          this.organizationService.organizations$(userId),
+          this.policyService.policiesByType$(PolicyType.RestrictedItemTypes, userId),
+        ]).pipe(
+          map(([orgs, enabledPolicies]) => {
+            // Helper to extract restricted types, defaulting to [Card]
+            const restrictedTypes = (p: (typeof enabledPolicies)[number]) =>
+              (p.data as CipherType[]) ?? [CipherType.Card];
 
-                // Union across all enabled policies
-                const allRestrictedTypes = Array.from(
-                  new Set(enabledPolicies.flatMap(restrictedTypes)),
-                );
-
-                return allRestrictedTypes.map((cipherType) => {
-                  // Determine which orgs allow viewing this type
-                  const allowViewOrgIds = orgs
-                    .filter((org) => {
-                      const orgPolicy = enabledPolicies.find((p) => p.organizationId === org.id);
-                      // no policy for this org => allows everything
-                      if (!orgPolicy) {
-                        return true;
-                      }
-                      // if this type not in their restricted list => they allow it
-                      return !restrictedTypes(orgPolicy).includes(cipherType);
-                    })
-                    .map((org) => org.id);
-
-                  return { cipherType, allowViewOrgIds };
-                });
-              }),
+            // Union across all enabled policies
+            const allRestrictedTypes = Array.from(
+              new Set(enabledPolicies.flatMap(restrictedTypes)),
             );
+
+            return allRestrictedTypes.map((cipherType) => {
+              // Determine which orgs allow viewing this type
+              const allowViewOrgIds = orgs
+                .filter((org) => {
+                  const orgPolicy = enabledPolicies.find((p) => p.organizationId === org.id);
+                  // no policy for this org => allows everything
+                  if (!orgPolicy) {
+                    return true;
+                  }
+                  // if this type not in their restricted list => they allow it
+                  return !restrictedTypes(orgPolicy).includes(cipherType);
+                })
+                .map((org) => org.id);
+
+              return { cipherType, allowViewOrgIds };
+            });
           }),
         );
       }),
@@ -78,7 +68,6 @@ export class RestrictedItemTypesService {
     );
 
   constructor(
-    private configService: ConfigService,
     private accountService: AccountService,
     private organizationService: OrganizationService,
     private policyService: PolicyService,
diff --git a/libs/common/src/vault/services/search.service.ts b/libs/common/src/vault/services/search.service.ts
index cbd89cf1ab1..80fddda42d5 100644
--- a/libs/common/src/vault/services/search.service.ts
+++ b/libs/common/src/vault/services/search.service.ts
@@ -296,12 +296,20 @@ export class SearchService implements SearchServiceAbstraction {
     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;
       }
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 0df44e67f1b..70122ebd27b 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
@@ -110,6 +110,32 @@ describe("CipherViewLikeUtils", () => {
     });
   });
 
+  describe("isArchived", () => {
+    it("returns true when the cipher is archived", () => {
+      const cipherListView = {
+        id: "1",
+        archivedDate: "2024-02-02",
+        type: "identity",
+      } as unknown as CipherListView;
+      const cipherView = createCipherView();
+      cipherView.archivedDate = new Date();
+
+      expect(CipherViewLikeUtils.isArchived(cipherListView)).toBe(true);
+      expect(CipherViewLikeUtils.isArchived(cipherView)).toBe(true);
+    });
+
+    it("returns false when the cipher is not archived", () => {
+      const cipherListView = {
+        id: "2",
+        type: "identity",
+      } as unknown as CipherListView;
+      const cipherView = createCipherView();
+
+      expect(CipherViewLikeUtils.isArchived(cipherListView)).toBe(false);
+      expect(CipherViewLikeUtils.isArchived(cipherView)).toBe(false);
+    });
+  });
+
   describe("isDeleted", () => {
     it("returns true when the cipher is deleted", () => {
       const cipherListView = { deletedDate: "2024-02-02", type: "identity" } as CipherListView;
diff --git a/libs/common/src/vault/utils/cipher-view-like-utils.ts b/libs/common/src/vault/utils/cipher-view-like-utils.ts
index 5cb4a7a084e..04adb8d4832 100644
--- a/libs/common/src/vault/utils/cipher-view-like-utils.ts
+++ b/libs/common/src/vault/utils/cipher-view-like-utils.ts
@@ -71,6 +71,15 @@ export class CipherViewLikeUtils {
     return cipher.type === CipherType.Card ? cipher.card : null;
   };
 
+  /**  @returns `true` when the cipher has been archived, `false` otherwise. */
+  static isArchived = (cipher: CipherViewLike): boolean => {
+    if (this.isCipherListView(cipher)) {
+      return !!cipher.archivedDate;
+    }
+
+    return cipher.isArchived;
+  };
+
   /**  @returns `true` when the cipher has been deleted, `false` otherwise. */
   static isDeleted = (cipher: CipherViewLike): boolean => {
     if (this.isCipherListView(cipher)) {
diff --git a/libs/components/project.json b/libs/components/project.json
new file mode 100644
index 00000000000..8201c4ea36d
--- /dev/null
+++ b/libs/components/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/components",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/components/src",
+  "projectType": "library",
+  "tags": ["scope:components", "type:lib"],
+  "targets": {
+    "build": {
+      "executor": "nx:run-script",
+      "dependsOn": [],
+      "options": {
+        "script": "build"
+      }
+    },
+    "build:watch": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "watch"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/components/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    },
+    "test:watch": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test:watch"
+      }
+    }
+  }
+}
diff --git a/libs/components/src/anon-layout/anon-layout.component.html b/libs/components/src/anon-layout/anon-layout.component.html
index 4be11b607c6..c66647c482d 100644
--- a/libs/components/src/anon-layout/anon-layout.component.html
+++ b/libs/components/src/anon-layout/anon-layout.component.html
@@ -14,7 +14,12 @@
   </a>
 
   <div class="tw-text-center tw-mb-4 sm:tw-mb-6 tw-mx-auto" [ngClass]="maxWidthClass">
-    <div *ngIf="!hideIcon()" class="tw-w-24 sm:tw-w-28 md:tw-w-32 tw-mx-auto">
+    <!-- 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()"
+      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>
     </div>
 
diff --git a/libs/components/src/async-actions/in-forms.stories.ts b/libs/components/src/async-actions/in-forms.stories.ts
index 88383fe85a3..af5034c49d5 100644
--- a/libs/components/src/async-actions/in-forms.stories.ts
+++ b/libs/components/src/async-actions/in-forms.stories.ts
@@ -148,6 +148,7 @@ export default {
               required: "required",
               inputRequired: "Input is required.",
               inputEmail: "Input is not an email-address.",
+              loading: "Loading",
             });
           },
         },
diff --git a/libs/components/src/async-actions/standalone.stories.ts b/libs/components/src/async-actions/standalone.stories.ts
index 99cde70566b..150bdb8813b 100644
--- a/libs/components/src/async-actions/standalone.stories.ts
+++ b/libs/components/src/async-actions/standalone.stories.ts
@@ -3,11 +3,13 @@ import { action } from "@storybook/addon-actions";
 import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 import { delay, of } from "rxjs";
 
+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 { ButtonModule } from "../button";
 import { IconButtonModule } from "../icon-button";
+import { I18nMockService } from "../utils";
 
 import { AsyncActionsModule } from "./async-actions.module";
 import { BitActionDirective } from "./bit-action.directive";
@@ -103,6 +105,14 @@ export default {
             error: action("LogService.error"),
           } as Partial<LogService>,
         },
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              loading: "Loading",
+            });
+          },
+        },
       ],
     }),
   ],
diff --git a/libs/components/src/avatar/avatar.component.ts b/libs/components/src/avatar/avatar.component.ts
index 6f83c9ca101..8ece033c73d 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";
 
@@ -22,12 +21,34 @@ const SizeClasses: Record<SizeTypes, string[]> = {
 */
 @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='Roboto,"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 +56,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 +100,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 +112,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/banner/banner.component.spec.ts b/libs/components/src/banner/banner.component.spec.ts
index edfbe8c8be9..1c4378a5aee 100644
--- a/libs/components/src/banner/banner.component.spec.ts
+++ b/libs/components/src/banner/banner.component.spec.ts
@@ -19,6 +19,7 @@ describe("BannerComponent", () => {
           useFactory: () =>
             new I18nMockService({
               close: "Close",
+              loading: "Loading",
             }),
         },
       ],
diff --git a/libs/components/src/banner/banner.component.ts b/libs/components/src/banner/banner.component.ts
index a9c837fb044..632bccae953 100644
--- a/libs/components/src/banner/banner.component.ts
+++ b/libs/components/src/banner/banner.component.ts
@@ -27,6 +27,11 @@ const defaultIcon: Record<BannerType, string> = {
   selector: "bit-banner",
   templateUrl: "./banner.component.html",
   imports: [CommonModule, 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",
+  },
 })
 export class BannerComponent implements OnInit {
   readonly bannerType = input<BannerType>("info");
diff --git a/libs/components/src/banner/banner.stories.ts b/libs/components/src/banner/banner.stories.ts
index a7649a28228..458f453bf1a 100644
--- a/libs/components/src/banner/banner.stories.ts
+++ b/libs/components/src/banner/banner.stories.ts
@@ -22,6 +22,7 @@ export default {
           useFactory: () => {
             return new I18nMockService({
               close: "Close",
+              loading: "Loading",
             });
           },
         },
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
index 893f645a913..989b72adbd5 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
+++ b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
@@ -35,6 +35,7 @@ export default {
           useFactory: () => {
             return new I18nMockService({
               moreBreadcrumbs: "More breadcrumbs",
+              loading: "Loading",
             });
           },
         },
diff --git a/libs/components/src/button/button.component.html b/libs/components/src/button/button.component.html
index a07ab9fb99b..26e0c3b4d3d 100644
--- a/libs/components/src/button/button.component.html
+++ b/libs/components/src/button/button.component.html
@@ -2,10 +2,9 @@
   <span [ngClass]="{ 'tw-invisible': showLoadingStyle() }">
     <ng-content></ng-content>
   </span>
-  <span
-    class="tw-absolute tw-inset-0 tw-flex tw-items-center tw-justify-center"
-    [ngClass]="{ 'tw-invisible': !showLoadingStyle() }"
-  >
-    <i class="bwi bwi-spinner bwi-lg bwi-spin" aria-hidden="true"></i>
-  </span>
+  @if (showLoadingStyle()) {
+    <span class="tw-absolute tw-inset-0 tw-flex tw-items-center tw-justify-center">
+      <bit-spinner size="fill" noColor></bit-spinner>
+    </span>
+  }
 </span>
diff --git a/libs/components/src/button/button.component.ts b/libs/components/src/button/button.component.ts
index 1dce792c963..47612685c16 100644
--- a/libs/components/src/button/button.component.ts
+++ b/libs/components/src/button/button.component.ts
@@ -14,6 +14,7 @@ import { debounce, interval } from "rxjs";
 
 import { AriaDisableDirective } from "../a11y";
 import { ButtonLikeAbstraction, ButtonType, ButtonSize } from "../shared/button-like.abstraction";
+import { SpinnerComponent } from "../spinner";
 import { ariaDisableElement } from "../utils";
 
 const focusRing = [
@@ -60,7 +61,7 @@ const buttonStyles: Record<ButtonType, string[]> = {
   selector: "button[bitButton], a[bitButton]",
   templateUrl: "button.component.html",
   providers: [{ provide: ButtonLikeAbstraction, useExisting: ButtonComponent }],
-  imports: [NgClass],
+  imports: [NgClass, SpinnerComponent],
   hostDirectives: [AriaDisableDirective],
 })
 export class ButtonComponent implements ButtonLikeAbstraction {
diff --git a/libs/components/src/button/button.stories.ts b/libs/components/src/button/button.stories.ts
index 180f5cb4aa9..7319b47bce5 100644
--- a/libs/components/src/button/button.stories.ts
+++ b/libs/components/src/button/button.stories.ts
@@ -1,12 +1,28 @@
-import { Meta, StoryObj } from "@storybook/angular";
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
+import { I18nMockService } from "../utils/i18n-mock.service";
 
 import { ButtonComponent } from "./button.component";
 
 export default {
   title: "Component Library/Button",
   component: ButtonComponent,
+  decorators: [
+    moduleMetadata({
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () =>
+            new I18nMockService({
+              loading: "Loading",
+            }),
+        },
+      ],
+    }),
+  ],
   args: {
     disabled: false,
     loading: false,
diff --git a/libs/components/src/callout/callout.component.html b/libs/components/src/callout/callout.component.html
index b98679766d5..e0fe0a182ea 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-semibold">
+        {{ 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..62321a34d91 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>> = {
@@ -55,13 +56,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/copy-click/copy-click.directive.ts b/libs/components/src/copy-click/copy-click.directive.ts
index 6b30a66c511..3eb075a2b5c 100644
--- a/libs/components/src/copy-click/copy-click.directive.ts
+++ b/libs/components/src/copy-click/copy-click.directive.ts
@@ -1,11 +1,11 @@
 import {
   Directive,
   HostListener,
-  Input,
   InjectionToken,
   Inject,
   Optional,
   input,
+  computed,
 } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -26,8 +26,19 @@ export const COPY_CLICK_LISTENER = new InjectionToken<CopyClickListener>("CopyCl
   selector: "[appCopyClick]",
 })
 export class CopyClickDirective {
-  private _showToast = false;
-  private toastVariant: ToastVariant = "success";
+  private _showToast = computed(() => {
+    return this.showToast() !== undefined;
+  });
+
+  private toastVariant = computed(() => {
+    const showToast = this.showToast();
+    // When the `showToast` is set without a value, an empty string will be passed
+    if (showToast === "" || showToast === undefined) {
+      return "success";
+    } else {
+      return showToast;
+    }
+  });
 
   constructor(
     private platformUtilsService: PlatformUtilsService,
@@ -57,17 +68,7 @@ export class CopyClickDirective {
    *  <app-component [appCopyClick]="value to copy" showToast="info"/></app-component>
    * ```
    */
-  // TODO: Skipped for signal migration because:
-  //  Accessor inputs cannot be migrated as they are too complex.
-  @Input() set showToast(value: ToastVariant | "") {
-    // When the `showToast` is set without a value, an empty string will be passed
-    if (value === "") {
-      this._showToast = true;
-    } else {
-      this._showToast = true;
-      this.toastVariant = value;
-    }
-  }
+  showToast = input<ToastVariant | "">();
 
   @HostListener("click") onClick() {
     const valueToCopy = this.valueToCopy();
@@ -77,14 +78,14 @@ export class CopyClickDirective {
       this.copyListener.onCopy(valueToCopy);
     }
 
-    if (this._showToast) {
+    if (this._showToast()) {
       const valueLabel = this.valueLabel();
       const message = valueLabel
         ? this.i18nService.t("valueCopied", valueLabel)
         : this.i18nService.t("copySuccessful");
 
       this.toastService.showToast({
-        variant: this.toastVariant,
+        variant: this.toastVariant(),
         message,
       });
     }
diff --git a/libs/components/src/copy-click/copy-click.stories.ts b/libs/components/src/copy-click/copy-click.stories.ts
new file mode 100644
index 00000000000..208d42b44c4
--- /dev/null
+++ b/libs/components/src/copy-click/copy-click.stories.ts
@@ -0,0 +1,143 @@
+import { provideNoopAnimations } from "@angular/platform-browser/animations";
+import { applicationConfig, moduleMetadata, StoryObj } from "@storybook/angular";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+
+import { FormFieldModule } from "../form-field";
+import { IconButtonModule } from "../icon-button";
+import { InputModule } from "../input";
+import { ToastModule } from "../toast";
+import { I18nMockService } from "../utils";
+
+import { CopyClickDirective } from "./copy-click.directive";
+
+export default {
+  title: "Component Library/Copy Click Directive",
+  component: CopyClickDirective,
+  decorators: [
+    moduleMetadata({
+      imports: [ToastModule, FormFieldModule, InputModule, IconButtonModule],
+    }),
+    applicationConfig({
+      providers: [
+        ToastModule.forRoot().providers!,
+        {
+          provide: PlatformUtilsService,
+          useValue: {
+            // eslint-disable-next-line
+            copyToClipboard: (text: string) => console.log(`"${text}" copied to clipboard`),
+          },
+        },
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              valueCopied: (text) => `${text} copied`,
+              copySuccessful: "Copy Successful",
+              success: "Success",
+              close: "Close",
+              info: "Info",
+              loading: "Loading",
+            });
+          },
+        },
+        provideNoopAnimations(),
+      ],
+    }),
+  ],
+};
+
+type Story = StoryObj<CopyClickDirective>;
+
+export const Default: Story = {
+  render: (args) => ({
+    props: {
+      value: "testValue123",
+      ...args,
+    },
+    template: /*html*/ `
+      <bit-form-field>
+        <bit-label>API Key</bit-label>
+        <input bitInput disabled [value]="value" />
+        <button
+          type="button"
+          bitSuffix
+          bitIconButton="bwi-clone"
+          [label]="'Copy'"
+          [appCopyClick]="value"
+        ></button>
+      </bit-form-field>
+    `,
+  }),
+};
+
+export const WithDefaultToast: Story = {
+  render: (args) => ({
+    props: {
+      value: "testValue123",
+      ...args,
+    },
+    template: /*html*/ `
+      <bit-form-field>
+        <bit-label>API Key</bit-label>
+        <input bitInput disabled [value]="value" />
+        <button
+          type="button"
+          bitSuffix
+          bitIconButton="bwi-clone"
+          [label]="'Copy'"
+          [appCopyClick]="value"
+          showToast
+        ></button>
+      </bit-form-field>
+    `,
+  }),
+};
+
+export const WithCustomToastVariant: Story = {
+  render: (args) => ({
+    props: {
+      value: "testValue123",
+      ...args,
+    },
+    template: /*html*/ `
+      <bit-form-field>
+        <bit-label>API Key</bit-label>
+        <input bitInput disabled [value]="value" />
+        <button
+          type="button"
+          bitSuffix
+          bitIconButton="bwi-clone"
+          [label]="'Copy'"
+          [appCopyClick]="value"
+          showToast="info"
+        ></button>
+      </bit-form-field>
+    `,
+  }),
+};
+
+export const WithCustomValueLabel: Story = {
+  render: (args) => ({
+    props: {
+      value: "testValue123",
+      ...args,
+    },
+    template: /*html*/ `
+      <bit-form-field>
+        <bit-label>API Key</bit-label>
+        <input bitInput disabled [value]="value" />
+        <button
+          type="button"
+          bitSuffix
+          bitIconButton="bwi-clone"
+          [label]="'Copy'"
+          [appCopyClick]="value"
+          showToast
+          valueLabel="API Key"
+        ></button>
+      </bit-form-field>
+    `,
+  }),
+};
diff --git a/libs/components/src/dialog/dialog.service.stories.ts b/libs/components/src/dialog/dialog.service.stories.ts
index 5a002f7ee7e..caa7a86a2a8 100644
--- a/libs/components/src/dialog/dialog.service.stories.ts
+++ b/libs/components/src/dialog/dialog.service.stories.ts
@@ -155,6 +155,7 @@ export default {
               toggleSideNavigation: "Toggle side navigation",
               yes: "Yes",
               no: "No",
+              loading: "Loading",
             });
           },
         },
diff --git a/libs/components/src/dialog/dialog/dialog.component.html b/libs/components/src/dialog/dialog/dialog.component.html
index 9f140ca7624..030879deabd 100644
--- a/libs/components/src/dialog/dialog/dialog.component.html
+++ b/libs/components/src/dialog/dialog/dialog.component.html
@@ -20,7 +20,7 @@
       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"
     >
       {{ title() }}
       @if (subtitle(); as subtitleText) {
@@ -52,7 +52,7 @@
   >
     @if (loading()) {
       <div class="tw-absolute tw-flex tw-size-full tw-items-center tw-justify-center">
-        <i class="bwi bwi-spinner bwi-spin bwi-lg" [attr.aria-label]="'loading' | i18n"></i>
+        <bit-spinner></bit-spinner>
       </div>
     }
     <div
@@ -65,9 +65,10 @@
       }"
     >
       <ng-content select="[bitDialogContent]"></ng-content>
+      <div #scrollBottom></div>
     </div>
   </div>
-
+  @let isScrollable = isScrollable$ | async;
   @let showFooterBorder =
     (!bodyHasScrolledFrom().top && isScrollable) || bodyHasScrolledFrom().bottom;
   <footer
diff --git a/libs/components/src/dialog/dialog/dialog.component.ts b/libs/components/src/dialog/dialog/dialog.component.ts
index e10d78046dd..2c634ef16e7 100644
--- a/libs/components/src/dialog/dialog/dialog.component.ts
+++ b/libs/components/src/dialog/dialog/dialog.component.ts
@@ -8,13 +8,18 @@ import {
   viewChild,
   input,
   booleanAttribute,
-  AfterViewInit,
+  ElementRef,
+  DestroyRef,
 } from "@angular/core";
+import { toObservable } from "@angular/core/rxjs-interop";
+import { combineLatest, switchMap } from "rxjs";
 
 import { I18nPipe } from "@bitwarden/ui-common";
 
 import { BitIconButtonComponent } from "../../icon-button/icon-button.component";
+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";
@@ -37,13 +42,25 @@ import { DialogTitleContainerDirective } from "../directives/dialog-title-contai
     I18nPipe,
     CdkTrapFocus,
     CdkScrollable,
+    SpinnerComponent,
   ],
 })
-export class DialogComponent implements AfterViewInit {
-  protected dialogRef = inject(DialogRef, { optional: true });
+export class DialogComponent {
+  private readonly destroyRef = inject(DestroyRef);
   private scrollableBody = viewChild.required(CdkScrollable);
+  private scrollBottom = viewChild.required<ElementRef<HTMLDivElement>>("scrollBottom");
+
+  protected dialogRef = inject(DialogRef, { optional: true });
   protected bodyHasScrolledFrom = hasScrolledFrom(this.scrollableBody);
-  protected isScrollable = false;
+
+  private scrollableBody$ = toObservable(this.scrollableBody);
+  private scrollBottom$ = toObservable(this.scrollBottom);
+
+  protected isScrollable$ = combineLatest([this.scrollableBody$, this.scrollBottom$]).pipe(
+    switchMap(([body, bottom]) =>
+      hasScrollableContent$(body.getElementRef().nativeElement, bottom.nativeElement),
+    ),
+  );
 
   /** Background color */
   readonly background = input<"default" | "alt">("default");
@@ -105,13 +122,4 @@ export class DialogComponent implements AfterViewInit {
       }
     }
   }
-
-  ngAfterViewInit() {
-    this.isScrollable = this.canScroll();
-  }
-
-  canScroll(): boolean {
-    const el = this.scrollableBody().getElementRef().nativeElement as HTMLElement;
-    return el.scrollHeight > el.clientHeight;
-  }
 }
diff --git a/libs/components/src/dialog/dialog/dialog.stories.ts b/libs/components/src/dialog/dialog/dialog.stories.ts
index f93ef1a2f25..d645d32764d 100644
--- a/libs/components/src/dialog/dialog/dialog.stories.ts
+++ b/libs/components/src/dialog/dialog/dialog.stories.ts
@@ -125,7 +125,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",
   },
 };
 
diff --git a/libs/components/src/dialog/simple-dialog/simple-dialog.stories.ts b/libs/components/src/dialog/simple-dialog/simple-dialog.stories.ts
index a344a01ee2c..3a178892908 100644
--- a/libs/components/src/dialog/simple-dialog/simple-dialog.stories.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-dialog.stories.ts
@@ -1,7 +1,10 @@
 import { NoopAnimationsModule } from "@angular/platform-browser/animations";
 import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
 
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
 import { ButtonModule } from "../../button";
+import { I18nMockService } from "../../utils";
 import { DialogModule } from "../dialog.module";
 
 import { SimpleDialogComponent } from "./simple-dialog.component";
@@ -12,6 +15,16 @@ export default {
   decorators: [
     moduleMetadata({
       imports: [ButtonModule, NoopAnimationsModule, DialogModule],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              loading: "Loading",
+            });
+          },
+        },
+      ],
     }),
   ],
   parameters: {
diff --git a/libs/components/src/disclosure/disclosure.stories.ts b/libs/components/src/disclosure/disclosure.stories.ts
index 2e45964ccaa..3ed6903060c 100644
--- a/libs/components/src/disclosure/disclosure.stories.ts
+++ b/libs/components/src/disclosure/disclosure.stories.ts
@@ -1,6 +1,9 @@
 import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
 
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
 import { IconButtonModule } from "../icon-button";
+import { I18nMockService } from "../utils";
 
 import { DisclosureTriggerForDirective } from "./disclosure-trigger-for.directive";
 import { DisclosureComponent } from "./disclosure.component";
@@ -11,6 +14,16 @@ export default {
   decorators: [
     moduleMetadata({
       imports: [DisclosureTriggerForDirective, DisclosureComponent, IconButtonModule],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              loading: "Loading",
+            });
+          },
+        },
+      ],
     }),
   ],
   parameters: {
diff --git a/libs/components/src/drawer/drawer.stories.ts b/libs/components/src/drawer/drawer.stories.ts
index 1d7aa79137d..727d16b5481 100644
--- a/libs/components/src/drawer/drawer.stories.ts
+++ b/libs/components/src/drawer/drawer.stories.ts
@@ -41,6 +41,7 @@ export default {
             return new I18nMockService({
               ...mockLayoutI18n,
               close: "Close",
+              loading: "Loading",
             });
           },
         },
diff --git a/libs/components/src/form-field/form-field.component.html b/libs/components/src/form-field/form-field.component.html
index ae3bad40698..c2c92104727 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',
diff --git a/libs/components/src/form-field/form-field.stories.ts b/libs/components/src/form-field/form-field.stories.ts
index 7aeb2f63040..01aa56f896c 100644
--- a/libs/components/src/form-field/form-field.stories.ts
+++ b/libs/components/src/form-field/form-field.stories.ts
@@ -63,6 +63,7 @@ export default {
               inputRequired: "Input is required.",
               inputEmail: "Input is not an email-address.",
               toggleVisibility: "Toggle visibility",
+              loading: "Loading",
             });
           },
         },
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 72f2481d789..2b82fad9876 100644
--- a/libs/components/src/form-field/password-input-toggle.spec.ts
+++ b/libs/components/src/form-field/password-input-toggle.spec.ts
@@ -48,6 +48,7 @@ describe("PasswordInputToggle", () => {
           provide: I18nService,
           useValue: new I18nMockService({
             toggleVisibility: "Toggle visibility",
+            loading: "Loading",
           }),
         },
       ],
diff --git a/libs/components/src/form-field/password-input-toggle.stories.ts b/libs/components/src/form-field/password-input-toggle.stories.ts
index 3d50a4eb75a..1fcc899ddba 100644
--- a/libs/components/src/form-field/password-input-toggle.stories.ts
+++ b/libs/components/src/form-field/password-input-toggle.stories.ts
@@ -19,7 +19,10 @@ export default {
       providers: [
         {
           provide: I18nService,
-          useValue: new I18nMockService({ toggleVisibility: "Toggle visibility" }),
+          useValue: new I18nMockService({
+            toggleVisibility: "Toggle visibility",
+            loading: "Loading",
+          }),
         },
       ],
     }),
diff --git a/libs/components/src/icon-button/icon-button.component.html b/libs/components/src/icon-button/icon-button.component.html
index e775a868871..b5826ce9928 100644
--- a/libs/components/src/icon-button/icon-button.component.html
+++ b/libs/components/src/icon-button/icon-button.component.html
@@ -6,10 +6,6 @@
     class="tw-absolute tw-inset-0 tw-flex tw-items-center tw-justify-center"
     [ngClass]="{ 'tw-invisible': !showLoadingStyle() }"
   >
-    <i
-      class="bwi bwi-spinner bwi-spin"
-      aria-hidden="true"
-      [ngClass]="{ 'bwi-lg': size() === 'default' }"
-    ></i>
+    <bit-spinner size="fill" noColor></bit-spinner>
   </span>
 </span>
diff --git a/libs/components/src/icon-button/icon-button.component.ts b/libs/components/src/icon-button/icon-button.component.ts
index 4130cf27170..d712d5cb2b8 100644
--- a/libs/components/src/icon-button/icon-button.component.ts
+++ b/libs/components/src/icon-button/icon-button.component.ts
@@ -16,6 +16,7 @@ import { AriaDisableDirective } from "../a11y";
 import { setA11yTitleAndAriaLabel } from "../a11y/set-a11y-title-and-aria-label";
 import { ButtonLikeAbstraction } from "../shared/button-like.abstraction";
 import { FocusableElement } from "../shared/focusable-element";
+import { SpinnerComponent } from "../spinner";
 import { ariaDisableElement } from "../utils";
 
 export type IconButtonType = "primary" | "danger" | "contrast" | "main" | "muted" | "nav-contrast";
@@ -87,7 +88,7 @@ const sizes: Record<IconButtonSize, string[]> = {
     { provide: ButtonLikeAbstraction, useExisting: BitIconButtonComponent },
     { provide: FocusableElement, useExisting: BitIconButtonComponent },
   ],
-  imports: [NgClass],
+  imports: [NgClass, SpinnerComponent],
   host: {
     /**
      * When the `bitIconButton` input is dynamic from a consumer, Angular doesn't put the
@@ -129,7 +130,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",
+            ]
           : [],
       );
   }
diff --git a/libs/components/src/icon-button/icon-button.stories.ts b/libs/components/src/icon-button/icon-button.stories.ts
index d716b9697f2..c93beb167bd 100644
--- a/libs/components/src/icon-button/icon-button.stories.ts
+++ b/libs/components/src/icon-button/icon-button.stories.ts
@@ -1,12 +1,29 @@
-import { Meta, StoryObj } from "@storybook/angular";
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
+import { I18nMockService } from "../utils";
 
 import { BitIconButtonComponent } from "./icon-button.component";
 
 export default {
   title: "Component Library/Icon Button",
   component: BitIconButtonComponent,
+  decorators: [
+    moduleMetadata({
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              loading: "Loading",
+            });
+          },
+        },
+      ],
+    }),
+  ],
   args: {
     bitIconButton: "bwi-plus",
     label: "Your button label here",
diff --git a/libs/components/src/icon/icon.component.ts b/libs/components/src/icon/icon.component.ts
index 49f284b947c..1ef7185c88b 100644
--- a/libs/components/src/icon/icon.component.ts
+++ b/libs/components/src/icon/icon.component.ts
@@ -9,6 +9,7 @@ import { Icon, isIcon } from "@bitwarden/assets/svg";
     "[attr.aria-hidden]": "!ariaLabel()",
     "[attr.aria-label]": "ariaLabel()",
     "[innerHtml]": "innerHtml",
+    class: "tw-max-h-full tw-flex tw-justify-center",
   },
   template: ``,
 })
diff --git a/libs/components/src/icon/icon.stories.ts b/libs/components/src/icon/icon.stories.ts
index e355c3e6e75..e94a7aaf51c 100644
--- a/libs/components/src/icon/icon.stories.ts
+++ b/libs/components/src/icon/icon.stories.ts
@@ -37,7 +37,7 @@ export const Default = {
         <div class="tw-size-56 tw-border tw-border-secondary-300 tw-rounded-md">
           <div class="tw-text-xs tw-text-center">{{icon[0]}}</div>
           <div class="tw-size-52 tw-w-full tw-content-center">
-            <bit-icon [icon]="icon[1]" class="tw-flex tw-justify-center tw-max-h-full"></bit-icon>
+            <bit-icon [icon]="icon[1]"></bit-icon>
           </div>
         </div>
       }
diff --git a/libs/components/src/item/item.stories.ts b/libs/components/src/item/item.stories.ts
index bc2ced7fd11..36bbebee940 100644
--- a/libs/components/src/item/item.stories.ts
+++ b/libs/components/src/item/item.stories.ts
@@ -44,6 +44,7 @@ export default {
               skipToContent: "Skip to content",
               submenu: "submenu",
               toggleCollapse: "toggle collapse",
+              loading: "Loading",
             });
           },
         },
diff --git a/libs/components/src/layout/layout.component.html b/libs/components/src/layout/layout.component.html
index f31d2901b00..35c6f04911c 100644
--- a/libs/components/src/layout/layout.component.html
+++ b/libs/components/src/layout/layout.component.html
@@ -23,30 +23,27 @@
       [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-6 md:tw-ms-0 tw-ms-16"
+      class="tw-overflow-auto tw-max-h-screen tw-min-w-0 tw-flex-1 tw-bg-background tw-p-8 tw-pt-6"
     >
+      <!-- ^ If updating this padding, also update the padding correction in bit-banner! ^ -->
       <ng-content></ng-content>
-
-      <!-- overlay backdrop for side-nav -->
-      @if (
-        {
-          open: sideNavService.open$ | async,
-        };
-        as data
-      ) {
-        <div
-          class="tw-pointer-events-none tw-fixed tw-inset-0 tw-z-10 tw-bg-black tw-bg-opacity-0 motion-safe:tw-transition-colors md:tw-hidden"
-          [ngClass]="[data.open ? 'tw-bg-opacity-30 md:tw-bg-opacity-0' : 'tw-bg-opacity-0']"
-        >
-          @if (data.open) {
-            <div
-              (click)="sideNavService.toggle()"
-              class="tw-pointer-events-auto tw-size-full"
-            ></div>
-          }
-        </div>
-      }
     </main>
+    <!-- overlay backdrop for side-nav -->
+    @if (
+      {
+        open: sideNavService.open$ | async,
+      };
+      as data
+    ) {
+      <div
+        class="tw-pointer-events-none tw-fixed tw-inset-0 tw-z-10 tw-bg-black tw-bg-opacity-0 motion-safe:tw-transition-colors md:tw-hidden"
+        [ngClass]="[data.open ? 'tw-bg-opacity-30 md:tw-bg-opacity-0' : 'tw-bg-opacity-0']"
+      >
+        @if (data.open) {
+          <div (click)="sideNavService.toggle()" class="tw-pointer-events-auto tw-size-full"></div>
+        }
+      </div>
+    }
   </div>
   <div class="tw-absolute tw-z-50 tw-left-0 md:tw-sticky tw-top-0 tw-h-screen md:tw-w-auto">
     <ng-template [cdkPortalOutlet]="drawerPortal()"></ng-template>
diff --git a/libs/components/src/layout/mocks.ts b/libs/components/src/layout/mocks.ts
index 50c2bd9afb2..8b001eb8fd1 100644
--- a/libs/components/src/layout/mocks.ts
+++ b/libs/components/src/layout/mocks.ts
@@ -4,4 +4,5 @@ export const mockLayoutI18n = {
   skipToContent: "Skip to content",
   submenu: "submenu",
   toggleCollapse: "toggle collapse",
+  loading: "Loading",
 };
diff --git a/libs/components/src/menu/menu.stories.ts b/libs/components/src/menu/menu.stories.ts
index b29613061b8..7a4f06232ef 100644
--- a/libs/components/src/menu/menu.stories.ts
+++ b/libs/components/src/menu/menu.stories.ts
@@ -1,7 +1,10 @@
 import { OverlayModule } from "@angular/cdk/overlay";
 import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
 import { ButtonModule } from "../button/button.module";
+import { I18nMockService } from "../utils";
 
 import { MenuTriggerForDirective } from "./menu-trigger-for.directive";
 import { MenuModule } from "./menu.module";
@@ -12,6 +15,12 @@ export default {
   decorators: [
     moduleMetadata({
       imports: [MenuModule, OverlayModule, ButtonModule],
+      providers: [
+        {
+          provide: I18nService,
+          useValue: new I18nMockService({ loading: "Loading" }),
+        },
+      ],
     }),
   ],
   parameters: {
diff --git a/libs/components/src/multi-select/multi-select.component.html b/libs/components/src/multi-select/multi-select.component.html
index 8aa45b7dae8..7f6a22779ef 100644
--- a/libs/components/src/multi-select/multi-select.component.html
+++ b/libs/components/src/multi-select/multi-select.component.html
@@ -20,7 +20,7 @@
   appendTo="body"
 >
   <ng-template ng-loadingspinner-tmp>
-    <i class="bwi bwi-spinner bwi-spin tw-me-1" [title]="loadingText" aria-hidden="true"></i>
+    <bit-spinner></bit-spinner>
   </ng-template>
   <ng-template ng-label-tmp let-item="item" let-clear="clear">
     <button
diff --git a/libs/components/src/multi-select/multi-select.component.ts b/libs/components/src/multi-select/multi-select.component.ts
index 3e72318ba35..917bb7a9e3d 100644
--- a/libs/components/src/multi-select/multi-select.component.ts
+++ b/libs/components/src/multi-select/multi-select.component.ts
@@ -27,6 +27,7 @@ import { I18nPipe } from "@bitwarden/ui-common";
 
 import { BadgeModule } from "../badge";
 import { BitFormFieldControl } from "../form-field/form-field-control";
+import { SpinnerComponent } from "../spinner";
 
 import { SelectItemView } from "./models/select-item-view";
 
@@ -37,7 +38,14 @@ let nextId = 0;
   selector: "bit-multi-select",
   templateUrl: "./multi-select.component.html",
   providers: [{ provide: BitFormFieldControl, useExisting: MultiSelectComponent }],
-  imports: [NgSelectModule, ReactiveFormsModule, FormsModule, BadgeModule, I18nPipe],
+  imports: [
+    NgSelectModule,
+    ReactiveFormsModule,
+    FormsModule,
+    BadgeModule,
+    I18nPipe,
+    SpinnerComponent,
+  ],
   host: {
     "[id]": "this.id()",
   },
diff --git a/libs/components/src/navigation/nav-group.stories.ts b/libs/components/src/navigation/nav-group.stories.ts
index b30acc63c72..7aa9279e0e2 100644
--- a/libs/components/src/navigation/nav-group.stories.ts
+++ b/libs/components/src/navigation/nav-group.stories.ts
@@ -39,6 +39,7 @@ export default {
               toggleCollapse: "toggle collapse",
               toggleSideNavigation: "Toggle side navigation",
               skipToContent: "Skip to content",
+              loading: "Loading",
             });
           },
         },
diff --git a/libs/components/src/navigation/nav-item.stories.ts b/libs/components/src/navigation/nav-item.stories.ts
index dbd17695c8b..7e88e16ccac 100644
--- a/libs/components/src/navigation/nav-item.stories.ts
+++ b/libs/components/src/navigation/nav-item.stories.ts
@@ -30,6 +30,7 @@ export default {
               toggleCollapse: "toggle collapse",
               toggleSideNavigation: "Toggle side navigation",
               skipToContent: "Skip to content",
+              loading: "Loading",
             });
           },
         },
diff --git a/libs/components/src/navigation/nav-logo.component.html b/libs/components/src/navigation/nav-logo.component.html
index 89507503a41..391e62ec8fd 100644
--- a/libs/components/src/navigation/nav-logo.component.html
+++ b/libs/components/src/navigation/nav-logo.component.html
@@ -1,7 +1,7 @@
 <div
   [ngClass]="{
     'tw-sticky tw-top-0 tw-z-50 tw-pb-4': sideNavService.open,
-    'tw-pb-[calc(theme(spacing.6)_+_2px)]': !sideNavService.open,
+    'tw-pb-[calc(theme(spacing.8)_+_2px)]': !sideNavService.open,
   }"
   class="tw-px-2 tw-pt-2"
 >
@@ -12,6 +12,7 @@
     [ngClass]="{
       '!tw-h-[55px] [&_svg]:!tw-w-[26px] [&_svg]:tw-inset-y-[theme(spacing.3)]':
         !sideNavService.open,
+      'tw-w-56': sideNavService.open,
     }"
     [attr.aria-label]="label()"
     [title]="label()"
diff --git a/libs/components/src/navigation/side-nav.component.html b/libs/components/src/navigation/side-nav.component.html
index 1fdd40b1588..d2e6aeab2bb 100644
--- a/libs/components/src/navigation/side-nav.component.html
+++ b/libs/components/src/navigation/side-nav.component.html
@@ -7,7 +7,7 @@
 ) {
   <nav
     id="bit-side-nav"
-    class="tw-fixed md:tw-sticky tw-inset-y-0 tw-left-0 tw-z-30 tw-flex tw-h-screen tw-flex-col tw-overscroll-none tw-overflow-auto tw-bg-background-alt3 tw-outline-none"
+    class="tw-sticky tw-inset-y-0 tw-left-0 tw-z-30 tw-flex tw-h-screen tw-flex-col tw-overscroll-none tw-overflow-auto tw-bg-background-alt3 tw-outline-none"
     [ngClass]="{ 'tw-w-60': data.open }"
     [ngStyle]="
       variant() === 'secondary' && {
diff --git a/libs/components/src/navigation/side-nav.service.ts b/libs/components/src/navigation/side-nav.service.ts
index 87691244ca4..5a67f2c965b 100644
--- a/libs/components/src/navigation/side-nav.service.ts
+++ b/libs/components/src/navigation/side-nav.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { BehaviorSubject, Observable, combineLatest, fromEvent, map, startWith } from "rxjs";
 
 @Injectable({
@@ -8,10 +9,20 @@ export class SideNavService {
   private _open$ = new BehaviorSubject<boolean>(!window.matchMedia("(max-width: 768px)").matches);
   open$ = this._open$.asObservable();
 
-  isOverlay$ = combineLatest([this.open$, media("(max-width: 768px)")]).pipe(
+  private isSmallScreen$ = media("(max-width: 768px)");
+
+  isOverlay$ = combineLatest([this.open$, this.isSmallScreen$]).pipe(
     map(([open, isSmallScreen]) => open && isSmallScreen),
   );
 
+  constructor() {
+    this.isSmallScreen$.pipe(takeUntilDestroyed()).subscribe((isSmallScreen) => {
+      if (isSmallScreen) {
+        this.setClose();
+      }
+    });
+  }
+
   get open() {
     return this._open$.getValue();
   }
diff --git a/libs/components/src/no-items/no-items.component.html b/libs/components/src/no-items/no-items.component.html
index a2659abb9a2..8caaea3b8ed 100644
--- a/libs/components/src/no-items/no-items.component.html
+++ b/libs/components/src/no-items/no-items.component.html
@@ -1,6 +1,8 @@
 <div class="tw-mx-auto tw-flex tw-flex-col tw-items-center tw-justify-center tw-pt-6">
   <div class="tw-max-w-sm tw-flex tw-flex-col tw-items-center">
-    <bit-icon [icon]="icon()" aria-hidden="true"></bit-icon>
+    <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">
       <ng-content select="[slot=title]"></ng-content>
     </h3>
diff --git a/libs/components/src/no-items/no-items.component.ts b/libs/components/src/no-items/no-items.component.ts
index 3d7394a16ae..517abfc9533 100644
--- a/libs/components/src/no-items/no-items.component.ts
+++ b/libs/components/src/no-items/no-items.component.ts
@@ -1,6 +1,6 @@
 import { Component, input } from "@angular/core";
 
-import { Search } from "@bitwarden/assets/svg";
+import { NoResults } from "@bitwarden/assets/svg";
 
 import { BitIconComponent } from "../icon/icon.component";
 
@@ -13,5 +13,5 @@ import { BitIconComponent } from "../icon/icon.component";
   imports: [BitIconComponent],
 })
 export class NoItemsComponent {
-  readonly icon = input(Search);
+  readonly icon = input(NoResults);
 }
diff --git a/libs/components/src/no-items/no-items.stories.ts b/libs/components/src/no-items/no-items.stories.ts
index 48d52476b17..72f4183d9b4 100644
--- a/libs/components/src/no-items/no-items.stories.ts
+++ b/libs/components/src/no-items/no-items.stories.ts
@@ -1,6 +1,24 @@
 import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 
+import {
+  ActiveSendIcon,
+  DeactivatedOrg,
+  DevicesIcon,
+  DomainIcon,
+  EmptyTrash,
+  GearIcon,
+  NoCredentialsIcon,
+  NoFolders,
+  NoResults,
+  NoSendsIcon,
+  RestrictedView,
+  Security,
+  VaultOpen,
+} from "@bitwarden/assets/svg";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
 import { ButtonModule } from "../button";
+import { I18nMockService } from "../utils";
 
 import { NoItemsComponent } from "./no-items.component";
 import { NoItemsModule } from "./no-items.module";
@@ -11,6 +29,12 @@ export default {
   decorators: [
     moduleMetadata({
       imports: [ButtonModule, NoItemsModule],
+      providers: [
+        {
+          provide: I18nService,
+          useValue: new I18nMockService({ loading: "Loading" }),
+        },
+      ],
     }),
   ],
   parameters: {
@@ -23,11 +47,27 @@ export default {
 
 type Story = StoryObj<NoItemsComponent>;
 
+const Icons = {
+  EmptyTrash,
+  NoFolders,
+  NoResults,
+  NoSendsIcon,
+  VaultOpen,
+  DeactivatedOrg,
+  ActiveSendIcon,
+  DevicesIcon,
+  Security,
+  NoCredentialsIcon,
+  RestrictedView,
+  DomainIcon,
+  GearIcon,
+};
+
 export const Default: Story = {
   render: (args) => ({
     props: args,
-    template: `
-    <bit-no-items class="tw-text-main">
+    template: /*html*/ `
+    <bit-no-items class="tw-text-main" [icon]="icon">
       <ng-container slot="title">No items found</ng-container>
       <ng-container slot="description">Your description here.</ng-container>
       <button
@@ -42,4 +82,14 @@ export const Default: Story = {
     </bit-no-items>
     `,
   }),
+  args: {
+    icon: NoResults,
+  },
+  argTypes: {
+    icon: {
+      options: Object.keys(Icons),
+      mapping: Icons,
+      control: { type: "select" },
+    },
+  },
 };
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/section/section.stories.ts b/libs/components/src/section/section.stories.ts
index 31cdd0a324c..cf6b03a1c0d 100644
--- a/libs/components/src/section/section.stories.ts
+++ b/libs/components/src/section/section.stories.ts
@@ -1,9 +1,12 @@
 import { Meta, StoryObj, componentWrapperDecorator, moduleMetadata } from "@storybook/angular";
 
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
 import { CardComponent } from "../card";
 import { IconButtonModule } from "../icon-button";
 import { ItemModule } from "../item";
 import { TypographyModule } from "../typography";
+import { I18nMockService } from "../utils";
 
 import { SectionComponent, SectionHeaderComponent } from "./";
 
@@ -19,6 +22,12 @@ export default {
         IconButtonModule,
         ItemModule,
       ],
+      providers: [
+        {
+          provide: I18nService,
+          useValue: new I18nMockService({ loading: "Loading" }),
+        },
+      ],
     }),
     componentWrapperDecorator((story) => `<div class="tw-text-main">${story}</div>`),
   ],
diff --git a/libs/components/src/spinner/index.ts b/libs/components/src/spinner/index.ts
new file mode 100644
index 00000000000..7b242f2cf66
--- /dev/null
+++ b/libs/components/src/spinner/index.ts
@@ -0,0 +1 @@
+export * from "./spinner.component";
diff --git a/libs/components/src/spinner/spinner.component.html b/libs/components/src/spinner/spinner.component.html
new file mode 100644
index 00000000000..eba2e6dd70f
--- /dev/null
+++ b/libs/components/src/spinner/spinner.component.html
@@ -0,0 +1,27 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 56 56"
+  fill="none"
+  class="tw-size-full tw-animate-spin"
+  aria-hidden="true"
+>
+  <circle
+    cx="28"
+    cy="28"
+    r="23"
+    class="tw-stroke-primary-600"
+    pathLength="4"
+    stroke-width="5"
+    stroke-dasharray="1 3"
+    stroke-linecap="round"
+  ></circle>
+  <circle
+    cx="28"
+    cy="28"
+    r="23"
+    class="tw-stroke-primary-600"
+    stroke-width="5"
+    opacity="0.4"
+  ></circle>
+</svg>
+<span class="tw-sr-only" *ngIf="sr">{{ title }}</span>
diff --git a/libs/components/src/spinner/spinner.component.ts b/libs/components/src/spinner/spinner.component.ts
new file mode 100644
index 00000000000..c18e95d70fa
--- /dev/null
+++ b/libs/components/src/spinner/spinner.component.ts
@@ -0,0 +1,51 @@
+import { CommonModule } from "@angular/common";
+import { Component, HostBinding, Input, booleanAttribute } from "@angular/core";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+@Component({
+  selector: "bit-spinner",
+  templateUrl: "spinner.component.html",
+  standalone: true,
+  imports: [CommonModule],
+})
+export class SpinnerComponent {
+  /**
+   * The size of the spinner. Defaults to `large`.
+   */
+  @Input() size: "fill" | "small" | "large" = "large";
+
+  /**
+   * Disable the default color of the spinner, inherits the text color.
+   */
+  @Input({ transform: booleanAttribute }) noColor = false;
+
+  /**
+   * Accessibility title. Defaults to `Loading`.
+   */
+  @Input() title = this.i18nService.t("loading");
+
+  /**
+   * Display text for screen readers.
+   */
+  @Input({ transform: booleanAttribute }) sr = true;
+
+  @HostBinding("class") get classList() {
+    return ["tw-inline-block", "tw-overflow-hidden", "tw-flex", "tw-items-center"]
+      .concat(this.sizeClass)
+      .concat([this.noColor ? "" : "tw-text-primary-600"]);
+  }
+
+  constructor(private i18nService: I18nService) {}
+
+  get sizeClass() {
+    switch (this.size) {
+      case "small":
+        return ["tw-h-4"];
+      case "large":
+        return ["tw-h-16"];
+      default:
+        return ["tw-h-full", "tw-w-full"];
+    }
+  }
+}
diff --git a/libs/components/src/spinner/spinner.stories.ts b/libs/components/src/spinner/spinner.stories.ts
new file mode 100644
index 00000000000..bdb35b4a0e5
--- /dev/null
+++ b/libs/components/src/spinner/spinner.stories.ts
@@ -0,0 +1,53 @@
+import { CommonModule } from "@angular/common";
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+import { I18nMockService } from "../utils";
+
+import { SpinnerComponent } from "./spinner.component";
+
+export default {
+  title: "Component Library/Spinner",
+  component: SpinnerComponent,
+  decorators: [
+    moduleMetadata({
+      imports: [CommonModule],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              loading: "Loading",
+            });
+          },
+        },
+      ],
+      declarations: [],
+    }),
+  ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A16956",
+    },
+  },
+} as Meta;
+
+type Story = StoryObj<SpinnerComponent>;
+
+export const Default: Story = {
+  args: {},
+};
+
+export const Fill: Story = {
+  args: {
+    size: "fill",
+  },
+};
+
+export const Small: Story = {
+  args: {
+    size: "small",
+  },
+};
diff --git a/libs/components/src/stories/introduction.mdx b/libs/components/src/stories/introduction.mdx
index 7580262a6ef..4401c47551f 100644
--- a/libs/components/src/stories/introduction.mdx
+++ b/libs/components/src/stories/introduction.mdx
@@ -4,6 +4,11 @@ import { Meta } from "@storybook/addon-docs";
 
 <style>
   {`
+  /* undo global app style for ol */
+  ol {
+    list-style: revert;
+  }
+
   .subheading {
     --mediumdark: '#999999';
     font-weight: 900;
@@ -171,6 +176,11 @@ what would be helpful to you if you were consuming this component for the first
    - You'll need to mock any services required for the component (team-owned components often have
      more of this mocking to do)
 
+### Running Storybook locally
+
+To view your changes locally, cd into `/clients`, run `npm ci` if you haven't already, and run
+`npm run storybook`.
+
 ---
 
 <div className="subheading">References</div>
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 f92a14330d6..eb9f2fccac9 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
@@ -23,6 +23,7 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
           inputMaxValue: (max) => `Input value must not exceed ${max}.`,
           inputMinValue: (min) => `Input value must be at least ${min}.`,
           inputRequired: "Input is required.",
+          loading: "Loading",
           multiSelectClearAll: "Clear all",
           multiSelectLoading: "Retrieving options...",
           multiSelectNotFound: "No items found",
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 f8b5421f370..a96964db8d5 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
@@ -89,9 +89,7 @@ class KitchenSinkDialog {
   selector: "bit-tab-main",
   imports: [KitchenSinkSharedModule, KitchenSinkTable, KitchenSinkToggleList, KitchenSinkForm],
   template: `
-    <bit-banner bannerType="info" class="-tw-m-6 tw-flex tw-flex-col tw-pb-6">
-      Kitchen Sink test zone
-    </bit-banner>
+    <bit-banner bannerType="info"> Kitchen Sink test zone </bit-banner>
 
     <p class="tw-mt-4">
       <bit-breadcrumbs>
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 2cacab5af75..945eb5a9765 100644
--- a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
+++ b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
@@ -64,6 +64,7 @@ export default {
               toggleSideNavigation: "Toggle side navigation",
               yes: "Yes",
               no: "No",
+              loading: "Loading",
             });
           },
         },
diff --git a/libs/components/src/stories/migration.mdx b/libs/components/src/stories/migration.mdx
index 83d6d0666d7..08d3999b207 100644
--- a/libs/components/src/stories/migration.mdx
+++ b/libs/components/src/stories/migration.mdx
@@ -4,9 +4,27 @@ import { Meta } from "@storybook/addon-docs";
 
 # Migrating to the Component Library
 
+## Background
+
+Bitwarden is in the process of migrating client code to fully use the Component Library.
+
+Previously, the clients used a mix of multiple UI frameworks: Bootstrap, custom "box" styles, and
+this component library, which is built on top of Tailwind.
+
+Bootstrap is now removed from the clients repo in favor of using Tailwind Preflight for global reset
+styles.
+
+Tailwind is used in client code where layout-level html is written in conjunction with Component
+Library components.
+
+Some custom css still lingers in all the clients and is planned to be removed. Do not write more
+custom css.
+
+## Performing a migration
+
 You have been tasked with migrating a component to use the CL. What does that entail?
 
-## Getting Started
+### Getting Started
 
 Before progressing here, please ensure that...
 
@@ -15,13 +33,6 @@ Before progressing here, please ensure that...
 - You are familiar with [Angular reactive forms](https://angular.io/guide/reactive-forms).
 - You are familiar with [Tailwind](https://tailwindcss.com/docs/utility-first).
 
-## Background
-
-The design of Bitwarden is in flux. At the time of writing, the frontend codebase uses a mix of
-multiple UI frameworks: Bootstrap, custom "box" styles, and this component library, which is built
-on top of Tailwind. In short, the "CL migration" is a move to only use the CL and remove everything
-else.
-
 This is very important work. Centralizing around a shared design system will:
 
 - improve user experience by utilizing consistent patterns
@@ -29,11 +40,11 @@ This is very important work. Centralizing around a shared design system will:
 - improve dev & design velocity by having a central location to make UI/UX changes that impact the
   entire project
 
-## Success Criteria
+### Success Criteria
 
 Follow these steps to fully migrate a component.
 
-### Use Storybook
+#### Use Storybook
 
 Don't recreate the wheel.
 
@@ -42,7 +53,7 @@ usecase. Don't waste effort styling a button or building a popover menu from scr
 have those. If a component isn't flexible enough or doesn't exist for your usecase, contact the
 Component Library team.
 
-### Use Tailwind
+#### Use Tailwind
 
 Only use Tailwind for styling. No Bootstrap or other custom CSS is allowed.
 
@@ -72,7 +83,7 @@ without this prefix, it probably shouldn't be there.
   ```
 </div>
 
-### Use Reactive Forms
+#### Use Reactive Forms
 
 The CL has form components that integrate with Angular's reactive forms: `bit-form-field`,
 `bitSubmit`, `bit-form-control`, etc. All forms should be migrated from template-drive forms to
@@ -97,7 +108,7 @@ reactive forms to make use of these components. Review the
     ```
 </div>
 
-### Dialogs
+#### Dialogs
 
 Legacy Bootstrap modals use the `ModalService`. These should be converted to use the `DialogService`
 and it's [related CL components](?path=/docs/component-library-dialogs--docs). Components that are
@@ -161,11 +172,11 @@ fully migrated should have no reference to the `ModalService`.
 
 <div class="tw-bg-success-600/10 tw-p-4">`FooDialogComponent.open(this.dialogService);`</div>
 
-## Examples
+### Examples
 
 The following examples come from accross the Bitwarden codebase.
 
-### 1.) AboutComponent
+#### 1.) AboutComponent
 
 Codeowner: Platform
 
@@ -176,7 +187,7 @@ This migration updates a `ModalService` component to the `DialogService`.
 **Note:** Most of the internal markup of this component was unchanged, aside from the removal of
 defunct Bootstrap classes.
 
-### 2.) Auth
+#### 2.) Auth
 
 Codeowner: Auth
 
@@ -190,7 +201,7 @@ This PR also does some general refactoring, the main relevant change can be seen
 
 Updates a dialog, similar to example 1, but also adds CL form components and Angular Reactive Forms.
 
-### 3.) AC
+#### 3.) AC
 
 Codeowner: Admin Console
 
@@ -198,7 +209,7 @@ https://github.com/bitwarden/clients/pull/5417
 
 Migrates dialog, form, buttons, and a table.
 
-### 4.) Vault
+#### 4.) Vault
 
 Codeowner: Vault
 
@@ -209,6 +220,6 @@ through the use of inheritance. This PR updates the _web_ template of a cross-cl
 use Tailwind and the CL, and updates the base component implementation to use reactive forms,
 without updating the desktop or browser templates.
 
-## Questions
+### Questions
 
 Please direct any development questions to the Component Library team. Thank you!
diff --git a/libs/components/src/tabs/tabs.stories.ts b/libs/components/src/tabs/tabs.stories.ts
index 3be63b433aa..1f3f5e353b9 100644
--- a/libs/components/src/tabs/tabs.stories.ts
+++ b/libs/components/src/tabs/tabs.stories.ts
@@ -3,8 +3,11 @@ import { Component, importProvidersFrom } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import { applicationConfig, Meta, moduleMetadata, StoryObj } from "@storybook/angular";
 
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
 import { ButtonModule } from "../button";
 import { FormFieldModule } from "../form-field";
+import { I18nMockService } from "../utils";
 
 import { TabGroupComponent } from "./tab-group/tab-group.component";
 import { TabsModule } from "./tabs.module";
@@ -56,6 +59,12 @@ export default {
         ItemWithChildCounterDummyComponent,
         DisabledDummyComponent,
       ],
+      providers: [
+        {
+          provide: I18nService,
+          useValue: new I18nMockService({ loading: "Loading" }),
+        },
+      ],
     }),
     applicationConfig({
       providers: [
diff --git a/libs/components/src/toast/toast.stories.ts b/libs/components/src/toast/toast.stories.ts
index dee31f1d6ac..89c8bffad5c 100644
--- a/libs/components/src/toast/toast.stories.ts
+++ b/libs/components/src/toast/toast.stories.ts
@@ -55,6 +55,7 @@ export default {
               error: "Error",
               warning: "Warning",
               info: "Info",
+              loading: "Loading",
             });
           },
         },
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..c75cd5fb0d4
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.component.html
@@ -0,0 +1,10 @@
+<!-- eslint-disable-next-line tailwindcss/no-custom-classname -->
+<div
+  class="bit-tooltip-container"
+  [attr.data-position]="tooltipData.tooltipPosition()"
+  [attr.data-visible]="tooltipData.isVisible()"
+>
+  <div role="tooltip" class="bit-tooltip">
+    <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..6b240507311
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.component.ts
@@ -0,0 +1,36 @@
+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>;
+};
+
+export const TOOLTIP_DATA = new InjectionToken<TooltipData>("TOOLTIP_DATA");
+
+/**
+ * tooltip component used internally by the tooltip.directive. Not meant to be used explicitly
+ */
+@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..153fecfe7bf
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.directive.ts
@@ -0,0 +1,110 @@
+import { Overlay, OverlayConfig, OverlayRef } from "@angular/cdk/overlay";
+import { ComponentPortal } from "@angular/cdk/portal";
+import {
+  Directive,
+  ViewContainerRef,
+  inject,
+  OnInit,
+  ElementRef,
+  Injector,
+  input,
+  effect,
+  signal,
+} 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()",
+  },
+})
+export class TooltipDirective implements OnInit {
+  /**
+   * The value of this input is forwarded to the tooltip.component to render
+   */
+  readonly bitTooltip = input.required<string>();
+  /**
+   * 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");
+
+  private isVisible = signal(false);
+  private overlayRef: OverlayRef | undefined;
+  private elementRef = inject(ElementRef);
+  private overlay = inject(Overlay);
+  private viewContainerRef = inject(ViewContainerRef);
+  private injector = inject(Injector);
+  private positionStrategy = this.overlay
+    .position()
+    .flexibleConnectedTo(this.elementRef)
+    .withFlexibleDimensions(false)
+    .withPush(true);
+
+  private tooltipPortal = new ComponentPortal(
+    TooltipComponent,
+    this.viewContainerRef,
+    Injector.create({
+      providers: [
+        {
+          provide: TOOLTIP_DATA,
+          useValue: {
+            content: this.bitTooltip,
+            isVisible: this.isVisible,
+            tooltipPosition: this.tooltipPosition,
+          },
+        },
+      ],
+    }),
+  );
+
+  private showTooltip = () => {
+    this.isVisible.set(true);
+  };
+
+  private hideTooltip = () => {
+    this.isVisible.set(false);
+  };
+
+  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()));
+
+    this.overlayRef = this.overlay.create({
+      ...this.defaultPopoverConfig,
+      positionStrategy: this.positionStrategy,
+    });
+
+    this.overlayRef.attach(this.tooltipPortal);
+
+    effect(
+      () => {
+        this.positionStrategy.withPositions(this.computePositions(this.tooltipPosition()));
+        this.overlayRef?.updatePosition();
+      },
+      { injector: this.injector },
+    );
+  }
+}
diff --git a/libs/components/src/tooltip/tooltip.mdx b/libs/components/src/tooltip/tooltip.mdx
new file mode 100644
index 00000000000..4b6f10d97f8
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.mdx
@@ -0,0 +1,31 @@
+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 />
+
+NOTE: The `TooltipComponent` can't be used on its own. It must be applied via the `TooltipDirective`
+
+<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} />
diff --git a/libs/components/src/tooltip/tooltip.spec.ts b/libs/components/src/tooltip/tooltip.spec.ts
new file mode 100644
index 00000000000..57e05e4f65f
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.spec.ts
@@ -0,0 +1,103 @@
+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";
+
+@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(() => ({})),
+      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..8ea3f52f913
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.stories.ts
@@ -0,0 +1,153 @@
+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",
+    },
+  },
+  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: {
+    bitTooltip: "This is a tooltip",
+    tooltipPosition: "above-center",
+  },
+  render: (args) => ({
+    props: args,
+    template: `
+      <div class="tw-p-4">
+        <button
+          bitIconButton="bwi-ellipsis-v"
+          ${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 = {
+  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"
+          bitTooltip="Top tooltip"
+          tooltipPosition="above-center"
+        ></button>
+        <button
+          bitIconButton="bwi-angle-right"
+          bitTooltip="Right tooltip"
+          tooltipPosition="right-center"
+        ></button>
+        <button
+          bitIconButton="bwi-angle-left"
+          bitTooltip="Left tooltip"
+          tooltipPosition="left-center"
+        ></button>
+        <button
+          bitIconButton="bwi-angle-down"
+          bitTooltip="Bottom tooltip"
+          tooltipPosition="below-center"
+        ></button>
+      </div>
+    `,
+  }),
+};
+
+export const LongContent: Story = {
+  render: () => ({
+    template: `
+      <div class="tw-p-16 tw-flex tw-items-center tw-justify-center">
+        <button
+          bitIconButton="bwi-ellipsis-v"
+          bitTooltip="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 = {
+  render: () => ({
+    template: `
+      <div class="tw-p-16 tw-flex tw-items-center tw-justify-center">
+        <button
+          bitIconButton="bwi-ellipsis-v"
+          bitTooltip="Tooltip on disabled button"
+          [disabled]="true"
+        ></button>
+      </div>
+    `,
+  }),
+};
diff --git a/libs/components/src/tw-theme-preflight.css b/libs/components/src/tw-theme-preflight.css
index e5f35885993..372c80e0881 100644
--- a/libs/components/src/tw-theme-preflight.css
+++ b/libs/components/src/tw-theme-preflight.css
@@ -54,6 +54,14 @@
     display: none !important;
   }
 
+  dl {
+    @apply tw-mb-4;
+  }
+
+  dt {
+    @apply tw-font-bold;
+  }
+
   hr {
     border-color: rgba(0, 0, 0, 0.1);
   }
diff --git a/libs/components/src/tw-theme.css b/libs/components/src/tw-theme.css
index ada3bf60171..7b6aa15e345 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;
@@ -51,10 +52,6 @@
   --color-notification-100: 255 225 247;
   --color-notification-600: 192 17 118;
 
-  /*art styles deprecated, use 'illustration' instead*/
-  --color-art-primary: 2 15 102;
-  --color-art-accent: 44 221 223;
-
   --color-text-main: 27 32 41;
   --color-text-muted: 96 109 145;
   --color-text-contrast: 255 255 255;
@@ -122,10 +119,6 @@
   --color-notification-100: 117 37 83;
   --color-notification-600: 255 143 208;
 
-  /*art styles deprecated, use 'illustration' instead*/
-  --color-art-primary: 243 246 249;
-  --color-art-accent: 44 221 233;
-
   --color-text-main: 243 246 249;
   --color-text-muted: 136 152 181;
   --color-text-contrast: 18 26 39;
diff --git a/libs/components/src/utils/dom-observables.ts b/libs/components/src/utils/dom-observables.ts
new file mode 100644
index 00000000000..9607aee4055
--- /dev/null
+++ b/libs/components/src/utils/dom-observables.ts
@@ -0,0 +1,17 @@
+import { Observable } from "rxjs";
+
+/** IntersectionObserver Observable */
+export const intersectionObserver$ = (
+  target: Element,
+  init: IntersectionObserverInit,
+): Observable<IntersectionObserverEntry> => {
+  return new Observable((sub) => {
+    const io = new IntersectionObserver((entries) => {
+      for (const e of entries) {
+        sub.next(e);
+      }
+    }, init);
+    io.observe(target);
+    return () => io.disconnect();
+  });
+};
diff --git a/libs/components/src/utils/has-scrollable-content.ts b/libs/components/src/utils/has-scrollable-content.ts
new file mode 100644
index 00000000000..f0ed6af8084
--- /dev/null
+++ b/libs/components/src/utils/has-scrollable-content.ts
@@ -0,0 +1,26 @@
+import { Observable, animationFrameScheduler } from "rxjs";
+import { auditTime, map, startWith, observeOn, distinctUntilChanged } from "rxjs/operators";
+
+import { intersectionObserver$ } from "./dom-observables";
+/**
+ * Utility to determine if an element has scrollable content.
+ * Returns an Observable that emits whenever scroll/resize/layout might change visibility
+ */
+export const hasScrollableContent$ = (
+  root: HTMLElement,
+  target: HTMLElement,
+  threshold: number = 1,
+): Observable<boolean> => {
+  return intersectionObserver$(target, { root, threshold }).pipe(
+    startWith(null as IntersectionObserverEntry | null),
+    auditTime(0, animationFrameScheduler),
+    observeOn(animationFrameScheduler),
+    map((entry: IntersectionObserverEntry | null) => {
+      if (!entry) {
+        return root.scrollHeight > root.clientHeight;
+      }
+      return !entry.isIntersecting;
+    }),
+    distinctUntilChanged(),
+  );
+};
diff --git a/libs/components/src/utils/index.ts b/libs/components/src/utils/index.ts
index 91fa71cf0e0..5ac6c6c0da0 100644
--- a/libs/components/src/utils/index.ts
+++ b/libs/components/src/utils/index.ts
@@ -1,3 +1,4 @@
 export * from "./aria-disable-element";
 export * from "./function-to-observable";
+export * from "./has-scrollable-content";
 export * from "./i18n-mock.service";
diff --git a/libs/components/tailwind.config.base.js b/libs/components/tailwind.config.base.js
index 6c492900f62..40362bfa8da 100644
--- a/libs/components/tailwind.config.base.js
+++ b/libs/components/tailwind.config.base.js
@@ -64,11 +64,6 @@ module.exports = {
         100: rgba("--color-notification-100"),
         600: rgba("--color-notification-600"),
       },
-      // art styles deprecated, use 'illustration' instead
-      art: {
-        primary: rgba("--color-art-primary"),
-        accent: rgba("--color-art-accent"),
-      },
       text: {
         main: rgba("--color-text-main"),
         muted: rgba("--color-text-muted"),
diff --git a/libs/core-test-utils/package.json b/libs/core-test-utils/package.json
index acb2edc8eb5..dd9e54e6548 100644
--- a/libs/core-test-utils/package.json
+++ b/libs/core-test-utils/package.json
@@ -4,8 +4,8 @@
   "description": "Async test tools for state and clients",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/core-test-utils/project.json b/libs/core-test-utils/project.json
index a526209edc4..78eea107084 100644
--- a/libs/core-test-utils/project.json
+++ b/libs/core-test-utils/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/core-test-utils",
         "main": "libs/core-test-utils/src/index.ts",
         "tsConfig": "libs/core-test-utils/tsconfig.lib.json",
-        "assets": ["libs/core-test-utils/*.md"]
+        "assets": ["libs/core-test-utils/*.md"],
+        "rootDir": "libs/core-test-utils/src"
       }
     },
     "lint": {
diff --git a/libs/dirt/card/package.json b/libs/dirt/card/package.json
index cf613ead7af..d6fc1841888 100644
--- a/libs/dirt/card/package.json
+++ b/libs/dirt/card/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest --passWithNoTests"
   }
 }
diff --git a/libs/dirt/card/project.json b/libs/dirt/card/project.json
new file mode 100644
index 00000000000..1f7712eb3c7
--- /dev/null
+++ b/libs/dirt/card/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/dirt-card",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/dirt/card/src",
+  "projectType": "library",
+  "tags": ["scope:dirt-card", "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/dirt/card/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/eslint/components/index.mjs b/libs/eslint/components/index.mjs
index 0a9b1d1481f..273c29890fe 100644
--- a/libs/eslint/components/index.mjs
+++ b/libs/eslint/components/index.mjs
@@ -1,3 +1,9 @@
 import requireLabelOnBiticonbutton from "./require-label-on-biticonbutton.mjs";
+import requireThemeColorsInSvg from "./require-theme-colors-in-svg.mjs";
 
-export default { rules: { "require-label-on-biticonbutton": requireLabelOnBiticonbutton } };
+export default {
+  rules: {
+    "require-label-on-biticonbutton": requireLabelOnBiticonbutton,
+    "require-theme-colors-in-svg": requireThemeColorsInSvg,
+  },
+};
diff --git a/libs/eslint/components/require-theme-colors-in-svg.mjs b/libs/eslint/components/require-theme-colors-in-svg.mjs
new file mode 100644
index 00000000000..fcc9cba461c
--- /dev/null
+++ b/libs/eslint/components/require-theme-colors-in-svg.mjs
@@ -0,0 +1,65 @@
+/**
+ * @fileoverview Forbid hardcoded colors in SVGs; enforce CSS variables instead.
+ */
+
+"use strict";
+
+const COLOR_REGEX =
+  /(?:fill|stroke|stop-color|flood-color|lighting-color)\s*=\s*["'](?!none["'])(?!var\(--)(#(?:[0-9a-f]{3,8})|rgba?\([^)]+\)|hsla?\([^)]+\)|[a-zA-Z]+)["']/gi;
+
+export default {
+  meta: {
+    type: "problem",
+    docs: {
+      description: "Forbid hardcoded colors in SVGs; enforce theme variables instead.",
+      category: "Best Practices",
+    },
+    messages: {
+      hardcodedColor:
+        "Hardcoded color '{{color}}' found in SVG. Use Tailwind or CSS variables instead.",
+    },
+    schema: [
+      {
+        type: "object",
+        properties: {
+          tagNames: {
+            type: "array",
+            items: { type: "string" },
+            default: ["svgIcon"],
+          },
+        },
+        additionalProperties: false,
+      },
+    ],
+  },
+
+  create(context) {
+    const options = context.options[0] || {};
+    const tagNames = options.tagNames || ["svgIcon"];
+
+    function isSvgTaggedTemplate(node) {
+      return (
+        node.tag &&
+        ((node.tag.type === "Identifier" && tagNames.includes(node.tag.name)) ||
+          (node.tag.type === "MemberExpression" && tagNames.includes(node.tag.property.name)))
+      );
+    }
+
+    return {
+      TaggedTemplateExpression(node) {
+        if (!isSvgTaggedTemplate(node)) return;
+
+        const svgString = node.quasi.quasis.map((q) => q.value.raw).join("");
+        let match;
+        while ((match = COLOR_REGEX.exec(svgString)) !== null) {
+          context.report({
+            node,
+            loc: context.getSourceCode().getLocFromIndex(node.range[0] + match.index),
+            messageId: "hardcodedColor",
+            data: { color: match[1] },
+          });
+        }
+      },
+    };
+  },
+};
diff --git a/libs/eslint/components/require-theme-colors-in-svg.spec.mjs b/libs/eslint/components/require-theme-colors-in-svg.spec.mjs
new file mode 100644
index 00000000000..fd513ba57b3
--- /dev/null
+++ b/libs/eslint/components/require-theme-colors-in-svg.spec.mjs
@@ -0,0 +1,53 @@
+import { RuleTester } from "@typescript-eslint/rule-tester";
+import rule from "./require-theme-colors-in-svg.mjs";
+
+const ruleTester = new RuleTester({
+  languageOptions: {
+    parserOptions: {
+      project: [__dirname + "/../tsconfig.spec.json"],
+      projectService: {
+        allowDefaultProject: ["*.ts*"],
+      },
+      tsconfigRootDir: __dirname + "/..",
+    },
+  },
+});
+
+ruleTester.run("require-theme-colors-in-svg", rule.default, {
+  valid: [
+    {
+      name: "Allows fill=none",
+      code: 'const icon = svgIcon`<svg><path fill="none"/></svg>`;',
+    },
+    {
+      name: "Allows CSS variable",
+      code: 'const icon = svgIcon`<svg><path fill="var(--my-color)"/></svg>`;',
+    },
+    {
+      name: "Allows class-based coloring",
+      code: 'const icon = svgIcon`<svg><path class="tw-fill-art-primary"/></svg>`;',
+    },
+  ],
+  invalid: [
+    {
+      name: "Errors on fill with hex color",
+      code: 'const icon = svgIcon`<svg><path fill="#000000"/></svg>`;',
+      errors: [{ messageId: "hardcodedColor", data: { color: "#000000" } }],
+    },
+    {
+      name: "Errors on stroke with named color",
+      code: 'const icon = svgIcon`<svg><path stroke="red"/></svg>`;',
+      errors: [{ messageId: "hardcodedColor", data: { color: "red" } }],
+    },
+    {
+      name: "Errors on fill with rgb()",
+      code: 'const icon = svgIcon`<svg><path fill="rgb(255,0,0)"/></svg>`;',
+      errors: [{ messageId: "hardcodedColor", data: { color: "rgb(255,0,0)" } }],
+    },
+    {
+      name: "Errors on fill with named color",
+      code: 'const icon = svgIcon`<svg><path fill="blue"/></svg>`;',
+      errors: [{ messageId: "hardcodedColor", data: { color: "blue" } }],
+    },
+  ],
+});
diff --git a/libs/guid/package.json b/libs/guid/package.json
index 9f7af0667a3..4461add637f 100644
--- a/libs/guid/package.json
+++ b/libs/guid/package.json
@@ -4,8 +4,8 @@
   "description": "Guid utilities extracted from common",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/guid/project.json b/libs/guid/project.json
index e5d510b2e2a..4117c8d5b7f 100644
--- a/libs/guid/project.json
+++ b/libs/guid/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/guid",
         "main": "libs/guid/src/index.ts",
         "tsConfig": "libs/guid/tsconfig.lib.json",
-        "assets": ["libs/guid/*.md"]
+        "assets": ["libs/guid/*.md"],
+        "rootDir": "libs/guid/src"
       }
     },
     "lint": {
diff --git a/libs/importer/package.json b/libs/importer/package.json
index eb2588b6340..2c85c78cb66 100644
--- a/libs/importer/package.json
+++ b/libs/importer/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/importer/project.json b/libs/importer/project.json
new file mode 100644
index 00000000000..28be8403369
--- /dev/null
+++ b/libs/importer/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/importer",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/importer/src",
+  "projectType": "library",
+  "tags": ["scope:importer", "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/importer/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/importer/src/components/chrome/import-chrome.component.ts b/libs/importer/src/components/chrome/import-chrome.component.ts
index 9e9f985c5a5..bf2a37203e1 100644
--- a/libs/importer/src/components/chrome/import-chrome.component.ts
+++ b/libs/importer/src/components/chrome/import-chrome.component.ts
@@ -114,7 +114,11 @@ export class ImportChromeComponent implements OnInit, OnDestroy {
           this.formGroup.controls.profile.value,
         );
         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/import.component.html b/libs/importer/src/components/import.component.html
index 9f1247b52da..bca7d15f087 100644
--- a/libs/importer/src/components/import.component.html
+++ b/libs/importer/src/components/import.component.html
@@ -49,7 +49,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>
diff --git a/libs/importer/src/components/import.component.ts b/libs/importer/src/components/import.component.ts
index 54c3fc1d408..d98cd817147 100644
--- a/libs/importer/src/components/import.component.ts
+++ b/libs/importer/src/components/import.component.ts
@@ -29,7 +29,11 @@ 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 {
+  CollectionService,
+  CollectionTypes,
+  CollectionView,
+} from "@bitwarden/admin-console/common";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import {
   getOrganizationById,
@@ -103,6 +107,8 @@ import { ImportLastPassComponent } from "./lastpass";
   providers: ImporterProviders,
 })
 export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
+  DefaultCollectionType = CollectionTypes.DefaultUserCollection;
+
   featuredImportOptions: ImportOption[];
   importOptions: ImportOption[];
   format: ImportType = null;
diff --git a/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts
index 70c783df52a..14a16211deb 100644
--- a/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts
+++ b/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts
@@ -64,12 +64,13 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
   private async parseEncrypted(
     results: BitwardenEncryptedIndividualJsonExport | BitwardenEncryptedOrgJsonExport,
   ) {
+    const account = await firstValueFrom(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$(account.id));
+      let keyForDecryption: SymmetricCryptoKey = orgKeys?.[this.organizationId];
       if (keyForDecryption == null) {
-        keyForDecryption = await this.keyService.getUserKey();
+        keyForDecryption = await firstValueFrom(this.keyService.userKey$(account.id));
       }
       const encKeyValidation = new EncString(results.encKeyValidation_DO_NOT_EDIT);
       try {
@@ -113,10 +114,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, account.id);
       this.cleanupCipher(view);
       this.result.ciphers.push(view);
     }
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 fc81adebcdc..dfdcef51735 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,17 @@
 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 { newGuid } from "@bitwarden/guid";
 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 +40,36 @@ describe("BitwardenPasswordProtectedImporter", () => {
     pinService = mock<PinServiceAbstraction>();
     accountService = mock<AccountService>();
 
+    accountService.activeAccount$ = of({
+      id: newGuid() 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 unknown as OrgKey;
+    const mockUserKey = {} as unknown as UserKey;
+
+    keyService.orgKeys$.mockImplementation(() =>
+      of({ [mockOrgId]: mockOrgKey } as Record<OrganizationId, OrgKey>),
+    );
+    keyService.userKey$.mockImplementation(() => of(mockUserKey));
+    (keyService as any).activeUserOrgKeys$ = of({
+      [mockOrgId]: mockOrgKey,
+    } as Record<OrganizationId, OrgKey>);
+
+    /*
+      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 +97,24 @@ describe("BitwardenPasswordProtectedImporter", () => {
       jest.spyOn(BitwardenJsonImporter.prototype, "parse");
     });
 
+    beforeEach(() => {
+      accountService.activeAccount$ = of({
+        id: newGuid() 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);
@@ -136,5 +189,17 @@ describe("BitwardenPasswordProtectedImporter", () => {
       jDoc.data = null;
       expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
     });
+
+    it("returns invalidFilePassword errorMessage if decryptString throws", async () => {
+      encryptService.decryptString.mockImplementation(() => {
+        throw new Error("SDK error");
+      });
+      i18nService.t.mockReturnValue("invalidFilePassword");
+
+      const result = await importer.parse(JSON.stringify(jDoc));
+
+      expect(result.success).toBe(false);
+      expect(result.errorMessage).toBe("invalidFilePassword");
+    });
   });
 });
diff --git a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts
index 02dedd98c75..7062089482d 100644
--- a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts
+++ b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts
@@ -90,14 +90,12 @@ export class BitwardenPasswordProtectedImporter extends BitwardenJsonImporter im
 
     const encKeyValidation = new EncString(jdoc.encKeyValidation_DO_NOT_EDIT);
 
-    const encKeyValidationDecrypt = await this.encryptService.decryptString(
-      encKeyValidation,
-      this.key,
-    );
-    if (encKeyValidationDecrypt === null) {
+    try {
+      await this.encryptService.decryptString(encKeyValidation, this.key);
+      return true;
+    } catch {
       return false;
     }
-    return true;
   }
 
   private cannotParseFile(jdoc: BitwardenPasswordProtectedFileFormat): boolean {
diff --git a/libs/importer/src/importers/chrome-csv-importer.spec.ts b/libs/importer/src/importers/chrome-csv-importer.spec.ts
index d0e82cf44ac..a7a29094707 100644
--- a/libs/importer/src/importers/chrome-csv-importer.spec.ts
+++ b/libs/importer/src/importers/chrome-csv-importer.spec.ts
@@ -20,7 +20,7 @@ const CipherData = [
         password: "Qh6W4Wz55YGFNU",
         uris: [
           Object.assign(new LoginUriView(), {
-            uri: "android://N2H9MndUUUt3JuQSWAKexOU9oJLJeHR4nyUGac5E1TXKppkY7xtdRl6l8vKo1hQWCqAEy4gsNLUBIbVxpdmhOP==@com.xyz.example.app.android/",
+            uri: "androidapp://com.xyz.example.app.android",
           }),
         ],
       }),
diff --git a/libs/importer/src/importers/chrome-csv-importer.ts b/libs/importer/src/importers/chrome-csv-importer.ts
index c7a72c126b0..7b663c57a2f 100644
--- a/libs/importer/src/importers/chrome-csv-importer.ts
+++ b/libs/importer/src/importers/chrome-csv-importer.ts
@@ -6,6 +6,11 @@ import { Importer } from "./importer";
 export class ChromeCsvImporter extends BaseImporter implements Importer {
   private androidPatternRegex = new RegExp("^android:\\/\\/.*(?<=@)(.*)(?=\\/)");
 
+  private normalizeAndroidUrl(url: string): string {
+    const match = url?.match(this.androidPatternRegex);
+    return match ? `androidapp://${match[1]}` : url;
+  }
+
   parse(data: string): Promise<ImportResult> {
     const result = new ImportResult();
     const results = this.parseCsv(data, true);
@@ -16,6 +21,8 @@ export class ChromeCsvImporter extends BaseImporter implements Importer {
 
     results.forEach((value) => {
       const cipher = this.initLoginCipher();
+      const normalizedUri = this.normalizeAndroidUrl(value.url);
+
       let name = value.name;
       if (!name && this.androidPatternRegex.test(value.url)) {
         name = value.url.match(this.androidPatternRegex)[1];
@@ -23,7 +30,7 @@ export class ChromeCsvImporter extends BaseImporter implements Importer {
       cipher.name = this.getValueOrDefault(name, "--");
       cipher.login.username = this.getValueOrDefault(value.username);
       cipher.login.password = this.getValueOrDefault(value.password);
-      cipher.login.uris = this.makeUriArray(value.url);
+      cipher.login.uris = this.makeUriArray(normalizedUri);
       cipher.notes = this.getValueOrDefault(value.note);
       this.cleanupCipher(cipher);
       result.ciphers.push(cipher);
diff --git a/libs/importer/src/services/import.service.ts b/libs/importer/src/services/import.service.ts
index e868a5ac516..da080bacaad 100644
--- a/libs/importer/src/services/import.service.ts
+++ b/libs/importer/src/services/import.service.ts
@@ -10,6 +10,7 @@ import {
   CollectionView,
 } 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 { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
@@ -144,7 +145,22 @@ export class ImportService implements ImportServiceAbstraction {
     const capabilities$ = combineLatest([type$, browserEnabled$]).pipe(
       map(([type, enabled]) => {
         let loaders = availableLoaders(type, client);
-        if (!enabled) {
+
+        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);
         }
 
diff --git a/libs/key-management-ui/project.json b/libs/key-management-ui/project.json
new file mode 100644
index 00000000000..2e311d209d3
--- /dev/null
+++ b/libs/key-management-ui/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/key-management-ui",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/key-management-ui/src",
+  "projectType": "library",
+  "tags": ["scope:key-management-ui", "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/key-management-ui/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
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 efc7fb26a2f..9a8e8c9f768 100644
--- a/libs/key-management-ui/src/lock/components/lock.component.html
+++ b/libs/key-management-ui/src/lock/components/lock.component.html
@@ -10,6 +10,7 @@
     <button
       type="button"
       bitButton
+      appAutofocus
       buttonType="primary"
       class="tw-mb-3"
       [disabled]="unlockingViaBiometrics || !biometricsAvailable"
diff --git a/libs/key-management/project.json b/libs/key-management/project.json
new file mode 100644
index 00000000000..1833e2a79ab
--- /dev/null
+++ b/libs/key-management/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/key-management",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/key-management/src",
+  "projectType": "library",
+  "tags": ["scope:key-management", "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/key-management/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/logging/package.json b/libs/logging/package.json
index b9cfbe35eb0..2b1d529af33 100644
--- a/libs/logging/package.json
+++ b/libs/logging/package.json
@@ -4,8 +4,8 @@
   "description": "Logging primitives",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/logging/project.json b/libs/logging/project.json
index f2b5db313be..f47ade5854f 100644
--- a/libs/logging/project.json
+++ b/libs/logging/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/logging",
         "main": "libs/logging/src/index.ts",
         "tsConfig": "libs/logging/tsconfig.lib.json",
-        "assets": ["libs/logging/*.md"]
+        "assets": ["libs/logging/*.md"],
+        "rootDir": "libs/logging/src"
       }
     },
     "lint": {
diff --git a/libs/messaging-internal/README.md b/libs/messaging-internal/README.md
deleted file mode 100644
index a2f36138ad7..00000000000
--- a/libs/messaging-internal/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# messaging-internal
-
-Owned by: platform
-
-Internal details to accompany @bitwarden/messaging this library should not be consumed in non-platform code.
diff --git a/libs/messaging-internal/eslint.config.mjs b/libs/messaging-internal/eslint.config.mjs
deleted file mode 100644
index 9c37d10e3ff..00000000000
--- a/libs/messaging-internal/eslint.config.mjs
+++ /dev/null
@@ -1,3 +0,0 @@
-import baseConfig from "../../eslint.config.mjs";
-
-export default [...baseConfig];
diff --git a/libs/messaging-internal/jest.config.js b/libs/messaging-internal/jest.config.js
deleted file mode 100644
index 152244f6603..00000000000
--- a/libs/messaging-internal/jest.config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
-  displayName: "messaging-internal",
-  preset: "../../jest.preset.js",
-  testEnvironment: "node",
-  transform: {
-    "^.+\\.[tj]s$": ["ts-jest", { tsconfig: "<rootDir>/tsconfig.spec.json" }],
-  },
-  moduleFileExtensions: ["ts", "js", "html"],
-  coverageDirectory: "../../coverage/libs/messaging-internal",
-};
diff --git a/libs/messaging-internal/package.json b/libs/messaging-internal/package.json
deleted file mode 100644
index 7a0a13d2d67..00000000000
--- a/libs/messaging-internal/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "@bitwarden/messaging-internal",
-  "version": "0.0.1",
-  "description": "Internal details to accompany @bitwarden/messaging this library should not be consumed in non-platform code.",
-  "private": true,
-  "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "license": "GPL-3.0",
-  "author": "platform"
-}
diff --git a/libs/messaging-internal/project.json b/libs/messaging-internal/project.json
deleted file mode 100644
index ad55cde5c20..00000000000
--- a/libs/messaging-internal/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "messaging-internal",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/messaging-internal/src",
-  "projectType": "library",
-  "tags": [],
-  "targets": {
-    "build": {
-      "executor": "@nx/js:tsc",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "outputPath": "dist/libs/messaging-internal",
-        "main": "libs/messaging-internal/src/index.ts",
-        "tsConfig": "libs/messaging-internal/tsconfig.lib.json",
-        "assets": ["libs/messaging-internal/*.md"]
-      }
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["libs/messaging-internal/**/*.ts"]
-      }
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "libs/messaging-internal/jest.config.js"
-      }
-    }
-  }
-}
diff --git a/libs/messaging-internal/src/index.ts b/libs/messaging-internal/src/index.ts
deleted file mode 100644
index 08763d48bc5..00000000000
--- a/libs/messaging-internal/src/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Built in implementations
-export { SubjectMessageSender } from "./subject-message.sender";
-
-// Helpers meant to be used only by other implementations
-export { tagAsExternal, getCommand } from "./helpers";
diff --git a/libs/messaging-internal/src/messaging-internal.spec.ts b/libs/messaging-internal/src/messaging-internal.spec.ts
deleted file mode 100644
index b2b50a218bd..00000000000
--- a/libs/messaging-internal/src/messaging-internal.spec.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import * as lib from "./index";
-
-describe("messaging-internal", () => {
-  // This test will fail until something is exported from index.ts
-  it("should work", () => {
-    expect(lib).toBeDefined();
-  });
-});
diff --git a/libs/messaging-internal/tsconfig.eslint.json b/libs/messaging-internal/tsconfig.eslint.json
deleted file mode 100644
index 3daf120441a..00000000000
--- a/libs/messaging-internal/tsconfig.eslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": ["src/**/*.ts", "src/**/*.js"],
-  "exclude": ["**/build", "**/dist"]
-}
diff --git a/libs/messaging-internal/tsconfig.json b/libs/messaging-internal/tsconfig.json
deleted file mode 100644
index 62ebbd94647..00000000000
--- a/libs/messaging-internal/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}
diff --git a/libs/messaging-internal/tsconfig.lib.json b/libs/messaging-internal/tsconfig.lib.json
deleted file mode 100644
index 9cbf6736007..00000000000
--- a/libs/messaging-internal/tsconfig.lib.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "declaration": true,
-    "types": ["node"]
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": ["jest.config.js", "src/**/*.spec.ts"]
-}
diff --git a/libs/messaging-internal/tsconfig.spec.json b/libs/messaging-internal/tsconfig.spec.json
deleted file mode 100644
index 1275f148a18..00000000000
--- a/libs/messaging-internal/tsconfig.spec.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "moduleResolution": "node10",
-    "types": ["jest", "node"]
-  },
-  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
-}
diff --git a/libs/messaging/package.json b/libs/messaging/package.json
index 01c8d7cb0e7..7f83f0170c8 100644
--- a/libs/messaging/package.json
+++ b/libs/messaging/package.json
@@ -4,8 +4,8 @@
   "description": "Services for sending and recieving messages from different contexts of the same application.",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/messaging/project.json b/libs/messaging/project.json
index f00e0bd2dc9..224e9781f81 100644
--- a/libs/messaging/project.json
+++ b/libs/messaging/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/messaging",
         "main": "libs/messaging/src/index.ts",
         "tsConfig": "libs/messaging/tsconfig.lib.json",
-        "assets": ["libs/messaging/*.md"]
+        "assets": ["libs/messaging/*.md"],
+        "rootDir": "libs/messaging/src"
       }
     },
     "lint": {
diff --git a/libs/messaging-internal/src/helpers.spec.ts b/libs/messaging/src/helpers.spec.ts
similarity index 92%
rename from libs/messaging-internal/src/helpers.spec.ts
rename to libs/messaging/src/helpers.spec.ts
index 5a97ff959cc..35bc07b8caf 100644
--- a/libs/messaging-internal/src/helpers.spec.ts
+++ b/libs/messaging/src/helpers.spec.ts
@@ -1,8 +1,8 @@
 import { Subject, firstValueFrom } from "rxjs";
 
-import { CommandDefinition, isExternalMessage, Message } from "@bitwarden/messaging";
-
 import { getCommand, tagAsExternal } from "./helpers";
+import { isExternalMessage } from "./is-external-message";
+import { CommandDefinition, Message } from "./types";
 
 describe("helpers", () => {
   describe("getCommand", () => {
diff --git a/libs/messaging-internal/src/helpers.ts b/libs/messaging/src/helpers.ts
similarity index 81%
rename from libs/messaging-internal/src/helpers.ts
rename to libs/messaging/src/helpers.ts
index 00231b455b7..e505f558522 100644
--- a/libs/messaging-internal/src/helpers.ts
+++ b/libs/messaging/src/helpers.ts
@@ -1,6 +1,7 @@
 import { map } from "rxjs";
 
-import { CommandDefinition, EXTERNAL_SOURCE_TAG } from "@bitwarden/messaging";
+import { EXTERNAL_SOURCE_TAG } from "./is-external-message";
+import { CommandDefinition } from "./types";
 
 export const getCommand = (
   commandDefinition: CommandDefinition<Record<string, unknown>> | string,
diff --git a/libs/messaging/src/index.ts b/libs/messaging/src/index.ts
index 9090ff581c1..8bb8212e660 100644
--- a/libs/messaging/src/index.ts
+++ b/libs/messaging/src/index.ts
@@ -2,3 +2,7 @@ export { MessageListener } from "./message.listener";
 export { MessageSender } from "./message.sender";
 export { Message, CommandDefinition } from "./types";
 export { isExternalMessage, EXTERNAL_SOURCE_TAG } from "./is-external-message";
+
+// Internal implementations
+export { SubjectMessageSender } from "./subject-message.sender";
+export { tagAsExternal, getCommand } from "./helpers";
diff --git a/libs/messaging-internal/src/subject-message.sender.spec.ts b/libs/messaging/src/subject-message.sender.spec.ts
similarity index 96%
rename from libs/messaging-internal/src/subject-message.sender.spec.ts
rename to libs/messaging/src/subject-message.sender.spec.ts
index e3e5305d1b2..04c7eaa59c8 100644
--- a/libs/messaging-internal/src/subject-message.sender.spec.ts
+++ b/libs/messaging/src/subject-message.sender.spec.ts
@@ -1,8 +1,7 @@
 import { bufferCount, firstValueFrom, Subject } from "rxjs";
 
-import { CommandDefinition, Message } from "@bitwarden/messaging";
-
 import { SubjectMessageSender } from "./subject-message.sender";
+import { CommandDefinition, Message } from "./types";
 
 describe("SubjectMessageSender", () => {
   const subject = new Subject<Message<{ test: number }>>();
diff --git a/libs/messaging-internal/src/subject-message.sender.ts b/libs/messaging/src/subject-message.sender.ts
similarity index 83%
rename from libs/messaging-internal/src/subject-message.sender.ts
rename to libs/messaging/src/subject-message.sender.ts
index e8df5913b01..ebbd821dcb0 100644
--- a/libs/messaging-internal/src/subject-message.sender.ts
+++ b/libs/messaging/src/subject-message.sender.ts
@@ -1,8 +1,8 @@
 import { Subject } from "rxjs";
 
-import { CommandDefinition, Message, MessageSender } from "@bitwarden/messaging";
-
 import { getCommand } from "./helpers";
+import { MessageSender } from "./message.sender";
+import { CommandDefinition, Message } from "./types";
 
 export class SubjectMessageSender implements MessageSender {
   constructor(private readonly messagesSubject: Subject<Message<Record<string, unknown>>>) {}
diff --git a/libs/messaging/tsconfig.lib.json b/libs/messaging/tsconfig.lib.json
index 1f3b89d988e..9cbf6736007 100644
--- a/libs/messaging/tsconfig.lib.json
+++ b/libs/messaging/tsconfig.lib.json
@@ -5,12 +5,6 @@
     "declaration": true,
     "types": ["node"]
   },
-  "include": [
-    "src/**/*.ts",
-    "../messaging-internal/src/subject-message.sender.spec.ts",
-    "../messaging-internal/src/subject-message.sender.ts",
-    "../messaging-internal/src/helpers.spec.ts",
-    "../messaging-internal/src/helpers.ts"
-  ],
+  "include": ["src/**/*.ts"],
   "exclude": ["jest.config.js", "src/**/*.spec.ts"]
 }
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/nx-plugin/package.json b/libs/nx-plugin/package.json
index 8a3bdebf9ac..8d132bad96b 100644
--- a/libs/nx-plugin/package.json
+++ b/libs/nx-plugin/package.json
@@ -4,8 +4,8 @@
   "description": "Custom Nx tools like generators and executors for Bitwarden projects",
   "private": true,
   "type": "commonjs",
-  "main": "./src/index.js",
-  "types": "./src/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "Platform",
   "generators": "./generators.json"
diff --git a/libs/nx-plugin/project.json b/libs/nx-plugin/project.json
index 7456cf03264..1d4931e1674 100644
--- a/libs/nx-plugin/project.json
+++ b/libs/nx-plugin/project.json
@@ -34,7 +34,8 @@
             "glob": "executors.json",
             "output": "."
           }
-        ]
+        ],
+        "rootDir": "libs/nx-plugin/src"
       }
     },
     "lint": {
diff --git a/libs/nx-plugin/src/generators/files/package.json__tmpl__ b/libs/nx-plugin/src/generators/files/package.json__tmpl__
index b4da6154ce4..6b032fd6701 100644
--- a/libs/nx-plugin/src/generators/files/package.json__tmpl__
+++ b/libs/nx-plugin/src/generators/files/package.json__tmpl__
@@ -4,8 +4,8 @@
   "description": "<%= description %>",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "<%= team %>"
 }
\ No newline at end of file
diff --git a/libs/nx-plugin/src/generators/files/project.json__tmpl__ b/libs/nx-plugin/src/generators/files/project.json__tmpl__
index 50671e56715..e9685af75e9 100644
--- a/libs/nx-plugin/src/generators/files/project.json__tmpl__
+++ b/libs/nx-plugin/src/generators/files/project.json__tmpl__
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/<%= name %>",
         "main": "libs/<%= name %>/src/index.ts",
         "tsConfig": "libs/<%= name %>/tsconfig.lib.json",
-        "assets": ["libs/<%= name%>/*.md"]
+        "assets": ["libs/<%= name %>/*.md"],
+        "rootDir": "libs/<%= name %>/src"
       }
     },
     "lint": {
diff --git a/libs/platform/package.json b/libs/platform/package.json
index 093019b446d..b063def1a9b 100644
--- a/libs/platform/package.json
+++ b/libs/platform/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/platform/project.json b/libs/platform/project.json
new file mode 100644
index 00000000000..3164502eed1
--- /dev/null
+++ b/libs/platform/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/platform",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/platform/src",
+  "projectType": "library",
+  "tags": ["scope:platform", "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/platform/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/pricing/src/components/cart-summary/cart-summary.component.html b/libs/pricing/src/components/cart-summary/cart-summary.component.html
new file mode 100644
index 00000000000..dfa3a797eb3
--- /dev/null
+++ b/libs/pricing/src/components/cart-summary/cart-summary.component.html
@@ -0,0 +1,136 @@
+@let passwordManager = this.passwordManager();
+@let additionalStorage = this.additionalStorage();
+@let secretsManager = this.secretsManager();
+@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">
+      <h2
+        bitTypography="h4"
+        id="purchase-summary-heading"
+        class="!tw-m-0"
+        data-testid="purchase-summary-heading-total"
+      >
+        {{ "total" | i18n }}: {{ total() | currency: "USD" : "symbol" }} USD
+      </h2>
+      <span bitTypography="h3">&nbsp;</span>
+      <span bitTypography="body1" class="tw-text-main">/ {{ passwordManager.cadence | i18n }}</span>
+    </div>
+    <button
+      type="button"
+      size="small"
+      (click)="toggleExpanded()"
+      [bitIconButton]="isExpanded() ? 'bwi-angle-up' : 'bwi-angle-down'"
+      [label]="
+        isExpanded() ? ('Collapse purchase details' | i18n) : ('Expand purchase details' | i18n)
+      "
+      [attr.aria-expanded]="isExpanded()"
+      [attr.aria-controls]="'purchase-summary-details'"
+      data-testid="toggle-purchase-summary-details"
+    ></button>
+  </div>
+
+  @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 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 class="tw-flex-1">
+            <div bitTypography="body1" class="tw-text-muted">
+              {{ passwordManager.quantity }} {{ passwordManager.name | i18n }} x
+              {{ passwordManager.cost | currency: "USD" : "symbol" }}
+              /
+              {{ passwordManager.cadence | i18n }}
+            </div>
+          </div>
+          <div bitTypography="body1" class="tw-text-muted" data-testid="password-manager-total">
+            {{ passwordManagerTotal() | currency: "USD" : "symbol" }}
+          </div>
+        </div>
+
+        <!-- Additional Storage -->
+        @if (additionalStorage) {
+          <div class="tw-flex tw-justify-between">
+            <div class="tw-flex-1">
+              <div bitTypography="body1" class="tw-text-muted">
+                {{ additionalStorage.quantity }} {{ additionalStorage.name | i18n }} x
+                {{ additionalStorage.cost | currency: "USD" : "symbol" }} /
+                {{ additionalStorage.cadence | i18n }}
+              </div>
+            </div>
+            <div bitTypography="body1" class="tw-text-muted" data-testid="additional-storage-total">
+              {{ additionalStorageTotal() | currency: "USD" : "symbol" }}
+            </div>
+          </div>
+        }
+      </div>
+
+      <!-- Secrets Manager Section -->
+      @if (secretsManager) {
+        <div 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 bitTypography="body1" class="tw-text-muted">
+              {{ secretsManager.seats.quantity }} {{ secretsManager.seats.name | i18n }} x
+              {{ secretsManager.seats.cost | currency: "USD" : "symbol" }}
+              / {{ secretsManager.seats.cadence | i18n }}
+            </div>
+            <div
+              bitTypography="body1"
+              class="tw-text-muted"
+              data-testid="secrets-manager-seats-total"
+            >
+              {{ secretsManagerSeatsTotal() | currency: "USD" : "symbol" }}
+            </div>
+          </div>
+
+          <!-- Additional Service Accounts -->
+          @if (additionalServiceAccounts) {
+            <div class="tw-flex tw-justify-between">
+              <div bitTypography="body1" class="tw-text-muted">
+                {{ additionalServiceAccounts.quantity }}
+                {{ additionalServiceAccounts.name | i18n }} x
+                {{ additionalServiceAccounts.cost | currency: "USD" : "symbol" }}
+                /
+                {{ additionalServiceAccounts.cadence | i18n }}
+              </div>
+              <div
+                bitTypography="body1"
+                class="tw-text-muted"
+                data-testid="additional-service-accounts-total"
+              >
+                {{ additionalServiceAccountsTotal() | currency: "USD" : "symbol" }}
+              </div>
+            </div>
+          }
+        </div>
+      }
+
+      <!-- Estimated Tax -->
+      <div 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" }}
+        </div>
+      </div>
+
+      <!-- Total -->
+      <div 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 }}
+        </div>
+      </div>
+    </div>
+  }
+</div>
diff --git a/libs/pricing/src/components/cart-summary/cart-summary.component.mdx b/libs/pricing/src/components/cart-summary/cart-summary.component.mdx
new file mode 100644
index 00000000000..79f36bb2523
--- /dev/null
+++ b/libs/pricing/src/components/cart-summary/cart-summary.component.mdx
@@ -0,0 +1,352 @@
+import { Meta, Story, Canvas } from "@storybook/addon-docs";
+import * as CartSummaryStories from "./cart-summary.component.stories";
+
+<Meta of={CartSummaryStories} />
+
+# Cart Summary
+
+A reusable UI component for displaying order summary information with consistent styling and
+behavior across Bitwarden applications.
+
+<Canvas of={CartSummaryStories.Default} />
+
+## Table of Contents
+
+- [Usage](#usage)
+- [API](#api)
+  - [Inputs](#inputs)
+  - [Events](#events)
+- [Data Structure](#data-structure)
+- [Flexibility](#flexibility)
+- [Design](#design)
+- [Examples](#examples)
+  - [Yearly Cadence](#yearly-cadence)
+  - [With Additional Storage](#with-additional-storage)
+  - [With Secrets Manager](#with-secrets-manager)
+  - [With Secrets Manager and Additional Service Accounts](#with-secrets-manager-and-additional-service-accounts)
+  - [All Products](#all-products)
+  - [Premium Plan](#premium-plan)
+  - [Family Plan](#family-plan)
+- [Features](#features)
+- [Do's and Don'ts](#dos-and-donts)
+- [Accessibility](#accessibility)
+
+## Usage
+
+The cart summary component is designed to be used in checkout and subscription interfaces to display
+order details, prices, and totals.
+
+```ts
+import { CartSummaryComponent, LineItem } from "@bitwarden/pricing";
+```
+
+```html
+<billing-cart-summary
+  [passwordManager]="passwordManagerItem"
+  [additionalStorage]="additionalStorageItem"
+  [secretsManager]="secretsManagerItems"
+  [estimatedTax]="taxAmount"
+>
+</billing-cart-summary>
+```
+
+## API
+
+### Inputs
+
+| Input               | Type                                                                     | Description                                                     |
+| ------------------- | ------------------------------------------------------------------------ | --------------------------------------------------------------- |
+| `passwordManager`   | `LineItem`                                                               | **Required.** The Password Manager product line item            |
+| `additionalStorage` | `LineItem \| undefined`                                                  | **Optional.** Additional storage line item, if applicable       |
+| `secretsManager`    | `{ seats: LineItem; additionalServiceAccounts?: LineItem } \| undefined` | **Optional.** Secrets Manager related line items, if applicable |
+| `estimatedTax`      | `number`                                                                 | **Required.** Estimated tax amount                              |
+
+### Events
+
+The cart summary component does not emit any events, but it does have internal behavior for
+collapsing and expanding the view.
+
+## Data Structure
+
+The component uses the following LineItem data structure:
+
+```typescript
+export type LineItem = {
+  quantity: number; // Number of items
+  name: string; // Display name of the item
+  cost: number; // Cost of each item
+  cadence: "month" | "year"; // Billing period
+};
+```
+
+## Flexibility
+
+The cart summary component provides flexibility through its structured input properties:
+
+```html
+<!-- Basic usage with only Password Manager -->
+<billing-cart-summary
+  [passwordManager]="{
+    quantity: 5,
+    name: 'members',
+    cost: 50.00,
+    cadence: 'month'
+  }"
+  [estimatedTax]="9.60"
+>
+</billing-cart-summary>
+
+<!-- With Additional Storage -->
+<billing-cart-summary
+  [passwordManager]="{
+    quantity: 5,
+    name: 'members',
+    cost: 50.00,
+    cadence: 'month'
+  }"
+  [additionalStorage]="{
+    quantity: 2,
+    name: 'additionalStorageGB',
+    cost: 10.00,
+    cadence: 'month'
+  }"
+  [estimatedTax]="12.00"
+>
+</billing-cart-summary>
+```
+
+## Design
+
+The component follows the Bitwarden design system with:
+
+- **Collapsible Interface**: Toggles between compact and detailed views
+- **Clean Styling**: Uses Tailwind utility classes for consistent appearance
+- **Modern Angular**: Uses `@if` control flow and `@let` with signal inputs
+- **Signal inputs**: Type-safe inputs using Angular's signal-based input API
+- **Typography**: Consistent text styling using the typography module
+- **Layout**: Flexbox layout with clear section boundaries
+- **Interactivity**: Collapsible summary with intuitive toggle behavior
+- **Accessibility**: Semantic structure with proper button and icon usage using IconButtonModule
+
+## Examples
+
+### Yearly Cadence
+
+Show cart with yearly subscription:
+
+<Canvas of={CartSummaryStories.PasswordManagerYearlyCadence} />
+
+```html
+<billing-cart-summary
+  [passwordManager]="{
+    quantity: 5,
+    name: 'members',
+    cost: 500.00,
+    cadence: 'year'
+  }"
+  [estimatedTax]="120.00"
+>
+</billing-cart-summary>
+```
+
+### With Additional Storage
+
+Show cart with password manager and additional storage:
+
+<Canvas of={CartSummaryStories.WithAdditionalStorage} />
+
+```html
+<billing-cart-summary
+  [passwordManager]="{
+    quantity: 5,
+    name: 'members',
+    cost: 50.00,
+    cadence: 'month'
+  }"
+  [additionalStorage]="{
+    quantity: 2,
+    name: 'additionalStorageGB',
+    cost: 10.00,
+    cadence: 'month'
+  }"
+  [estimatedTax]="12.00"
+>
+</billing-cart-summary>
+```
+
+### With Secrets Manager
+
+Show cart with password manager and secrets manager seats only:
+
+<Canvas of={CartSummaryStories.SecretsManagerSeatsOnly} />
+
+```html
+<billing-cart-summary
+  [passwordManager]="{
+    quantity: 5,
+    name: 'members',
+    cost: 50.00,
+    cadence: 'month'
+  }"
+  [secretsManager]="{
+    seats: {
+      quantity: 3,
+      name: 'members',
+      cost: 30.00,
+      cadence: 'month'
+    }
+  }"
+  [estimatedTax]="16.00"
+>
+</billing-cart-summary>
+```
+
+### With Secrets Manager and Additional Service Accounts
+
+Show cart with password manager, secrets manager seats, and additional service accounts:
+
+<Canvas of={CartSummaryStories.SecretsManagerSeatsAndServiceAccounts} />
+
+```html
+<billing-cart-summary
+  [passwordManager]="{
+    quantity: 5,
+    name: 'members',
+    cost: 50.00,
+    cadence: 'month'
+  }"
+  [secretsManager]="{
+    seats: {
+      quantity: 3,
+      name: 'members',
+      cost: 30.00,
+      cadence: 'month'
+    },
+    additionalServiceAccounts: {
+      quantity: 2,
+      name: 'additionalServiceAccounts',
+      cost: 6.00,
+      cadence: 'month'
+    }
+  }"
+  [estimatedTax]="16.00"
+>
+</billing-cart-summary>
+```
+
+### All Products
+
+Show a cart with all available products:
+
+<Canvas of={CartSummaryStories.AllProducts} />
+
+```html
+<billing-cart-summary
+  [passwordManager]="{
+    quantity: 5,
+    name: 'members',
+    cost: 50.00,
+    cadence: 'month'
+  }"
+  [additionalStorage]="{
+    quantity: 2,
+    name: 'additionalStorageGB',
+    cost: 10.00,
+    cadence: 'month'
+  }"
+  [secretsManager]="{
+    seats: {
+      quantity: 3,
+      name: 'members',
+      cost: 30.00,
+      cadence: 'month'
+    },
+    additionalServiceAccounts: {
+      quantity: 2,
+      name: 'additionalServiceAccounts',
+      cost: 6.00,
+      cadence: 'month'
+    }
+  }"
+  [estimatedTax]="19.20"
+>
+</billing-cart-summary>
+```
+
+### Premium Plan
+
+Show cart with premium plan:
+
+<Canvas of={CartSummaryStories.PremiumPlan} />
+```html
+<billing-cart-summary
+  [passwordManager]="{
+    quantity: 1,
+    name: 'premiumMembership',
+    cost: 10.00,
+    cadence: 'month'
+  }"
+  [estimatedTax]="2.71"
+>
+</billing-cart-summary>
+```
+
+### Families Plan
+
+Show cart with families plan:
+
+<Canvas of={CartSummaryStories.FamiliesPlan} />
+```html
+<billing-cart-summary
+  [passwordManager]="{
+    quantity: 1,
+    name: 'familiesMembership',
+    cost: 40.00,
+    cadence: 'month'
+  }"
+  [estimatedTax]="4.67"
+>
+</billing-cart-summary>
+```
+
+## Features
+
+- **Collapsible Interface**: Users can toggle between a summary view showing only the total and a
+  detailed view showing all line items
+- **Line Item Grouping**: Organizes items by product category (Password Manager, Secrets Manager)
+- **Dynamic Calculations**: Automatically calculates and displays subtotals and totals using Angular
+  signals and computed values
+- **Flexible Structure**: Accommodates different combinations of products and add-ons
+- **Consistent Formatting**: Maintains uniform display of prices, quantities, and cadence
+- **Modern Angular Patterns**: Uses `@let` to efficiently store and reuse signal values in the
+  template
+
+## Do's and Don'ts
+
+### ✅ Do
+
+- Use consistent naming and formatting for line items
+- Include clear quantity and unit pricing information
+- Ensure tax estimates are accurate and clearly labeled
+- Maintain consistent cadence formats across related items
+- Use the same cadence for all items within a single cart
+- Use localized strings for LineItem names
+
+### ❌ Don't
+
+- Mix monthly and yearly cadences within the same cart
+- Omit required inputs (passwordManager, estimatedTax)
+- Modify the component's internal calculations
+- Use inconsistent formatting for monetary values
+- Override the default styles and layout
+
+## Accessibility
+
+The component includes:
+
+- Semantic HTML structure with proper headings
+- Button element for the collapsible toggle
+- Keyboard navigation support
+- Clear visual indication of expanded state
+- Descriptive labels and text
+- Sufficient color contrast for text elements
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
new file mode 100644
index 00000000000..9e48e7f5c20
--- /dev/null
+++ b/libs/pricing/src/components/cart-summary/cart-summary.component.spec.ts
@@ -0,0 +1,209 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+
+import { CartSummaryComponent, LineItem } from "./cart-summary.component";
+
+describe("CartSummaryComponent", () => {
+  let component: CartSummaryComponent;
+  let fixture: ComponentFixture<CartSummaryComponent>;
+
+  const mockPasswordManager: LineItem = {
+    quantity: 5,
+    name: "Password Manager",
+    cost: 50,
+    cadence: "month",
+  };
+
+  const mockAdditionalStorage: LineItem = {
+    quantity: 2,
+    name: "Additional Storage",
+    cost: 10,
+    cadence: "month",
+  };
+
+  const mockSecretsManager = {
+    seats: {
+      quantity: 3,
+      name: "Secrets Manager Seats",
+      cost: 30,
+      cadence: "month" as "month" | "year",
+    },
+    additionalServiceAccounts: {
+      quantity: 2,
+      name: "Additional Service Accounts",
+      cost: 6,
+      cadence: "month" as "month" | "year",
+    },
+  };
+
+  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;
+
+    // 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.detectChanges();
+  }
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [CartSummaryComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CartSummaryComponent);
+    component = fixture.componentInstance;
+
+    // Default setup with all inputs
+    setupComponent();
+  });
+
+  it("should create", () => {
+    // Assert
+    expect(component).toBeTruthy();
+  });
+
+  describe("UI Toggle Functionality", () => {
+    it("should toggle expanded state when the button is clicked", () => {
+      // Arrange
+      expect(component.isExpanded()).toBe(true);
+      const toggleButton = fixture.debugElement.query(By.css("button[type='button']"));
+      expect(toggleButton).toBeTruthy();
+
+      // Act - First click (collapse)
+      toggleButton.triggerEventHandler("click", null);
+      fixture.detectChanges();
+
+      // Assert - Component is collapsed
+      expect(component.isExpanded()).toBe(false);
+      const icon = fixture.debugElement.query(By.css("i.bwi"));
+      expect(icon.nativeElement.classList.contains("bwi-angle-down")).toBe(true);
+
+      // Act - Second click (expand)
+      toggleButton.triggerEventHandler("click", null);
+      fixture.detectChanges();
+
+      // Assert - Component is expanded again
+      expect(component.isExpanded()).toBe(true);
+      expect(icon.nativeElement.classList.contains("bwi-angle-up")).toBe(true);
+    });
+
+    it("should hide details when collapsed", () => {
+      // Arrange
+      component.isExpanded.set(false);
+      fixture.detectChanges();
+
+      // Act / Assert
+      const detailsSection = fixture.debugElement.query(By.css(".tw-mb-4.tw-pb-4.tw-text-muted"));
+      expect(detailsSection).toBeFalsy();
+    });
+
+    it("should show details when expanded", () => {
+      // Arrange
+      component.isExpanded.set(true);
+      fixture.detectChanges();
+
+      // Act / Assert
+      const detailsSection = fixture.debugElement.query(By.css(".tw-mb-4.tw-pb-4.tw-text-muted"));
+      expect(detailsSection).toBeTruthy();
+    });
+  });
+
+  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 *)"));
+
+      // Act/ Assert
+      expect(pmSection).toBeTruthy();
+      expect(pmHeading.nativeElement.textContent.trim()).toBe("Password Manager");
+      expect(pmLineItem.nativeElement.textContent).toContain("5 Members");
+      expect(pmLineItem.nativeElement.textContent).toContain("$50.00");
+      expect(pmLineItem.nativeElement.textContent).toContain("month");
+      expect(pmTotal.nativeElement.textContent).toContain("$250.00"); // 5 * $50
+    });
+
+    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;
+      // Act/Assert
+
+      expect(storageItem).toBeTruthy();
+      expect(storageText).toContain("2 Additional 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;
+
+      // 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("$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
+    });
+
+    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 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",
+        ),
+      );
+
+      // Act / Assert
+      expect(taxSection.nativeElement.textContent).toContain("Estimated Tax");
+      expect(taxSection.nativeElement.textContent).toContain("$9.60");
+
+      expect(topTotal.nativeElement.textContent).toContain(expectedTotal);
+
+      expect(bottomTotal.nativeElement.textContent).toContain(expectedTotal);
+    });
+  });
+});
diff --git a/libs/pricing/src/components/cart-summary/cart-summary.component.stories.ts b/libs/pricing/src/components/cart-summary/cart-summary.component.stories.ts
new file mode 100644
index 00000000000..26938123e03
--- /dev/null
+++ b/libs/pricing/src/components/cart-summary/cart-summary.component.stories.ts
@@ -0,0 +1,191 @@
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { IconButtonModule, TypographyModule } from "@bitwarden/components";
+
+import { CartSummaryComponent } from "./cart-summary.component";
+
+export default {
+  title: "Billing/Cart Summary",
+  component: CartSummaryComponent,
+  description: "A summary of the items in the cart, including pricing details.",
+  decorators: [
+    moduleMetadata({
+      imports: [TypographyModule, IconButtonModule],
+      // Return the same value for all keys for simplicity
+      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;
+              }
+            },
+          },
+        },
+      ],
+    }),
+  ],
+  args: {
+    passwordManager: {
+      quantity: 5,
+      name: "members",
+      cost: 50.0,
+      cadence: "month",
+    },
+    estimatedTax: 9.6,
+  },
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/nuFrzHsgEoEk2Sm8fWOGuS/Premium-Upgrade-flows--pricing-increase-?node-id=877-23653&t=OpDXkupIsvfbh4jT-4",
+    },
+  },
+} as Meta<CartSummaryComponent>;
+
+type Story = StoryObj<CartSummaryComponent>;
+export const Default: Story = {};
+
+export const WithAdditionalStorage: Story = {
+  args: {
+    ...Default.args,
+    additionalStorage: {
+      quantity: 2,
+      name: "additionalStorageGB",
+      cost: 10.0,
+      cadence: "month",
+    },
+    estimatedTax: 12.0,
+  },
+};
+
+export const PasswordManagerYearlyCadence: Story = {
+  args: {
+    passwordManager: {
+      quantity: 5,
+      name: "members",
+      cost: 500.0,
+      cadence: "year",
+    },
+    estimatedTax: 120.0,
+  },
+};
+
+export const SecretsManagerSeatsOnly: Story = {
+  args: {
+    ...Default.args,
+    secretsManager: {
+      seats: {
+        quantity: 3,
+        name: "members",
+        cost: 30.0,
+        cadence: "month",
+      },
+    },
+    estimatedTax: 16.0,
+  },
+};
+
+export const SecretsManagerSeatsAndServiceAccounts: Story = {
+  args: {
+    ...Default.args,
+    secretsManager: {
+      seats: {
+        quantity: 3,
+        name: "members",
+        cost: 30.0,
+        cadence: "month",
+      },
+      additionalServiceAccounts: {
+        quantity: 2,
+        name: "additionalServiceAccountsV2",
+        cost: 6.0,
+        cadence: "month",
+      },
+    },
+    estimatedTax: 16.0,
+  },
+};
+
+export const AllProducts: Story = {
+  args: {
+    ...Default.args,
+    additionalStorage: {
+      quantity: 2,
+      name: "additionalStorageGB",
+      cost: 10.0,
+      cadence: "month",
+    },
+    secretsManager: {
+      seats: {
+        quantity: 3,
+        name: "members",
+        cost: 30.0,
+        cadence: "month",
+      },
+      additionalServiceAccounts: {
+        quantity: 2,
+        name: "additionalServiceAccountsV2",
+        cost: 6.0,
+        cadence: "month",
+      },
+    },
+    estimatedTax: 19.2,
+  },
+};
+
+export const FamiliesPlan: Story = {
+  args: {
+    passwordManager: {
+      quantity: 1,
+      name: "familiesMembership",
+      cost: 40.0,
+      cadence: "year",
+    },
+    estimatedTax: 4.67,
+  },
+};
+
+export const PremiumPlan: Story = {
+  args: {
+    passwordManager: {
+      quantity: 1,
+      name: "premiumMembership",
+      cost: 10.0,
+      cadence: "year",
+    },
+    estimatedTax: 2.71,
+  },
+};
diff --git a/libs/pricing/src/components/cart-summary/cart-summary.component.ts b/libs/pricing/src/components/cart-summary/cart-summary.component.ts
new file mode 100644
index 00000000000..b21276b5038
--- /dev/null
+++ b/libs/pricing/src/components/cart-summary/cart-summary.component.ts
@@ -0,0 +1,92 @@
+import { CurrencyPipe } from "@angular/common";
+import { Component, computed, input, signal } from "@angular/core";
+
+import { TypographyModule, IconButtonModule } from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+
+export type LineItem = {
+  quantity: number;
+  name: string;
+  cost: number;
+  cadence: "month" | "year";
+};
+
+/**
+ * A reusable UI-only component that displays a cart summary with line items.
+ * This component has no external dependencies and performs minimal logic -
+ * it only displays data and allows expanding/collapsing of line items.
+ */
+@Component({
+  selector: "billing-cart-summary",
+  templateUrl: "./cart-summary.component.html",
+  imports: [TypographyModule, IconButtonModule, CurrencyPipe, I18nPipe],
+})
+export class CartSummaryComponent {
+  // Required inputs
+  passwordManager = input.required<LineItem>();
+  additionalStorage = input<LineItem>();
+  secretsManager = input<{ seats: LineItem; additionalServiceAccounts?: LineItem }>();
+  estimatedTax = input.required<number>();
+
+  // UI state
+  isExpanded = signal(true);
+
+  /**
+   * Calculates total for password manager line item
+   */
+  readonly passwordManagerTotal = computed<number>(() => {
+    return this.passwordManager().quantity * this.passwordManager().cost;
+  });
+
+  /**
+   * Calculates total for additional storage line item if present
+   */
+  readonly additionalStorageTotal = computed<number>(() => {
+    const storage = this.additionalStorage();
+    return storage ? storage.quantity * storage.cost : 0;
+  });
+
+  /**
+   * Calculates total for secrets manager seats if present
+   */
+  readonly secretsManagerSeatsTotal = computed<number>(() => {
+    const sm = this.secretsManager();
+    return sm?.seats ? sm.seats.quantity * sm.seats.cost : 0;
+  });
+
+  /**
+   * Calculates total for secrets manager service accounts if present
+   */
+  readonly additionalServiceAccountsTotal = computed<number>(() => {
+    const sm = this.secretsManager();
+    return sm?.additionalServiceAccounts
+      ? sm.additionalServiceAccounts.quantity * sm.additionalServiceAccounts.cost
+      : 0;
+  });
+
+  /**
+   * Calculates the total of all line items
+   */
+  readonly total = computed<number>(() => this.getTotalCost());
+
+  /**
+   * Toggles the expanded/collapsed state of the cart items
+   */
+  toggleExpanded(): void {
+    this.isExpanded.update((value: boolean) => !value);
+  }
+
+  /**
+   * Gets the total cost of all line items in the cart
+   * @returns The total cost as a number
+   */
+  private getTotalCost(): number {
+    return (
+      this.passwordManagerTotal() +
+      this.additionalStorageTotal() +
+      this.secretsManagerSeatsTotal() +
+      this.additionalServiceAccountsTotal() +
+      this.estimatedTax()
+    );
+  }
+}
diff --git a/libs/pricing/src/index.ts b/libs/pricing/src/index.ts
index 9eeb2de518d..d7c7772bfcb 100644
--- a/libs/pricing/src/index.ts
+++ b/libs/pricing/src/index.ts
@@ -1,2 +1,3 @@
 // Components
 export * from "./components/pricing-card/pricing-card.component";
+export * from "./components/cart-summary/cart-summary.component";
diff --git a/libs/serialization/package.json b/libs/serialization/package.json
index d582d28ac23..09d1e05e19d 100644
--- a/libs/serialization/package.json
+++ b/libs/serialization/package.json
@@ -4,8 +4,8 @@
   "description": "Core serialization utilities",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/serialization/project.json b/libs/serialization/project.json
index 3fe8968ea4b..9f8a75cd6e9 100644
--- a/libs/serialization/project.json
+++ b/libs/serialization/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/serialization",
         "main": "libs/serialization/src/index.ts",
         "tsConfig": "libs/serialization/tsconfig.lib.json",
-        "assets": ["libs/serialization/*.md"]
+        "assets": ["libs/serialization/*.md"],
+        "rootDir": "libs/serialization/src"
       }
     },
     "lint": {
diff --git a/libs/state-internal/package.json b/libs/state-internal/package.json
index 2a625220598..b8634a672f3 100644
--- a/libs/state-internal/package.json
+++ b/libs/state-internal/package.json
@@ -4,8 +4,8 @@
   "description": "The internal parts of @bitwarden/state that should not be used by other teams.",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/state-internal/project.json b/libs/state-internal/project.json
index fde95837ff8..cad7b6529f9 100644
--- a/libs/state-internal/project.json
+++ b/libs/state-internal/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/state-internal",
         "main": "libs/state-internal/src/index.ts",
         "tsConfig": "libs/state-internal/tsconfig.lib.json",
-        "assets": ["libs/state-internal/*.md"]
+        "assets": ["libs/state-internal/*.md"],
+        "rootDir": "libs/state-internal/src"
       }
     },
     "lint": {
diff --git a/libs/state-test-utils/package.json b/libs/state-test-utils/package.json
index 9fd9aa64e5f..f4c2fb45a19 100644
--- a/libs/state-test-utils/package.json
+++ b/libs/state-test-utils/package.json
@@ -4,8 +4,8 @@
   "description": "Test utilities and fakes for state management",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/state-test-utils/project.json b/libs/state-test-utils/project.json
index ef524e5347b..39a50cc2050 100644
--- a/libs/state-test-utils/project.json
+++ b/libs/state-test-utils/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/state-test-utils",
         "main": "libs/state-test-utils/src/index.ts",
         "tsConfig": "libs/state-test-utils/tsconfig.lib.json",
-        "assets": ["libs/state-test-utils/*.md"]
+        "assets": ["libs/state-test-utils/*.md"],
+        "rootDir": "libs/state-test-utils/src"
       }
     },
     "lint": {
diff --git a/libs/state/package.json b/libs/state/package.json
index 2c25647e4e3..62805f6a084 100644
--- a/libs/state/package.json
+++ b/libs/state/package.json
@@ -4,8 +4,8 @@
   "description": "Centralized application state management",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/state/project.json b/libs/state/project.json
index 85313ddf14d..44da4e912d6 100644
--- a/libs/state/project.json
+++ b/libs/state/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/state",
         "main": "libs/state/src/index.ts",
         "tsConfig": "libs/state/tsconfig.lib.json",
-        "assets": ["libs/state/*.md"]
+        "assets": ["libs/state/*.md"],
+        "rootDir": "libs/state/src"
       }
     },
     "lint": {
diff --git a/libs/state/src/core/state-definitions.ts b/libs/state/src/core/state-definitions.ts
index b85e2742942..1c09b071e99 100644
--- a/libs/state/src/core/state-definitions.ts
+++ b/libs/state/src/core/state-definitions.ts
@@ -66,11 +66,13 @@ export const PIN_DISK = new StateDefinition("pinUnlock", "disk");
 export const PIN_MEMORY = new StateDefinition("pinUnlock", "memory");
 export const ROUTER_DISK = new StateDefinition("router", "disk");
 export const SSO_DISK = new StateDefinition("ssoLogin", "disk");
+export const SSO_DISK_LOCAL = new StateDefinition("ssoLoginLocal", "disk", { web: "disk-local" });
 export const TOKEN_DISK = new StateDefinition("token", "disk");
 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");
@@ -109,9 +111,6 @@ export const NEW_WEB_LAYOUT_BANNER_DISK = new StateDefinition("newWebLayoutBanne
 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", {
diff --git a/libs/storage-core/package.json b/libs/storage-core/package.json
index 7b18e4dcb5f..4f566ef2056 100644
--- a/libs/storage-core/package.json
+++ b/libs/storage-core/package.json
@@ -4,8 +4,8 @@
   "description": "Abstractions over storage APIs",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/storage-core/project.json b/libs/storage-core/project.json
index 9b4a3e00fc1..4f30b2469dd 100644
--- a/libs/storage-core/project.json
+++ b/libs/storage-core/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/storage-core",
         "main": "libs/storage-core/src/index.ts",
         "tsConfig": "libs/storage-core/tsconfig.lib.json",
-        "assets": ["libs/storage-core/*.md"]
+        "assets": ["libs/storage-core/*.md"],
+        "rootDir": "libs/storage-core/src"
       }
     },
     "lint": {
diff --git a/libs/storage-test-utils/package.json b/libs/storage-test-utils/package.json
index 22d83f2334e..6fcca07803d 100644
--- a/libs/storage-test-utils/package.json
+++ b/libs/storage-test-utils/package.json
@@ -4,8 +4,8 @@
   "description": "Test tools for the storage library",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/storage-test-utils/project.json b/libs/storage-test-utils/project.json
index f1aad63c9e3..f5e28fa57f2 100644
--- a/libs/storage-test-utils/project.json
+++ b/libs/storage-test-utils/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/storage-test-utils",
         "main": "libs/storage-test-utils/src/index.ts",
         "tsConfig": "libs/storage-test-utils/tsconfig.lib.json",
-        "assets": ["libs/storage-test-utils/*.md"]
+        "assets": ["libs/storage-test-utils/*.md"],
+        "rootDir": "libs/storage-test-utils/src"
       }
     },
     "lint": {
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 066309a8bfc..68c286de3d3 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
@@ -7,7 +7,10 @@ module.exports = {
   testMatch: ["**/+(*.)+(spec).+(ts)"],
   preset: "ts-jest",
   testEnvironment: "jsdom",
-  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../../../../",
-  }),
+  moduleNameMapper: pathsToModuleNameMapper(
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
+    {
+      prefix: "<rootDir>/../../../../../",
+    },
+  ),
 };
diff --git a/libs/tools/export/vault-export/vault-export-core/package.json b/libs/tools/export/vault-export/vault-export-core/package.json
index c7fcd26d884..887f64a2f0c 100644
--- a/libs/tools/export/vault-export/vault-export-core/package.json
+++ b/libs/tools/export/vault-export/vault-export-core/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest"
   }
 }
diff --git a/libs/tools/export/vault-export/vault-export-core/project.json b/libs/tools/export/vault-export/vault-export-core/project.json
new file mode 100644
index 00000000000..c7f085a342b
--- /dev/null
+++ b/libs/tools/export/vault-export/vault-export-core/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/vault-export-core",
+  "$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/tools/export/vault-export/vault-export-core/src",
+  "projectType": "library",
+  "tags": ["scope:vault-export-core", "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/tools/export/vault-export/vault-export-core/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/tools/export/vault-export/vault-export-core/src/index.ts b/libs/tools/export/vault-export/vault-export-core/src/index.ts
index 46166750ad7..181b4e4b23c 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/index.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/index.ts
@@ -7,3 +7,4 @@ export * from "./services/org-vault-export.service";
 export * from "./services/individual-vault-export.service.abstraction";
 export * from "./services/individual-vault-export.service";
 export * from "./services/export-helper";
+export * from "./services/api";
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/api/default-vault-export-api.service.ts b/libs/tools/export/vault-export/vault-export-core/src/services/api/default-vault-export-api.service.ts
new file mode 100644
index 00000000000..c3fca8f1145
--- /dev/null
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/api/default-vault-export-api.service.ts
@@ -0,0 +1,24 @@
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationExportResponse } from "@bitwarden/common/admin-console/models/response/organization-export.response";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+
+import { VaultExportApiService } from "./vault-export-api.service.abstraction";
+
+/**
+ * Service for handling vault export API interactions.
+ * @param apiService - An instance of {@link ApiService} used to make HTTP requests.
+ */
+export class DefaultVaultExportApiService implements VaultExportApiService {
+  constructor(private apiService: ApiService) {}
+
+  async getOrganizationExport(organizationId: OrganizationId): Promise<OrganizationExportResponse> {
+    const r = await this.apiService.send(
+      "GET",
+      "/organizations/" + organizationId + "/export",
+      undefined,
+      true,
+      true,
+    );
+    return new OrganizationExportResponse(r);
+  }
+}
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/api/index.ts b/libs/tools/export/vault-export/vault-export-core/src/services/api/index.ts
new file mode 100644
index 00000000000..4b0413dd1c6
--- /dev/null
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/api/index.ts
@@ -0,0 +1,2 @@
+export * from "./vault-export-api.service.abstraction";
+export * from "./default-vault-export-api.service";
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.abstraction.ts b/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.abstraction.ts
new file mode 100644
index 00000000000..40756dea29b
--- /dev/null
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.abstraction.ts
@@ -0,0 +1,13 @@
+import { OrganizationExportResponse } from "@bitwarden/common/admin-console/models/response/organization-export.response";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+
+export abstract class VaultExportApiService {
+  /**
+   * Retrieves the export data for a specific organization.
+   * @param organizationId The ID of the organization to export.
+   * @returns A promise that resolves to the organization export response.
+   */
+  abstract getOrganizationExport(
+    organizationId: OrganizationId,
+  ): Promise<OrganizationExportResponse>;
+}
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.spec.ts b/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.spec.ts
new file mode 100644
index 00000000000..275187a4151
--- /dev/null
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.spec.ts
@@ -0,0 +1,33 @@
+import { mock, MockProxy } from "jest-mock-extended";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+
+import { DefaultVaultExportApiService } from "./default-vault-export-api.service";
+import { VaultExportApiService } from "./vault-export-api.service.abstraction";
+
+describe("VaultExportApiService", () => {
+  let apiServiceMock: MockProxy<ApiService>;
+  let sut: VaultExportApiService;
+
+  beforeEach(() => {
+    apiServiceMock = mock<ApiService>();
+    sut = new DefaultVaultExportApiService(apiServiceMock);
+  });
+
+  it("should call apiService.send with correct parameters", async () => {
+    const orgId: OrganizationId = "test-org-id" as OrganizationId;
+    const apiResponse = { foo: "bar" };
+    apiServiceMock.send.mockResolvedValue(apiResponse);
+
+    await sut.getOrganizationExport(orgId);
+
+    expect(apiServiceMock.send).toHaveBeenCalledWith(
+      "GET",
+      `/organizations/${orgId}/export`,
+      undefined,
+      true,
+      true,
+    );
+  });
+});
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.abstraction.ts b/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.abstraction.ts
index a2adae8aa91..e34094c6ef5 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.abstraction.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.abstraction.ts
@@ -1,8 +1,10 @@
+import { UserId } from "@bitwarden/common/types/guid";
+
 import { ExportedVault } from "../types";
 
 import { ExportFormat } from "./vault-export.service.abstraction";
 
 export abstract class IndividualVaultExportServiceAbstraction {
-  abstract getExport: (format: ExportFormat) => Promise<ExportedVault>;
-  abstract getPasswordProtectedExport: (password: string) => Promise<ExportedVault>;
+  abstract getExport: (userId: UserId, format: ExportFormat) => Promise<ExportedVault>;
+  abstract getPasswordProtectedExport: (userId: UserId, password: string) => Promise<ExportedVault>;
 }
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 7552f675c64..a2df4ec27dc 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
@@ -3,7 +3,6 @@ import * as JSZip from "jszip";
 import { BehaviorSubject, of } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AccountInfo, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import {
@@ -175,7 +174,6 @@ describe("VaultExportService", () => {
   let keyService: MockProxy<KeyService>;
   let encryptService: MockProxy<EncryptService>;
   let kdfConfigService: MockProxy<KdfConfigService>;
-  let accountService: MockProxy<AccountService>;
   let apiService: MockProxy<ApiService>;
   let restrictedSubject: BehaviorSubject<RestrictedCipherType[]>;
   let restrictedItemTypesService: Partial<RestrictedItemTypesService>;
@@ -191,7 +189,6 @@ describe("VaultExportService", () => {
     keyService = mock<KeyService>();
     encryptService = mock<EncryptService>();
     kdfConfigService = mock<KdfConfigService>();
-    accountService = mock<AccountService>();
     apiService = mock<ApiService>();
 
     keyService.userKey$.mockReturnValue(new BehaviorSubject("mockOriginalUserKey" as any));
@@ -202,14 +199,6 @@ describe("VaultExportService", () => {
       isCipherRestricted$: jest.fn().mockReturnValue(of(false)),
     };
 
-    const accountInfo: AccountInfo = {
-      email: "",
-      emailVerified: true,
-      name: undefined,
-    };
-    const activeAccount = { id: userId, ...accountInfo };
-    accountService.activeAccount$ = new BehaviorSubject(activeAccount);
-
     fetchMock = jest.fn().mockResolvedValue({});
     global.fetch = fetchMock;
 
@@ -236,7 +225,6 @@ describe("VaultExportService", () => {
       encryptService,
       cryptoFunctionService,
       kdfConfigService,
-      accountService,
       apiService,
       restrictedItemTypesService as RestrictedItemTypesService,
     );
@@ -245,7 +233,7 @@ describe("VaultExportService", () => {
   it("exports unencrypted user ciphers", async () => {
     cipherService.getAllDecrypted.mockResolvedValue(UserCipherViews.slice(0, 1));
 
-    const actual = await exportService.getExport("json");
+    const actual = await exportService.getExport(userId, "json");
     expect(typeof actual.data).toBe("string");
     const exportedData = actual as ExportedVaultAsString;
     expectEqualCiphers(UserCipherViews.slice(0, 1), exportedData.data);
@@ -254,7 +242,7 @@ describe("VaultExportService", () => {
   it("exports encrypted json user ciphers", async () => {
     cipherService.getAll.mockResolvedValue(UserCipherDomains.slice(0, 1));
 
-    const actual = await exportService.getExport("encrypted_json");
+    const actual = await exportService.getExport(userId, "encrypted_json");
     expect(typeof actual.data).toBe("string");
     const exportedData = actual as ExportedVaultAsString;
     expectEqualCiphers(UserCipherDomains.slice(0, 1), exportedData.data);
@@ -263,7 +251,7 @@ describe("VaultExportService", () => {
   it("does not unencrypted export trashed user items", async () => {
     cipherService.getAllDecrypted.mockResolvedValue(UserCipherViews);
 
-    const actual = await exportService.getExport("json");
+    const actual = await exportService.getExport(userId, "json");
     expect(typeof actual.data).toBe("string");
     const exportedData = actual as ExportedVaultAsString;
     expectEqualCiphers(UserCipherViews.slice(0, 2), exportedData.data);
@@ -272,7 +260,7 @@ describe("VaultExportService", () => {
   it("does not encrypted export trashed user items", async () => {
     cipherService.getAll.mockResolvedValue(UserCipherDomains);
 
-    const actual = await exportService.getExport("encrypted_json");
+    const actual = await exportService.getExport(userId, "encrypted_json");
     expect(typeof actual.data).toBe("string");
     const exportedData = actual as ExportedVaultAsString;
     expectEqualCiphers(UserCipherDomains.slice(0, 2), exportedData.data);
@@ -291,7 +279,7 @@ describe("VaultExportService", () => {
     const testCiphers = [UserCipherViews[0], cardCipher, UserCipherViews[1]];
     cipherService.getAllDecrypted.mockResolvedValue(testCiphers);
 
-    const actual = await exportService.getExport("json");
+    const actual = await exportService.getExport(userId, "json");
     expect(typeof actual.data).toBe("string");
     const exportedData = actual as ExportedVaultAsString;
 
@@ -311,7 +299,7 @@ describe("VaultExportService", () => {
     const testCiphers = [UserCipherDomains[0], cardCipher, UserCipherDomains[1]];
     cipherService.getAll.mockResolvedValue(testCiphers);
 
-    const actual = await exportService.getExport("encrypted_json");
+    const actual = await exportService.getExport(userId, "encrypted_json");
     expect(typeof actual.data).toBe("string");
     const exportedData = actual as ExportedVaultAsString;
 
@@ -323,7 +311,7 @@ describe("VaultExportService", () => {
       cipherService.getAllDecrypted.mockResolvedValue([]);
       folderService.getAllDecryptedFromState.mockResolvedValue([]);
 
-      const exportedVault = await exportService.getExport("zip");
+      const exportedVault = await exportService.getExport(userId, "zip");
 
       expect(exportedVault.type).toBe("application/zip");
       const exportZip = exportedVault as ExportedVaultAsBlob;
@@ -348,7 +336,7 @@ describe("VaultExportService", () => {
       cipherService.getAllDecrypted.mockResolvedValue([cipherView, orgCipherView]);
       folderService.getAllDecryptedFromState.mockResolvedValue([]);
 
-      const exportedVault = await exportService.getExport("zip");
+      const exportedVault = await exportService.getExport(userId, "zip");
 
       const zip = await JSZip.loadAsync(exportedVault.data);
       const data = await zip.file("data.json")?.async("string");
@@ -380,7 +368,7 @@ describe("VaultExportService", () => {
         global.Request = jest.fn(() => {}) as any;
 
         await expect(async () => {
-          await exportService.getExport("zip");
+          await exportService.getExport(userId, "zip");
         }).rejects.toThrow("Error downloading attachment");
       },
     );
@@ -408,7 +396,7 @@ describe("VaultExportService", () => {
       global.Request = jest.fn(() => {}) as any;
 
       await expect(async () => {
-        await exportService.getExport("zip");
+        await exportService.getExport(userId, "zip");
       }).rejects.toThrow("Error decrypting attachment");
     });
 
@@ -434,7 +422,7 @@ describe("VaultExportService", () => {
       ) as any;
       global.Request = jest.fn(() => {}) as any;
 
-      const exportedVault = await exportService.getExport("zip");
+      const exportedVault = await exportService.getExport(userId, "zip");
 
       expect(exportedVault.type).toBe("application/zip");
       const exportZip = exportedVault as ExportedVaultAsBlob;
@@ -464,7 +452,7 @@ describe("VaultExportService", () => {
         jest.spyOn(Utils, "fromBufferToB64").mockReturnValue(salt);
         cipherService.getAllDecrypted.mockResolvedValue(UserCipherViews.slice(0, 1));
 
-        exportedVault = await exportService.getPasswordProtectedExport(password);
+        exportedVault = await exportService.getPasswordProtectedExport(userId, password);
         exportString = exportedVault.data;
         exportObject = JSON.parse(exportString);
       });
@@ -491,7 +479,7 @@ describe("VaultExportService", () => {
 
       it("has a mac property", async () => {
         encryptService.encryptString.mockResolvedValue(mac);
-        exportedVault = await exportService.getPasswordProtectedExport(password);
+        exportedVault = await exportService.getPasswordProtectedExport(userId, password);
         exportString = exportedVault.data;
         exportObject = JSON.parse(exportString);
 
@@ -500,7 +488,7 @@ describe("VaultExportService", () => {
 
       it("has data property", async () => {
         encryptService.encryptString.mockResolvedValue(data);
-        exportedVault = await exportService.getPasswordProtectedExport(password);
+        exportedVault = await exportService.getPasswordProtectedExport(userId, password);
         exportString = exportedVault.data;
         exportObject = JSON.parse(exportString);
 
@@ -508,7 +496,7 @@ describe("VaultExportService", () => {
       });
 
       it("encrypts the data property", async () => {
-        const unEncryptedExportVault = await exportService.getExport();
+        const unEncryptedExportVault = await exportService.getExport(userId);
 
         const unEncryptedExportString = unEncryptedExportVault.data;
         expect(exportObject.data).not.toEqual(unEncryptedExportString);
@@ -520,7 +508,7 @@ describe("VaultExportService", () => {
     cipherService.getAllDecrypted.mockResolvedValue(UserCipherViews.slice(0, 1));
     folderService.folderViews$.mockReturnValue(of(UserFolderViews));
 
-    const actual = await exportService.getExport("json");
+    const actual = await exportService.getExport(userId, "json");
 
     expect(typeof actual.data).toBe("string");
     const exportedData = actual as ExportedVaultAsString;
@@ -531,7 +519,7 @@ describe("VaultExportService", () => {
     cipherService.getAll.mockResolvedValue(UserCipherDomains.slice(0, 1));
     folderService.folders$.mockReturnValue(of(UserFolders));
 
-    const actual = await exportService.getExport("encrypted_json");
+    const actual = await exportService.getExport(userId, "encrypted_json");
 
     expect(typeof actual.data).toBe("string");
     const exportedData = actual as ExportedVaultAsString;
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 2a6a97f5d41..e51c9543bba 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
@@ -5,8 +5,6 @@ import * as papa from "papaparse";
 import { firstValueFrom } from "rxjs";
 
 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 { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
@@ -49,7 +47,6 @@ export class IndividualVaultExportService
     encryptService: EncryptService,
     cryptoFunctionService: CryptoFunctionService,
     kdfConfigService: KdfConfigService,
-    private accountService: AccountService,
     private apiService: ApiService,
     private restrictedItemTypesService: RestrictedItemTypesService,
   ) {
@@ -57,10 +54,10 @@ export class IndividualVaultExportService
   }
 
   /** Creates an export of an individual vault (My Vault). Based on the provided format it will either be unencrypted, encrypted or password protected and in case zip is selected will include attachments
+   * @param userId The userId of the account requesting the export
    * @param format The format of the export
    */
-  async getExport(format: ExportFormat = "csv"): Promise<ExportedVault> {
-    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+  async getExport(userId: UserId, format: ExportFormat = "csv"): Promise<ExportedVault> {
     if (format === "encrypted_json") {
       return this.getEncryptedExport(userId);
     } else if (format === "zip") {
@@ -70,12 +67,15 @@ export class IndividualVaultExportService
   }
 
   /** Creates a password protected export of an individual vault (My Vault) as a JSON file
+   * @param userId The userId of the account requesting the export
    * @param password The password to encrypt the export with
    * @returns A password-protected encrypted individual vault export
    */
-  async getPasswordProtectedExport(password: string): Promise<ExportedVaultAsString> {
-    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    const exportVault = await this.getExport("json");
+  async getPasswordProtectedExport(
+    userId: UserId,
+    password: string,
+  ): Promise<ExportedVaultAsString> {
+    const exportVault = await this.getExport(userId, "json");
 
     if (exportVault.type !== "text/plain") {
       throw new Error("Unexpected export type");
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.abstraction.ts b/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.abstraction.ts
index 002b1c2d5dc..7556b0dfa5d 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.abstraction.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.abstraction.ts
@@ -1,15 +1,19 @@
+import { UserId, OrganizationId } from "@bitwarden/common/types/guid";
+
 import { ExportedVaultAsString } from "../types";
 
 import { ExportFormat } from "./vault-export.service.abstraction";
 
 export abstract class OrganizationVaultExportServiceAbstraction {
   abstract getPasswordProtectedExport: (
-    organizationId: string,
+    userId: UserId,
+    organizationId: OrganizationId,
     password: string,
     onlyManagedCollections: boolean,
   ) => Promise<ExportedVaultAsString>;
   abstract getOrganizationExport: (
-    organizationId: string,
+    userId: UserId,
+    organizationId: OrganizationId,
     format: ExportFormat,
     onlyManagedCollections: boolean,
   ) => Promise<ExportedVaultAsString>;
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 404a5d6cf3c..53952938aa8 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
@@ -10,14 +10,12 @@ import {
   CollectionDetailsResponse,
   CollectionView,
 } from "@bitwarden/admin-console/common";
-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 { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 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";
@@ -25,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 {
@@ -34,6 +33,7 @@ import {
   ExportedVaultAsString,
 } from "../types";
 
+import { VaultExportApiService } from "./api/vault-export-api.service.abstraction";
 import { BaseVaultExportService } from "./base-vault-export.service";
 import { ExportHelper } from "./export-helper";
 import { OrganizationVaultExportServiceAbstraction } from "./org-vault-export.service.abstraction";
@@ -45,32 +45,33 @@ export class OrganizationVaultExportService
 {
   constructor(
     private cipherService: CipherService,
-    private apiService: ApiService,
+    private vaultExportApiService: VaultExportApiService,
     pinService: PinServiceAbstraction,
     private keyService: KeyService,
     encryptService: EncryptService,
     cryptoFunctionService: CryptoFunctionService,
     private collectionService: CollectionService,
     kdfConfigService: KdfConfigService,
-    private accountService: AccountService,
     private restrictedItemTypesService: RestrictedItemTypesService,
   ) {
     super(pinService, encryptService, cryptoFunctionService, kdfConfigService);
   }
 
   /** Creates a password protected export of an organizational vault.
+   * @param userId The userId of the account requesting the export
    * @param organizationId The organization id
    * @param password The password to protect the export
    * @param onlyManagedCollections If true only managed collections will be exported
    * @returns The exported vault
    */
   async getPasswordProtectedExport(
-    organizationId: string,
+    userId: UserId,
+    organizationId: OrganizationId,
     password: string,
     onlyManagedCollections: boolean,
   ): Promise<ExportedVaultAsString> {
-    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
     const exportVault = await this.getOrganizationExport(
+      userId,
       organizationId,
       "json",
       onlyManagedCollections,
@@ -84,6 +85,7 @@ export class OrganizationVaultExportService
   }
 
   /** Creates an export of an organizational vault. Based on the provided format it will either be unencrypted, encrypted
+   * @param userId The userId of the account requesting the export
    * @param organizationId The organization id
    * @param format The format of the export
    * @param onlyManagedCollections If true only managed collections will be exported
@@ -94,7 +96,8 @@ export class OrganizationVaultExportService
    * @throws Error if the organization policies prevent the export
    */
   async getOrganizationExport(
-    organizationId: string,
+    userId: UserId,
+    organizationId: OrganizationId,
     format: ExportFormat = "csv",
     onlyManagedCollections: boolean,
   ): Promise<ExportedVaultAsString> {
@@ -105,14 +108,13 @@ export class OrganizationVaultExportService
     if (format === "zip") {
       throw new Error("Zip export not supported for organization");
     }
-    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
 
     if (format === "encrypted_json") {
       return {
         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;
     }
@@ -128,7 +130,7 @@ export class OrganizationVaultExportService
 
   private async getOrganizationDecryptedExport(
     activeUserId: UserId,
-    organizationId: string,
+    organizationId: OrganizationId,
     format: "json" | "csv",
   ): Promise<string> {
     const decCollections: CollectionView[] = [];
@@ -138,8 +140,8 @@ export class OrganizationVaultExportService
     const restrictions = await firstValueFrom(this.restrictedItemTypesService.restricted$);
 
     promises.push(
-      this.apiService.getOrganizationExport(organizationId).then((exportData) => {
-        const exportPromises: any = [];
+      this.vaultExportApiService.getOrganizationExport(organizationId).then((exportData) => {
+        const exportPromises: Promise<void>[] = [];
         if (exportData != null) {
           if (exportData.collections != null && exportData.collections.length > 0) {
             exportData.collections.forEach((c) => {
@@ -148,9 +150,7 @@ export class OrganizationVaultExportService
               );
               exportPromises.push(
                 firstValueFrom(this.keyService.activeUserOrgKeys$)
-                  .then((keys) =>
-                    collection.decrypt(keys[organizationId as OrganizationId], this.encryptService),
-                  )
+                  .then((keys) => collection.decrypt(keys[organizationId], this.encryptService))
                   .then((decCol) => {
                     decCollections.push(decCol);
                   }),
@@ -186,47 +186,46 @@ export class OrganizationVaultExportService
     return this.buildJsonExport(decCollections, decCiphers);
   }
 
-  private async getOrganizationEncryptedExport(organizationId: string): Promise<string> {
+  private async getOrganizationEncryptedExport(
+    userId: UserId,
+    organizationId: OrganizationId,
+  ): Promise<string> {
     const collections: Collection[] = [];
-    let ciphers: Cipher[] = [];
-    const promises = [];
-
-    promises.push(
-      this.apiService.getCollections(organizationId).then((c) => {
-        if (c != null && c.data != null && c.data.length > 0) {
-          c.data.forEach((r) => {
-            const collection = Collection.fromCollectionData(
-              new CollectionData(r as CollectionDetailsResponse),
-            );
-            collections.push(collection);
-          });
-        }
-      }),
-    );
+    const ciphers: Cipher[] = [];
 
     const restrictions = await firstValueFrom(this.restrictedItemTypesService.restricted$);
 
-    promises.push(
-      this.apiService.getCiphersOrganization(organizationId).then((c) => {
-        if (c != null && c.data != null && c.data.length > 0) {
-          ciphers = c.data
-            .filter((item) => item.deletedDate === null)
-            .map((item) => new Cipher(new CipherData(item)))
-            .filter(
-              (cipher) => !this.restrictedItemTypesService.isCipherRestricted(cipher, restrictions),
-            );
-        }
-      }),
-    );
+    const exportData = await this.vaultExportApiService.getOrganizationExport(organizationId);
 
-    await Promise.all(promises);
+    if (exportData == null) {
+      return;
+    }
 
-    return this.BuildEncryptedExport(organizationId, collections, ciphers);
+    if (exportData.collections != null && exportData.collections.length > 0) {
+      exportData.collections.forEach((c) => {
+        const collection = Collection.fromCollectionData(
+          new CollectionData(c as CollectionDetailsResponse),
+        );
+        collections.push(collection);
+      });
+    }
+
+    if (exportData.ciphers != null && exportData.ciphers.length > 0) {
+      exportData.ciphers
+        .filter((c) => c.deletedDate === null)
+        .forEach((c) => {
+          const cipher = new Cipher(new CipherData(c));
+          if (!this.restrictedItemTypesService.isCipherRestricted(cipher, restrictions)) {
+            ciphers.push(cipher);
+          }
+        });
+    }
+    return this.BuildEncryptedExport(userId, organizationId, collections, ciphers);
   }
 
   private async getDecryptedManagedExport(
     activeUserId: UserId,
-    organizationId: string,
+    organizationId: OrganizationId,
     format: "json" | "csv",
   ): Promise<string> {
     let decCiphers: CipherView[] = [];
@@ -268,7 +267,7 @@ export class OrganizationVaultExportService
 
   private async getEncryptedManagedExport(
     activeUserId: UserId,
-    organizationId: string,
+    organizationId: OrganizationId,
   ): Promise<string> {
     let encCiphers: Cipher[] = [];
     let allCiphers: Cipher[] = [];
@@ -301,16 +300,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(
-    organizationId: string,
+    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 d41f1aa0a10..e25fec6eb82 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,12 +1,19 @@
+import { UserId, OrganizationId } from "@bitwarden/common/types/guid";
+
 import { ExportedVault } from "../types";
 
 export const EXPORT_FORMATS = ["csv", "json", "encrypted_json", "zip"] as const;
 export type ExportFormat = (typeof EXPORT_FORMATS)[number];
 
 export abstract class VaultExportServiceAbstraction {
-  abstract getExport: (format: ExportFormat, password: string) => Promise<ExportedVault>;
+  abstract getExport: (
+    userId: UserId,
+    format: ExportFormat,
+    password: string,
+  ) => Promise<ExportedVault>;
   abstract getOrganizationExport: (
-    organizationId: string,
+    userId: UserId,
+    organizationId: OrganizationId,
     format: ExportFormat,
     password: string,
     onlyManagedCollections?: boolean,
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.spec.ts b/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.spec.ts
index b86486d45e7..0ffe9af52b5 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.spec.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.spec.ts
@@ -1,355 +1,153 @@
 import { mock, MockProxy } from "jest-mock-extended";
-import { BehaviorSubject, of } from "rxjs";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AccountInfo, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import {
-  EncryptedString,
-  EncString,
-} from "@bitwarden/common/key-management/crypto/models/enc-string";
-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 { 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";
-import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
-import { Folder } from "@bitwarden/common/vault/models/domain/folder";
-import { Login } from "@bitwarden/common/vault/models/domain/login";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
-import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
-import {
-  RestrictedCipherType,
-  RestrictedItemTypesService,
-} from "@bitwarden/common/vault/services/restricted-item-types.service";
-import {
-  DEFAULT_KDF_CONFIG,
-  PBKDF2KdfConfig,
-  KdfConfigService,
-  KeyService,
-  KdfType,
-} from "@bitwarden/key-management";
+import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
 
-import { BuildTestObject, GetUniqueString } from "../../../../../../common/spec";
-import { ExportedVault, ExportedVaultAsString } from "../types";
-
-import { IndividualVaultExportService } from "./individual-vault-export.service";
-
-const UserCipherViews = [
-  generateCipherView(false),
-  generateCipherView(false),
-  generateCipherView(true),
-];
-
-const UserCipherDomains = [
-  generateCipherDomain(false),
-  generateCipherDomain(false),
-  generateCipherDomain(true),
-];
-
-const UserFolderViews = [generateFolderView(), generateFolderView()];
-
-const UserFolders = [generateFolder(), generateFolder()];
-
-function generateCipherView(deleted: boolean) {
-  return BuildTestObject(
-    {
-      id: GetUniqueString("id"),
-      notes: GetUniqueString("notes"),
-      type: CipherType.Login,
-      login: BuildTestObject<LoginView>(
-        {
-          username: GetUniqueString("username"),
-          password: GetUniqueString("password"),
-        },
-        LoginView,
-      ),
-      collectionIds: null,
-      deletedDate: deleted ? new Date() : null,
-    },
-    CipherView,
-  );
-}
-
-function generateCipherDomain(deleted: boolean) {
-  return BuildTestObject(
-    {
-      id: GetUniqueString("id"),
-      notes: new EncString(GetUniqueString("notes")),
-      type: CipherType.Login,
-      login: BuildTestObject<Login>(
-        {
-          username: new EncString(GetUniqueString("username")),
-          password: new EncString(GetUniqueString("password")),
-        },
-        Login,
-      ),
-      collectionIds: null,
-      deletedDate: deleted ? new Date() : null,
-    },
-    Cipher,
-  );
-}
-
-function generateFolderView() {
-  return BuildTestObject(
-    {
-      id: GetUniqueString("id"),
-      name: GetUniqueString("name"),
-      revisionDate: new Date(),
-    },
-    FolderView,
-  );
-}
-
-function generateFolder() {
-  const actual = Folder.fromJSON({
-    revisionDate: new Date("2022-08-04T01:06:40.441Z").toISOString(),
-    name: "name" as EncryptedString,
-    id: "id",
-  });
-  return actual;
-}
-
-function expectEqualCiphers(ciphers: CipherView[] | Cipher[], jsonResult: string) {
-  const actual = JSON.stringify(JSON.parse(jsonResult).items);
-  const items: CipherWithIdExport[] = [];
-  ciphers.forEach((c: CipherView | Cipher) => {
-    const item = new CipherWithIdExport();
-    item.build(c);
-    items.push(item);
-  });
-
-  expect(actual).toEqual(JSON.stringify(items));
-}
-
-function expectEqualFolderViews(folderViews: FolderView[] | Folder[], jsonResult: string) {
-  const actual = JSON.stringify(JSON.parse(jsonResult).folders);
-  const folders: FolderResponse[] = [];
-  folderViews.forEach((c) => {
-    const folder = new FolderResponse();
-    folder.id = c.id;
-    folder.name = c.name.toString();
-    folders.push(folder);
-  });
-
-  expect(actual.length).toBeGreaterThan(0);
-  expect(actual).toEqual(JSON.stringify(folders));
-}
-
-function expectEqualFolders(folders: Folder[], jsonResult: string) {
-  const actual = JSON.stringify(JSON.parse(jsonResult).folders);
-  const items: Folder[] = [];
-  folders.forEach((c) => {
-    const item = new Folder();
-    item.id = c.id;
-    item.name = c.name;
-    items.push(item);
-  });
-
-  expect(actual.length).toBeGreaterThan(0);
-  expect(actual).toEqual(JSON.stringify(items));
-}
+import { IndividualVaultExportServiceAbstraction } from "./individual-vault-export.service.abstraction";
+import { OrganizationVaultExportServiceAbstraction } from "./org-vault-export.service.abstraction";
+import { VaultExportService } from "./vault-export.service";
 
+/** Tests the vault export service which handles exporting both individual and organizational vaults */
 describe("VaultExportService", () => {
-  let exportService: IndividualVaultExportService;
-  let cryptoFunctionService: MockProxy<CryptoFunctionService>;
-  let cipherService: MockProxy<CipherService>;
-  let pinService: MockProxy<PinServiceAbstraction>;
-  let folderService: MockProxy<FolderService>;
-  let keyService: MockProxy<KeyService>;
-  let encryptService: MockProxy<EncryptService>;
-  let accountService: MockProxy<AccountService>;
-  let kdfConfigService: MockProxy<KdfConfigService>;
-  let apiService: MockProxy<ApiService>;
-  let restrictedItemTypesService: Partial<RestrictedItemTypesService>;
+  let service: VaultExportService;
+  let individualVaultExportService: MockProxy<IndividualVaultExportServiceAbstraction>;
+  let organizationVaultExportService: MockProxy<OrganizationVaultExportServiceAbstraction>;
+  let accountService: FakeAccountService;
+  const mockUserId = Utils.newGuid() as UserId;
+  const mockOrganizationId = Utils.newGuid() as OrganizationId;
 
   beforeEach(() => {
-    cryptoFunctionService = mock<CryptoFunctionService>();
-    cipherService = mock<CipherService>();
-    pinService = mock<PinServiceAbstraction>();
-    folderService = mock<FolderService>();
-    keyService = mock<KeyService>();
-    encryptService = mock<EncryptService>();
-    accountService = mock<AccountService>();
-    apiService = mock<ApiService>();
+    individualVaultExportService = mock<IndividualVaultExportServiceAbstraction>();
+    organizationVaultExportService = mock<OrganizationVaultExportServiceAbstraction>();
+    accountService = mockAccountServiceWith(mockUserId);
 
-    kdfConfigService = mock<KdfConfigService>();
-
-    folderService.folderViews$.mockReturnValue(of(UserFolderViews));
-    folderService.folders$.mockReturnValue(of(UserFolders));
-    kdfConfigService.getKdfConfig.mockResolvedValue(DEFAULT_KDF_CONFIG);
-    encryptService.encryptString.mockResolvedValue(new EncString("encrypted"));
-    keyService.userKey$.mockReturnValue(new BehaviorSubject("mockOriginalUserKey" as any));
-    const userId = "" as UserId;
-    const accountInfo: AccountInfo = {
-      email: "",
-      emailVerified: true,
-      name: undefined,
-    };
-    const activeAccount = { id: userId, ...accountInfo };
-    accountService.activeAccount$ = new BehaviorSubject(activeAccount);
-
-    restrictedItemTypesService = {
-      restricted$: new BehaviorSubject<RestrictedCipherType[]>([]),
-      isCipherRestricted: jest.fn().mockReturnValue(false),
-      isCipherRestricted$: jest.fn().mockReturnValue(of(false)),
-    };
-
-    exportService = new IndividualVaultExportService(
-      folderService,
-      cipherService,
-      pinService,
-      keyService,
-      encryptService,
-      cryptoFunctionService,
-      kdfConfigService,
+    service = new VaultExportService(
+      individualVaultExportService,
+      organizationVaultExportService,
       accountService,
-      apiService,
-      restrictedItemTypesService as RestrictedItemTypesService,
     );
   });
 
-  it("exports unencrypted user ciphers", async () => {
-    cipherService.getAllDecrypted.mockResolvedValue(UserCipherViews.slice(0, 1));
+  describe("getExport", () => {
+    it("calls checkForImpersonation with userId", async () => {
+      const spy = jest.spyOn(service as any, "checkForImpersonation");
 
-    const actual = await exportService.getExport("json");
-    expect(typeof actual.data).toBe("string");
-    const exportedData = actual as ExportedVaultAsString;
-    expectEqualCiphers(UserCipherViews.slice(0, 1), exportedData.data);
-  });
+      await service.getExport(mockUserId, "json", "");
+      expect(spy).toHaveBeenCalledWith(mockUserId);
+    });
 
-  it("exports encrypted json user ciphers", async () => {
-    cipherService.getAll.mockResolvedValue(UserCipherDomains.slice(0, 1));
+    it("validates the given userId matches the current authenticated user", async () => {
+      const anotherUserId = "another-user-id" as UserId;
 
-    const actual = await exportService.getExport("encrypted_json");
-    expect(typeof actual.data).toBe("string");
-    const exportedData = actual as ExportedVaultAsString;
-    expectEqualCiphers(UserCipherDomains.slice(0, 1), exportedData.data);
-  });
+      await expect(service.getExport(anotherUserId, "json", "")).rejects.toThrow(
+        "UserId does not match the currently authenticated user",
+      );
 
-  it("does not unencrypted export trashed user items", async () => {
-    cipherService.getAllDecrypted.mockResolvedValue(UserCipherViews);
+      expect(individualVaultExportService.getExport).not.toHaveBeenCalledWith(mockUserId, "json");
+    });
 
-    const actual = await exportService.getExport("json");
-    expect(typeof actual.data).toBe("string");
-    const exportedData = actual as ExportedVaultAsString;
-    expectEqualCiphers(UserCipherViews.slice(0, 2), exportedData.data);
-  });
+    it("calls getExport when password is empty", async () => {
+      await service.getExport(mockUserId, "json", "");
+      expect(individualVaultExportService.getExport).toHaveBeenCalledWith(mockUserId, "json");
+    });
 
-  it("does not encrypted export trashed user items", async () => {
-    cipherService.getAll.mockResolvedValue(UserCipherDomains);
+    it("throws error if format is csv and password is provided", async () => {
+      await expect(service.getExport(mockUserId, "csv", "secret")).rejects.toThrow(
+        "CSV does not support password protected export",
+      );
+      expect(individualVaultExportService.getPasswordProtectedExport).not.toHaveBeenCalled();
+      expect(individualVaultExportService.getExport).not.toHaveBeenCalled();
+    });
 
-    const actual = await exportService.getExport("encrypted_json");
-    expect(typeof actual.data).toBe("string");
-    const exportedData = actual as ExportedVaultAsString;
-    expectEqualCiphers(UserCipherDomains.slice(0, 2), exportedData.data);
-  });
+    it("calls getPasswordProtectedExport when password is provided and format is not csv", async () => {
+      await service.getExport(mockUserId, "json", "somePassword");
+      expect(individualVaultExportService.getPasswordProtectedExport).toHaveBeenCalledWith(
+        mockUserId,
+        "somePassword",
+      );
+    });
 
-  describe("password protected export", () => {
-    let exportedVault: ExportedVault;
-    let exportString: string;
-    let exportObject: any;
-    let mac: MockProxy<EncString>;
-    let data: MockProxy<EncString>;
-    const password = "password";
-    const salt = "salt";
-
-    describe("export json object", () => {
-      beforeEach(async () => {
-        mac = mock<EncString>();
-        data = mock<EncString>();
-
-        mac.encryptedString = "mac" as EncryptedString;
-        data.encryptedString = "encData" as EncryptedString;
-
-        jest.spyOn(Utils, "fromBufferToB64").mockReturnValue(salt);
-        cipherService.getAllDecrypted.mockResolvedValue(UserCipherViews.slice(0, 1));
-
-        exportedVault = await exportService.getPasswordProtectedExport(password);
-        expect(typeof exportedVault.data).toBe("string");
-        exportString = (exportedVault as ExportedVaultAsString).data;
-        exportObject = JSON.parse(exportString);
-      });
-
-      it("specifies it is encrypted", () => {
-        expect(exportObject.encrypted).toBe(true);
-      });
-
-      it("specifies it's password protected", () => {
-        expect(exportObject.passwordProtected).toBe(true);
-      });
-
-      it("specifies salt", () => {
-        expect(exportObject.salt).toEqual("salt");
-      });
-
-      it("specifies kdfIterations", () => {
-        expect(exportObject.kdfIterations).toEqual(PBKDF2KdfConfig.ITERATIONS.defaultValue);
-      });
-
-      it("has kdfType", () => {
-        expect(exportObject.kdfType).toEqual(KdfType.PBKDF2_SHA256);
-      });
-
-      it("has a mac property", async () => {
-        encryptService.encryptString.mockResolvedValue(mac);
-
-        exportedVault = await exportService.getPasswordProtectedExport(password);
-
-        expect(typeof exportedVault.data).toBe("string");
-        exportString = (exportedVault as ExportedVaultAsString).data;
-        exportObject = JSON.parse(exportString);
-        expect(exportObject.encKeyValidation_DO_NOT_EDIT).toEqual(mac.encryptedString);
-      });
-
-      it("has data property", async () => {
-        encryptService.encryptString.mockResolvedValue(data);
-
-        exportedVault = await exportService.getPasswordProtectedExport(password);
-
-        expect(typeof exportedVault.data).toBe("string");
-        exportString = (exportedVault as ExportedVaultAsString).data;
-        exportObject = JSON.parse(exportString);
-        expect(exportObject.data).toEqual(data.encryptedString);
-      });
-
-      it("encrypts the data property", async () => {
-        const unEncryptedExportVault = await exportService.getExport();
-
-        expect(typeof unEncryptedExportVault.data).toBe("string");
-        const unEncryptedExportString = (unEncryptedExportVault as ExportedVaultAsString).data;
-        expect(exportObject.data).not.toEqual(unEncryptedExportString);
-      });
+    it("uses default format csv if not provided", async () => {
+      await service.getExport(mockUserId);
+      expect(individualVaultExportService.getExport).toHaveBeenCalledWith(mockUserId, "csv");
     });
   });
 
-  it("exported unencrypted object contains folders", async () => {
-    cipherService.getAllDecrypted.mockResolvedValue(UserCipherViews.slice(0, 1));
+  describe("getOrganizationExport", () => {
+    it("calls checkForImpersonation with userId", async () => {
+      const spy = jest.spyOn(service as any, "checkForImpersonation");
 
-    const actual = await exportService.getExport("json");
+      await service.getOrganizationExport(mockUserId, mockOrganizationId, "json", "");
+      expect(spy).toHaveBeenCalledWith(mockUserId);
+    });
 
-    expect(typeof actual.data).toBe("string");
-    const exportedData = actual as ExportedVaultAsString;
-    expectEqualFolderViews(UserFolderViews, exportedData.data);
-  });
+    it("validates the given userId matches the current authenticated user", async () => {
+      const anotherUserId = "another-user-id" as UserId;
 
-  it("exported encrypted json contains folders", async () => {
-    cipherService.getAll.mockResolvedValue(UserCipherDomains.slice(0, 1));
+      await expect(
+        service.getOrganizationExport(anotherUserId, mockOrganizationId, "json", ""),
+      ).rejects.toThrow("UserId does not match the currently authenticated user");
 
-    const actual = await exportService.getExport("encrypted_json");
+      expect(organizationVaultExportService.getOrganizationExport).not.toHaveBeenCalledWith(
+        mockUserId,
+        mockOrganizationId,
+        "json",
+      );
+    });
 
-    expect(typeof actual.data).toBe("string");
-    const exportedData = actual as ExportedVaultAsString;
-    expectEqualFolders(UserFolders, exportedData.data);
+    it("calls getOrganizationExport when password is empty", async () => {
+      await service.getOrganizationExport(mockUserId, mockOrganizationId, "json", "");
+      expect(organizationVaultExportService.getOrganizationExport).toHaveBeenCalledWith(
+        mockUserId,
+        mockOrganizationId,
+        "json",
+        false,
+      );
+    });
+
+    it("throws error if format is csv and password is provided", async () => {
+      await expect(
+        service.getOrganizationExport(mockUserId, mockOrganizationId, "csv", "secret"),
+      ).rejects.toThrow("CSV does not support password protected export");
+      expect(organizationVaultExportService.getPasswordProtectedExport).not.toHaveBeenCalled();
+      expect(organizationVaultExportService.getOrganizationExport).not.toHaveBeenCalled();
+    });
+
+    it("calls getPasswordProtectedExport when password is provided and format is not csv", async () => {
+      await service.getOrganizationExport(mockUserId, mockOrganizationId, "json", "somePassword");
+      expect(organizationVaultExportService.getPasswordProtectedExport).toHaveBeenCalledWith(
+        mockUserId,
+        mockOrganizationId,
+        "somePassword",
+        false,
+      );
+    });
+
+    it("when calling getOrganizationExport without a password it passes onlyManagedCollection param on", async () => {
+      await service.getOrganizationExport(mockUserId, mockOrganizationId, "json", "", true);
+      expect(organizationVaultExportService.getOrganizationExport).toHaveBeenCalledWith(
+        mockUserId,
+        mockOrganizationId,
+        "json",
+        true,
+      );
+    });
+
+    it("when calling getOrganizationExport with a password it passes onlyManagedCollection param on", async () => {
+      await service.getOrganizationExport(
+        mockUserId,
+        mockOrganizationId,
+        "json",
+        "somePassword",
+        true,
+      );
+      expect(organizationVaultExportService.getPasswordProtectedExport).toHaveBeenCalledWith(
+        mockUserId,
+        mockOrganizationId,
+        "somePassword",
+        true,
+      );
+    });
   });
 });
-
-export class FolderResponse {
-  id: string = null;
-  name: string = null;
-}
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 8af961e2beb..b601478d06d 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,9 @@
+import { firstValueFrom } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { UserId, OrganizationId } from "@bitwarden/common/types/guid";
 
 import { ExportedVault } from "../types";
 
@@ -10,26 +15,35 @@ export class VaultExportService implements VaultExportServiceAbstraction {
   constructor(
     private individualVaultExportService: IndividualVaultExportServiceAbstraction,
     private organizationVaultExportService: OrganizationVaultExportServiceAbstraction,
+    private accountService: AccountService,
   ) {}
 
   /** Creates an export of an individual vault (My vault). Based on the provided format it will either be unencrypted, encrypted or password protected
+   * @param userId The userId of the account requesting the export
    * @param format The format of the export
    * @param password An optional password if the export should be password-protected
    * @returns The exported vault
    * @throws Error if the format is csv and a password is provided
    */
-  async getExport(format: ExportFormat = "csv", password: string = ""): Promise<ExportedVault> {
+  async getExport(
+    userId: UserId,
+    format: ExportFormat = "csv",
+    password: string = "",
+  ): Promise<ExportedVault> {
+    await this.checkForImpersonation(userId);
+
     if (!Utils.isNullOrWhitespace(password)) {
       if (format == "csv") {
         throw new Error("CSV does not support password protected export");
       }
 
-      return this.individualVaultExportService.getPasswordProtectedExport(password);
+      return this.individualVaultExportService.getPasswordProtectedExport(userId, password);
     }
-    return this.individualVaultExportService.getExport(format);
+    return this.individualVaultExportService.getExport(userId, format);
   }
 
   /** Creates an export of an organizational vault. Based on the provided format it will either be unencrypted, encrypted or password protected
+   * @param userId The userId of the account requesting the export
    * @param organizationId The organization id
    * @param format The format of the export
    * @param password The password to protect the export
@@ -42,17 +56,21 @@ export class VaultExportService implements VaultExportServiceAbstraction {
    * @throws Error if the organization policies prevent the export
    */
   async getOrganizationExport(
-    organizationId: string,
+    userId: UserId,
+    organizationId: OrganizationId,
     format: ExportFormat,
     password: string,
     onlyManagedCollections = false,
   ): Promise<ExportedVault> {
+    await this.checkForImpersonation(userId);
+
     if (!Utils.isNullOrWhitespace(password)) {
       if (format == "csv") {
         throw new Error("CSV does not support password protected export");
       }
 
       return this.organizationVaultExportService.getPasswordProtectedExport(
+        userId,
         organizationId,
         password,
         onlyManagedCollections,
@@ -60,9 +78,21 @@ export class VaultExportService implements VaultExportServiceAbstraction {
     }
 
     return this.organizationVaultExportService.getOrganizationExport(
+      userId,
       organizationId,
       format,
       onlyManagedCollections,
     );
   }
+
+  /** 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
+   */
+  private async checkForImpersonation(userId: UserId): Promise<void> {
+    const currentUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    if (userId !== currentUserId) {
+      throw new Error("UserId does not match the currently authenticated user");
+    }
+  }
 }
diff --git a/libs/tools/export/vault-export/vault-export-ui/package.json b/libs/tools/export/vault-export/vault-export-ui/package.json
index 4dc5e325124..2a2d2dc599d 100644
--- a/libs/tools/export/vault-export/vault-export-ui/package.json
+++ b/libs/tools/export/vault-export/vault-export-ui/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest --passWithNoTests"
   }
 }
diff --git a/libs/tools/export/vault-export/vault-export-ui/project.json b/libs/tools/export/vault-export/vault-export-ui/project.json
new file mode 100644
index 00000000000..c85dd5a8c27
--- /dev/null
+++ b/libs/tools/export/vault-export/vault-export-ui/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/vault-export-ui",
+  "$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/tools/export/vault-export/vault-export-ui/src",
+  "projectType": "library",
+  "tags": ["scope:vault-export-ui", "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/tools/export/vault-export/vault-export-ui/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
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..a85048c23fa 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,12 +5,10 @@ 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 { CalloutModule } from "@bitwarden/components";
 
 @Component({
@@ -30,6 +28,8 @@ export class ExportScopeCalloutComponent {
   readonly organizationId = input<string>();
   /* Optional export format, determines which individual export description to display */
   readonly exportFormat = input<string>();
+  /* The description key to use for organizational exports */
+  readonly orgExportDescription = input<string>();
 
   constructor(
     protected organizationService: OrganizationService,
@@ -37,35 +37,45 @@ 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: string,
+    exportFormat: string,
+    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 != null) {
+      // exporting from organizational vault
+      const org = await firstValueFrom(
+        this.organizationService.organizations$(userId).pipe(getById(organizationId)),
+      );
+
+      this.scopeConfig = {
+        title: "exportingOrganizationVaultTitle",
+        description: orgExportDescription,
+        scopeIdentifier: org?.name ?? "",
+      };
+    } else {
+      this.scopeConfig = {
+        // exporting from individual vault
+        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..c638e5d7dde 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"
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 0b5d3d70834..567480ac1bd 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,13 +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,
@@ -29,21 +36,23 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { PasswordStrengthV2Component } from "@bitwarden/angular/tools/password-strength/password-strength-v2.component";
 import { UserVerificationDialogComponent } from "@bitwarden/auth/angular";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-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 { 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 { 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";
+import { isId, OrganizationId } from "@bitwarden/common/types/guid";
 import {
   AsyncActionsModule,
   BitSubmitDirective,
@@ -84,32 +93,67 @@ import { ExportScopeCalloutComponent } from "./export-scope-callout.component";
   ],
 })
 export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
-  private _organizationId: string;
-
-  get organizationId(): string {
-    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.
    */
-  @Input() set organizationId(value: string) {
-    this._organizationId = value;
+  @Input() set organizationId(value: OrganizationId | string | undefined) {
+    if (Utils.isNullOrEmpty(value)) {
+      this._organizationId$.next(undefined);
+      return;
+    }
+
+    if (!isId<OrganizationId>(value)) {
+      this._organizationId$.next(undefined);
+      return;
+    }
+
+    this._organizationId$.next(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) => {
-        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.
@@ -133,11 +177,11 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
 
   /**
    * Emits when the creation and download of the export-file have succeeded
-   * - Emits an null/empty string when exporting from an individual vault
-   * - Emits the organizationId when exporting from an organizationl vault
+   * - Emits an undefined when exporting from an individual vault
+   * - Emits the organizationId when exporting from an organizational vault
    * */
   @Output()
-  onSuccessfulExport = new EventEmitter<string>();
+  onSuccessfulExport = new EventEmitter<OrganizationId | undefined>();
 
   @ViewChild(PasswordStrengthV2Component) passwordStrengthComponent: PasswordStrengthV2Component;
 
@@ -153,7 +197,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: [
@@ -194,14 +241,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) =>
@@ -209,13 +288,42 @@ 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 {
     this.exportForm.controls.vaultSelector.valueChanges
       .pipe(takeUntil(this.destroy$))
       .subscribe((value) => {
@@ -227,15 +335,50 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
           this.formatOptions.push({ name: ".zip (with attachments)", value: "zip" });
         }
       });
+  }
 
+  /**
+   * 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() {
@@ -246,6 +389,7 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
         },
       }),
     );
+
     this.generatorService
       .generate$({ on$: this.onGenerate$, account$ })
       .pipe(takeUntil(this.destroy$))
@@ -255,23 +399,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,
@@ -287,18 +437,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(
@@ -452,9 +602,11 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   protected async getExportData(): Promise<ExportedVault> {
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
     return Utils.isNullOrWhitespace(this.organizationId)
-      ? this.exportService.getExport(this.format, this.filePassword)
+      ? this.exportService.getExport(userId, this.format, this.filePassword)
       : this.exportService.getOrganizationExport(
+          userId,
           this.organizationId,
           this.format,
           this.filePassword,
diff --git a/libs/tools/generator/components/package.json b/libs/tools/generator/components/package.json
index be4bbbe4ae8..4e6ddd39df7 100644
--- a/libs/tools/generator/components/package.json
+++ b/libs/tools/generator/components/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest --passWithNoTests"
   }
 }
diff --git a/libs/tools/generator/components/project.json b/libs/tools/generator/components/project.json
new file mode 100644
index 00000000000..7deaeca8aa5
--- /dev/null
+++ b/libs/tools/generator/components/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/generator-components",
+  "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/tools/generator/components/src",
+  "projectType": "library",
+  "tags": ["scope:generator-components", "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/tools/generator/components/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/tools/generator/components/src/empty-credential-history.component.html b/libs/tools/generator/components/src/empty-credential-history.component.html
index f7f35fe9362..06dad082370 100644
--- a/libs/tools/generator/components/src/empty-credential-history.component.html
+++ b/libs/tools/generator/components/src/empty-credential-history.component.html
@@ -1,7 +1,4 @@
-<div class="tw-flex tw-flex-col tw-h-full tw-justify-center">
-  <div class="tw-text-center">
-    <bit-icon [icon]="noCredentialsIcon" aria-hidden="true"></bit-icon>
-    <h2 bitTypography="h4" class="tw-mt-3">{{ "nothingToShow" | i18n }}</h2>
-    <div>{{ "nothingGeneratedRecently" | i18n }}</div>
-  </div>
-</div>
+<bit-no-items [icon]="noCredentialsIcon">
+  <ng-container slot="title">{{ "nothingToShow" | i18n }}</ng-container>
+  <ng-container slot="description">{{ "nothingGeneratedRecently" | i18n }}</ng-container>
+</bit-no-items>
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 6ae55d33d2c..4b9bc24b33b 100644
--- a/libs/tools/generator/components/src/empty-credential-history.component.ts
+++ b/libs/tools/generator/components/src/empty-credential-history.component.ts
@@ -2,12 +2,12 @@ import { Component } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NoCredentialsIcon } from "@bitwarden/assets/svg";
-import { IconModule, TypographyModule } from "@bitwarden/components";
+import { NoItemsModule } from "@bitwarden/components";
 
 @Component({
   selector: "bit-empty-credential-history",
   templateUrl: "empty-credential-history.component.html",
-  imports: [JslibModule, IconModule, TypographyModule],
+  imports: [JslibModule, NoItemsModule],
 })
 export class EmptyCredentialHistoryComponent {
   noCredentialsIcon = NoCredentialsIcon;
diff --git a/libs/tools/generator/core/package.json b/libs/tools/generator/core/package.json
index 23ef352f9a6..00adf1c7e52 100644
--- a/libs/tools/generator/core/package.json
+++ b/libs/tools/generator/core/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest"
   }
 }
diff --git a/libs/tools/generator/core/project.json b/libs/tools/generator/core/project.json
new file mode 100644
index 00000000000..cc6f015bac9
--- /dev/null
+++ b/libs/tools/generator/core/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/generator-core",
+  "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/tools/generator/core/src",
+  "projectType": "library",
+  "tags": ["scope:generator-core", "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/tools/generator/core/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/tools/generator/extensions/history/package.json b/libs/tools/generator/extensions/history/package.json
index 5941d675536..2e61910941a 100644
--- a/libs/tools/generator/extensions/history/package.json
+++ b/libs/tools/generator/extensions/history/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest"
   }
 }
diff --git a/libs/tools/generator/extensions/history/project.json b/libs/tools/generator/extensions/history/project.json
new file mode 100644
index 00000000000..c880c9795e7
--- /dev/null
+++ b/libs/tools/generator/extensions/history/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/generator-history",
+  "$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/tools/generator/extensions/history/src",
+  "projectType": "library",
+  "tags": ["scope:generator-history", "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/tools/generator/extensions/history/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/tools/generator/extensions/legacy/package.json b/libs/tools/generator/extensions/legacy/package.json
index 151f48d5aba..eaf07d0e3ed 100644
--- a/libs/tools/generator/extensions/legacy/package.json
+++ b/libs/tools/generator/extensions/legacy/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest"
   }
 }
diff --git a/libs/tools/generator/extensions/legacy/project.json b/libs/tools/generator/extensions/legacy/project.json
new file mode 100644
index 00000000000..1dde86b58e6
--- /dev/null
+++ b/libs/tools/generator/extensions/legacy/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/generator-legacy",
+  "$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/tools/generator/extensions/legacy/src",
+  "projectType": "library",
+  "tags": ["scope:generator-legacy", "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/tools/generator/extensions/legacy/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/tools/generator/extensions/navigation/package.json b/libs/tools/generator/extensions/navigation/package.json
index 61b6d2b8da3..96b1eb3c3bb 100644
--- a/libs/tools/generator/extensions/navigation/package.json
+++ b/libs/tools/generator/extensions/navigation/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest"
   }
 }
diff --git a/libs/tools/generator/extensions/navigation/project.json b/libs/tools/generator/extensions/navigation/project.json
new file mode 100644
index 00000000000..851b00f4ecd
--- /dev/null
+++ b/libs/tools/generator/extensions/navigation/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/generator-navigation",
+  "$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/tools/generator/extensions/navigation/src",
+  "projectType": "library",
+  "tags": ["scope:generator-navigation", "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/tools/generator/extensions/navigation/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/tools/send/send-ui/package.json b/libs/tools/send/send-ui/package.json
index 98f7e0ca27e..1bfdf87da10 100644
--- a/libs/tools/send/send-ui/package.json
+++ b/libs/tools/send/send-ui/package.json
@@ -15,6 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest"
   }
 }
diff --git a/libs/tools/send/send-ui/project.json b/libs/tools/send/send-ui/project.json
new file mode 100644
index 00000000000..53ec723f83f
--- /dev/null
+++ b/libs/tools/send/send-ui/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/send-ui",
+  "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/tools/send/send-ui/src",
+  "projectType": "library",
+  "tags": ["scope:send-ui", "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/tools/send/send-ui/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
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 4bcf11bf94f..383bf4be7ec 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
@@ -153,15 +153,12 @@ export class SendAddEditDialogComponent {
    * @returns The header text.
    */
   private getHeaderText(mode: SendFormMode, type: SendType) {
-    const headerKey =
-      mode === "edit" || mode === "partial-edit" ? "editItemHeader" : "newItemHeader";
-
-    switch (type) {
-      case SendType.Text:
-        return this.i18nService.t(headerKey, this.i18nService.t("textSend"));
-      case SendType.File:
-        return this.i18nService.t(headerKey, this.i18nService.t("fileSend"));
-    }
+    const isEditMode = mode === "edit" || mode === "partial-edit";
+    const translation = {
+      [SendType.Text]: isEditMode ? "editItemHeaderTextSend" : "newItemHeaderTextSend",
+      [SendType.File]: isEditMode ? "editItemHeaderFileSend" : "newItemHeaderFileSend",
+    };
+    return this.i18nService.t(translation[type]);
   }
 
   /**
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 4e57869425c..1d5629cfd48 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
@@ -16,10 +16,10 @@
     [routerLink]="buildRouterLink(sendType.File)"
     [queryParams]="buildQueryParams(sendType.File)"
   >
-    <i class="bwi bwi-file" slot="start" aria-hidden="true"></i>
-    {{ "sendTypeFile" | i18n }}
-    <button type="button" slot="end" *ngIf="hasNoPremium" bitBadge variant="success">
-      {{ "premium" | i18n }}
-    </button>
+    <div class="tw-flex tw-items-center tw-gap-2">
+      <i class="bwi bwi-file" slot="start" aria-hidden="true"></i>
+      {{ "sendTypeFile" | i18n }}
+      <app-premium-badge></app-premium-badge>
+    </div>
   </a>
 </bit-menu>
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 ba5176e5db5..b553a343cdd 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,18 +1,19 @@
 import { CommonModule } from "@angular/common";
 import { Component, Input, OnInit } from "@angular/core";
-import { Router, RouterLink } from "@angular/router";
+import { RouterLink } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 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 { BadgeModule, ButtonModule, ButtonType, MenuModule } from "@bitwarden/components";
+import { ButtonModule, ButtonType, MenuModule } from "@bitwarden/components";
 
 @Component({
   selector: "tools-new-send-dropdown",
   templateUrl: "new-send-dropdown.component.html",
-  imports: [JslibModule, CommonModule, ButtonModule, RouterLink, MenuModule, BadgeModule],
+  imports: [JslibModule, CommonModule, ButtonModule, RouterLink, MenuModule, PremiumBadgeComponent],
 })
 export class NewSendDropdownComponent implements OnInit {
   @Input() hideIcon: boolean = false;
@@ -23,7 +24,6 @@ export class NewSendDropdownComponent implements OnInit {
   hasNoPremium = false;
 
   constructor(
-    private router: Router,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private accountService: AccountService,
   ) {}
diff --git a/libs/ui/common/package.json b/libs/ui/common/package.json
index 4ea0f8aed77..0cc6d4b153f 100644
--- a/libs/ui/common/package.json
+++ b/libs/ui/common/package.json
@@ -12,6 +12,11 @@
     "url": "https://github.com/bitwarden/clients"
   },
   "license": "GPL-3.0",
+  "scripts": {
+    "clean": "rimraf dist",
+    "build": "npm run clean && tsc",
+    "build:watch": "npm run clean && tsc -watch"
+  },
   "exports": {
     ".": {
       "import": "./src/index.ts"
diff --git a/libs/ui/common/project.json b/libs/ui/common/project.json
new file mode 100644
index 00000000000..36e4b810a0b
--- /dev/null
+++ b/libs/ui/common/project.json
@@ -0,0 +1,35 @@
+{
+  "name": "@bitwarden/ui-common",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/ui/common/src",
+  "projectType": "library",
+  "tags": ["scope:ui-common", "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/ui/common/**/*.ts"]
+      }
+    }
+  }
+}
diff --git a/libs/user-core/package.json b/libs/user-core/package.json
index 2251d2ceace..b32afd6d8f9 100644
--- a/libs/user-core/package.json
+++ b/libs/user-core/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.0",
   "description": "The very basic concept that constitutes a user, this needs to be very low level to facilitate Platform keeping their own code low level.",
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "auth"
 }
diff --git a/libs/user-core/project.json b/libs/user-core/project.json
index 60d5873208d..d2c617687d1 100644
--- a/libs/user-core/project.json
+++ b/libs/user-core/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/user-core",
         "main": "libs/user-core/src/index.ts",
         "tsConfig": "libs/user-core/tsconfig.lib.json",
-        "assets": ["libs/user-core/*.md"]
+        "assets": ["libs/user-core/*.md"],
+        "rootDir": "libs/user-core/src"
       }
     },
     "test": {
diff --git a/libs/vault/package.json b/libs/vault/package.json
index 48822f93a40..3d065320520 100644
--- a/libs/vault/package.json
+++ b/libs/vault/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/vault/project.json b/libs/vault/project.json
new file mode 100644
index 00000000000..f09118b771b
--- /dev/null
+++ b/libs/vault/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/vault",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/vault/src",
+  "projectType": "library",
+  "tags": ["scope:vault", "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/vault/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
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 5042dce8608..b83685aac94 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
@@ -10,12 +10,12 @@
       <vault-autofill-uri-option
         *ngFor="let uri of uriControls; let i = index"
         cdkDrag
-        [cdkDragDisabled]="uriControls.length <= 1"
+        [cdkDragDisabled]="uriControls.length <= 1 || autofillOptionsForm.disabled"
         [formControlName]="i"
         (remove)="removeUri(i)"
         (onKeydown)="onUriItemKeydown($event, i)"
-        [canReorder]="uriControls.length > 1"
-        [canRemove]="uriControls.length > 1"
+        [canReorder]="uriControls.length > 1 && autofillOptionsForm.enabled"
+        [canRemove]="uriControls.length > 1 && autofillOptionsForm.enabled"
         [defaultMatchDetection]="defaultMatchDetection$ | async"
         [index]="i"
       ></vault-autofill-uri-option>
diff --git a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
index 2390512c92d..65983649fd0 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
+++ b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
@@ -23,7 +23,7 @@
           data-testid="remove-uri-button"
         ></button>
       </bit-form-field>
-      <div class="tw-flex tw-items-center tw-ml-1.5">
+      <div class="tw-flex tw-items-center tw-ml-1.5" *ngIf="canReorder">
         <button
           type="button"
           bitIconButton="bwi-drag-and-drop"
@@ -32,7 +32,6 @@
           [label]="'reorderToggleButton' | i18n: uriLabel"
           (keydown)="handleKeydown($event)"
           data-testid="reorder-toggle-button"
-          *ngIf="canReorder"
         ></button>
       </div>
     </div>
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 da687f33ef9..970e6b1fb9a 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
@@ -122,4 +122,33 @@ describe("CipherFormComponent", () => {
       expect(component["updatedCipherView"]?.login.fido2Credentials).toBeNull();
     });
   });
+
+  describe("enableFormFields", () => {
+    beforeEach(() => {
+      // disable the form so enabling occurs
+      component.disableFormFields();
+    });
+
+    it("only enables the form when it is disabled", () => {
+      jest.spyOn(component["cipherForm"], "enable");
+      component.enableFormFields();
+
+      expect(component["cipherForm"].enable).toHaveBeenCalled();
+
+      component.enableFormFields();
+      component.enableFormFields();
+
+      // enable is only called once
+      expect(component["cipherForm"].enable).toHaveBeenCalledTimes(1);
+    });
+
+    it("emits formStatusChange$", (done) => {
+      component.formStatusChange$.subscribe((status) => {
+        expect(status).toBe("enabled");
+        done();
+      });
+
+      component.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 be3092861f7..19e7f9d2d90 100644
--- a/libs/vault/src/cipher-form/components/cipher-form.component.ts
+++ b/libs/vault/src/cipher-form/components/cipher-form.component.ts
@@ -17,7 +17,7 @@ import {
 } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms";
-import { Subject } from "rxjs";
+import { BehaviorSubject, Subject } from "rxjs";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherType, SecureNoteType } from "@bitwarden/common/vault/enums";
@@ -115,7 +115,7 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
   /**
    * Emitted when the form is enabled
    */
-  private formStatusChangeSubject = new Subject<"enabled" | "disabled">();
+  private formStatusChangeSubject = new BehaviorSubject<"enabled" | "disabled" | null>(null);
   @Output() formStatusChange$ = this.formStatusChangeSubject.asObservable();
 
   /**
@@ -161,9 +161,17 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
     this.formStatusChangeSubject.next("disabled");
   }
 
+  /**
+   * Enables the form, only when it is currently disabled.
+   * Child forms could have disabled some of their controls based on
+   * other factors. Enabling the form from this level should only occur
+   * when the form was disabled at this level.
+   */
   enableFormFields(): void {
-    this.cipherForm.enable({ emitEvent: false });
-    this.formStatusChangeSubject.next("enabled");
+    if (this.formStatusChangeSubject.getValue() === "disabled") {
+      this.cipherForm.enable({ emitEvent: false });
+      this.formStatusChangeSubject.next("enabled");
+    }
   }
 
   /**
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 4e3d9fb17d6..c5c1b752aef 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
@@ -107,7 +107,7 @@
           (keydown)="handleKeyDown($event, field.value.name, i)"
           data-testid="reorder-toggle-button"
           [disabled]="parentFormDisabled"
-          *ngIf="canEdit(field.value.type)"
+          *ngIf="canEdit(field.value.type) && fields.controls.length > 1"
         ></button>
       </div>
 
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..4da299ed039 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;
@@ -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", () => {
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 978675e6ad9..ced6c809724 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
@@ -186,6 +186,11 @@ export class ItemDetailsSectionComponent implements OnInit {
   }
 
   get showOwnership() {
+    // Don't show ownership field for archived ciphers
+    if (this.originalCipherView?.isArchived) {
+      return false;
+    }
+
     // Show ownership field when editing with available orgs
     const isEditingWithOrgs = this.organizations.length > 0 && this.config.mode === "edit";
 
@@ -401,6 +406,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
@@ -418,10 +434,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-view/cipher-view.component.html b/libs/vault/src/cipher-view/cipher-view.component.html
index 62425bba7b3..b523c11c7e3 100644
--- a/libs/vault/src/cipher-view/cipher-view.component.html
+++ b/libs/vault/src/cipher-view/cipher-view.component.html
@@ -12,7 +12,6 @@
   </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()">
       {{ "changeAtRiskPassword" | i18n }}
       <i class="bwi bwi-external-link tw-ml-1" aria-hidden="true"></i>
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..c775d66baac 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";
@@ -102,7 +102,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/login-credentials/login-credentials-view.component.html b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
index 53fcab70506..02b8be552bd 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
@@ -121,18 +121,11 @@
       />
     </bit-form-field>
     <bit-form-field *ngIf="cipher.login.totp">
-      <bit-label [appTextDrag]="totpCodeCopyObj?.totpCode"
-        >{{ "verificationCodeTotp" | i18n }}
-        <span
-          *ngIf="!(isPremium$ | async)"
-          bitBadge
-          variant="success"
-          class="tw-ml-2 tw-cursor-pointer"
-          (click)="getPremium(cipher.organizationId)"
-          slot="end"
-        >
-          {{ "premium" | i18n }}
-        </span>
+      <bit-label [appTextDrag]="totpCodeCopyObj?.totpCode">
+        <div class="tw-flex tw-items-center tw-gap-3">
+          {{ "verificationCodeTotp" | i18n }}
+          <app-premium-badge [organizationId]="cipher.organizationId"></app-premium-badge>
+        </div>
       </bit-label>
       <input
         id="totp"
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 9a40caf031b..5987d055e6b 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
@@ -14,6 +14,7 @@ import {
 } from "@angular/core";
 import { Observable, switchMap } from "rxjs";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -56,6 +57,7 @@ type TotpCodeValues = {
     BitTotpCountdownComponent,
     ReadOnlyCipherCardComponent,
     LinkModule,
+    PremiumBadgeComponent,
   ],
 })
 export class LoginCredentialsViewComponent implements OnChanges {
@@ -105,10 +107,6 @@ export class LoginCredentialsViewComponent implements OnChanges {
     }
   }
 
-  async getPremium(organizationId?: string) {
-    await this.premiumUpgradeService.promptForPremium(organizationId);
-  }
-
   async pwToggleValue(passwordVisible: boolean) {
     this.passwordRevealed = passwordVisible;
 
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..9890074a8c9 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,
@@ -311,12 +315,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 +372,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 +436,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 +463,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 +560,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/permit-cipher-details-popover/permit-cipher-details-popover.component.html b/libs/vault/src/components/permit-cipher-details-popover/permit-cipher-details-popover.component.html
new file mode 100644
index 00000000000..1833a148616
--- /dev/null
+++ b/libs/vault/src/components/permit-cipher-details-popover/permit-cipher-details-popover.component.html
@@ -0,0 +1,22 @@
+<button
+  type="button"
+  class="tw-border-none tw-bg-transparent tw-text-primary-600 tw-p-0"
+  [bitPopoverTriggerFor]="permitDetailsPopover"
+  position="above-center"
+  [appA11yTitle]="'aboutThisSetting' | i18n"
+  bitLink
+>
+  <i class="bwi bwi-question-circle"></i>
+</button>
+
+<bit-popover [title]="'aboutThisSetting' | i18n" #permitDetailsPopover>
+  <p>
+    {{ "permitCipherDetailsDescription" | i18n }}
+  </p>
+  <div class="tw-flex tw-gap-1.5 tw-items-center">
+    <a bitLink href="#" (click)="openLearnMore($event)" class="tw-flex">
+      {{ "learnMore" | i18n }}
+    </a>
+    <i slot="end" class="bwi bwi-external-link tw-text-primary-600" aria-hidden="true"></i>
+  </div>
+</bit-popover>
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
new file mode 100644
index 00000000000..8e80ddf7810
--- /dev/null
+++ b/libs/vault/src/components/permit-cipher-details-popover/permit-cipher-details-popover.component.ts
@@ -0,0 +1,19 @@
+import { Component, inject } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { LinkModule, PopoverModule } from "@bitwarden/components";
+
+@Component({
+  selector: "vault-permit-cipher-details-popover",
+  templateUrl: "./permit-cipher-details-popover.component.html",
+  imports: [PopoverModule, JslibModule, LinkModule],
+})
+export class PermitCipherDetailsPopoverComponent {
+  private platformUtilService = inject(PlatformUtilsService);
+
+  openLearnMore(e: Event) {
+    e.preventDefault();
+    this.platformUtilService.launchUri("https://bitwarden.com/help/website-icons/");
+  }
+}
diff --git a/libs/vault/src/index.ts b/libs/vault/src/index.ts
index f3925ac3379..efaefc77ade 100644
--- a/libs/vault/src/index.ts
+++ b/libs/vault/src/index.ts
@@ -20,6 +20,7 @@ export { openPasswordHistoryDialog } from "./components/password-history/passwor
 export * from "./components/add-edit-folder-dialog/add-edit-folder-dialog.component";
 export * from "./components/carousel";
 export * from "./components/new-cipher-menu/new-cipher-menu.component";
+export * from "./components/permit-cipher-details-popover/permit-cipher-details-popover.component";
 
 export { DefaultSshImportPromptService } from "./services/default-ssh-import-prompt.service";
 export { SshImportPromptService } from "./services/ssh-import-prompt.service";
diff --git a/libs/vault/src/services/default-change-login-password.service.spec.ts b/libs/vault/src/services/default-change-login-password.service.spec.ts
index c9628797f4d..42242f2e4a8 100644
--- a/libs/vault/src/services/default-change-login-password.service.spec.ts
+++ b/libs/vault/src/services/default-change-login-password.service.spec.ts
@@ -4,10 +4,14 @@
  */
 
 import { mock } from "jest-mock-extended";
+import { BehaviorSubject, of } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { ClientType } from "@bitwarden/common/enums";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
+import {
+  Environment,
+  EnvironmentService,
+} from "@bitwarden/common/platform/abstractions/environment.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
@@ -18,37 +22,30 @@ import { DefaultChangeLoginPasswordService } from "./default-change-login-passwo
 describe("DefaultChangeLoginPasswordService", () => {
   let service: DefaultChangeLoginPasswordService;
 
-  let mockShouldNotExistResponse: Response;
-  let mockWellKnownResponse: Response;
-
-  const getClientType = jest.fn(() => ClientType.Browser);
-
   const mockApiService = mock<ApiService>();
-  const platformUtilsService = mock<PlatformUtilsService>({
-    getClientType,
-  });
+  const mockDomainSettingsService = mock<DomainSettingsService>();
+
+  const showFavicons$ = new BehaviorSubject<boolean>(true);
 
   beforeEach(() => {
-    mockApiService.nativeFetch.mockClear();
+    mockApiService.fetch.mockClear();
+    mockApiService.fetch.mockImplementation(() =>
+      Promise.resolve({ ok: true, json: () => Promise.resolve({ uri: null }) } as Response),
+    );
 
-    // Default responses to success state
-    mockShouldNotExistResponse = new Response("Not Found", { status: 404 });
-    mockWellKnownResponse = new Response("OK", { status: 200 });
+    mockDomainSettingsService.showFavicons$ = showFavicons$;
 
-    mockApiService.nativeFetch.mockImplementation((request) => {
-      if (
-        request.url.endsWith("resource-that-should-not-exist-whose-status-code-should-not-be-200")
-      ) {
-        return Promise.resolve(mockShouldNotExistResponse);
-      }
+    const mockEnvironmentService = {
+      environment$: of({
+        getIconsUrl: () => "https://icons.bitwarden.com",
+      } as Environment),
+    } as EnvironmentService;
 
-      if (request.url.endsWith(".well-known/change-password")) {
-        return Promise.resolve(mockWellKnownResponse);
-      }
-
-      throw new Error("Unexpected request");
-    });
-    service = new DefaultChangeLoginPasswordService(mockApiService, platformUtilsService);
+    service = new DefaultChangeLoginPasswordService(
+      mockApiService,
+      mockEnvironmentService,
+      mockDomainSettingsService,
+    );
   });
 
   it("should return null for non-login ciphers", async () => {
@@ -85,7 +82,7 @@ describe("DefaultChangeLoginPasswordService", () => {
     expect(url).toBeNull();
   });
 
-  it("should check the origin for a reliable status code", async () => {
+  it("should call the icons url endpoint", async () => {
     const cipher = {
       type: CipherType.Login,
       login: Object.assign(new LoginView(), {
@@ -95,35 +92,42 @@ describe("DefaultChangeLoginPasswordService", () => {
 
     await service.getChangePasswordUrl(cipher);
 
-    expect(mockApiService.nativeFetch).toHaveBeenCalledWith(
+    expect(mockApiService.fetch).toHaveBeenCalledWith(
       expect.objectContaining({
-        url: "https://example.com/.well-known/resource-that-should-not-exist-whose-status-code-should-not-be-200",
+        url: "https://icons.bitwarden.com/change-password-uri?uri=https%3A%2F%2Fexample.com%2F",
       }),
     );
   });
 
-  it("should attempt to fetch the well-known change password URL", async () => {
+  it("should return the original URI when unable to verify the response", async () => {
+    mockApiService.fetch.mockImplementation(() =>
+      Promise.resolve({ ok: true, json: () => Promise.resolve({ uri: null }) } as Response),
+    );
+
     const cipher = {
       type: CipherType.Login,
       login: Object.assign(new LoginView(), {
-        uris: [{ uri: "https://example.com" }],
+        uris: [{ uri: "https://example.com/" }],
       }),
     } as CipherView;
 
-    await service.getChangePasswordUrl(cipher);
+    const url = await service.getChangePasswordUrl(cipher);
 
-    expect(mockApiService.nativeFetch).toHaveBeenCalledWith(
-      expect.objectContaining({
-        url: "https://example.com/.well-known/change-password",
-      }),
-    );
+    expect(url).toBe("https://example.com/");
   });
 
-  it("should return the well-known change password URL when successful at verifying the response", async () => {
+  it("should return the well known change url from the response", async () => {
+    mockApiService.fetch.mockImplementation(() => {
+      return Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve({ uri: "https://example.com/.well-known/change-password" }),
+      } as Response);
+    });
+
     const cipher = {
       type: CipherType.Login,
       login: Object.assign(new LoginView(), {
-        uris: [{ uri: "https://example.com" }],
+        uris: [{ uri: "https://example.com/" }, { uri: "https://working.com/" }],
       }),
     } as CipherView;
 
@@ -132,49 +136,20 @@ describe("DefaultChangeLoginPasswordService", () => {
     expect(url).toBe("https://example.com/.well-known/change-password");
   });
 
-  it("should return the original URI when unable to verify the response", async () => {
-    mockShouldNotExistResponse = new Response("Ok", { status: 200 });
-
-    const cipher = {
-      type: CipherType.Login,
-      login: Object.assign(new LoginView(), {
-        uris: [{ uri: "https://example.com/" }],
-      }),
-    } as CipherView;
-
-    const url = await service.getChangePasswordUrl(cipher);
-
-    expect(url).toBe("https://example.com/");
-  });
-
-  it("should return the original URI when the well-known URL is not found", async () => {
-    mockWellKnownResponse = new Response("Not Found", { status: 404 });
-
-    const cipher = {
-      type: CipherType.Login,
-      login: Object.assign(new LoginView(), {
-        uris: [{ uri: "https://example.com/" }],
-      }),
-    } as CipherView;
-
-    const url = await service.getChangePasswordUrl(cipher);
-
-    expect(url).toBe("https://example.com/");
-  });
-
   it("should try the next URI if the first one fails", async () => {
-    mockApiService.nativeFetch.mockImplementation((request) => {
-      if (
-        request.url.endsWith("resource-that-should-not-exist-whose-status-code-should-not-be-200")
-      ) {
-        return Promise.resolve(mockShouldNotExistResponse);
+    mockApiService.fetch.mockImplementation((request) => {
+      if (request.url.includes("no-wellknown.com")) {
+        return Promise.resolve({
+          ok: true,
+          json: () => Promise.resolve({ uri: null }),
+        } as Response);
       }
 
-      if (request.url.endsWith(".well-known/change-password")) {
-        if (request.url.includes("working.com")) {
-          return Promise.resolve(mockWellKnownResponse);
-        }
-        return Promise.resolve(new Response("Not Found", { status: 404 }));
+      if (request.url.includes("working.com")) {
+        return Promise.resolve({
+          ok: true,
+          json: () => Promise.resolve({ uri: "https://working.com/.well-known/change-password" }),
+        } as Response);
       }
 
       throw new Error("Unexpected request");
@@ -192,19 +167,19 @@ describe("DefaultChangeLoginPasswordService", () => {
     expect(url).toBe("https://working.com/.well-known/change-password");
   });
 
-  it("should return the first URI when the client type is not browser", async () => {
-    getClientType.mockReturnValue(ClientType.Web);
+  it("returns the first URI when `showFavicons$` setting is disabled", async () => {
+    showFavicons$.next(false);
 
     const cipher = {
       type: CipherType.Login,
       login: Object.assign(new LoginView(), {
-        uris: [{ uri: "https://example.com/" }, { uri: "https://example-2.com/" }],
+        uris: [{ uri: "https://example.com/" }, { uri: "https://another.com/" }],
       }),
     } as CipherView;
 
     const url = await service.getChangePasswordUrl(cipher);
 
-    expect(mockApiService.nativeFetch).not.toHaveBeenCalled();
     expect(url).toBe("https://example.com/");
+    expect(mockApiService.fetch).not.toHaveBeenCalled();
   });
 });
diff --git a/libs/vault/src/services/default-change-login-password.service.ts b/libs/vault/src/services/default-change-login-password.service.ts
index a0b5646c5a9..929f5819c02 100644
--- a/libs/vault/src/services/default-change-login-password.service.ts
+++ b/libs/vault/src/services/default-change-login-password.service.ts
@@ -1,9 +1,12 @@
 import { Injectable } from "@angular/core";
+import { firstValueFrom } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherType } from "@bitwarden/common/vault/enums";
+import { ChangePasswordUriResponse } from "@bitwarden/common/vault/models/response/change-password-uri.response";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { ChangeLoginPasswordService } from "../abstractions/change-login-password.service";
@@ -12,7 +15,8 @@ import { ChangeLoginPasswordService } from "../abstractions/change-login-passwor
 export class DefaultChangeLoginPasswordService implements ChangeLoginPasswordService {
   constructor(
     private apiService: ApiService,
-    private platformUtilsService: PlatformUtilsService,
+    private environmentService: EnvironmentService,
+    private domainSettingsService: DomainSettingsService,
   ) {}
 
   /**
@@ -33,24 +37,19 @@ export class DefaultChangeLoginPasswordService implements ChangeLoginPasswordSer
       return null;
     }
 
-    // CSP policies on the web and desktop restrict the application from making
-    // cross-origin requests, breaking the below .well-known URL checks.
-    // For those platforms, this will short circuit and return the first URL.
-    // PM-21024 will build a solution for the server side to handle this.
-    if (this.platformUtilsService.getClientType() !== "browser") {
+    const enableFaviconChangePassword = await firstValueFrom(
+      this.domainSettingsService.showFavicons$,
+    );
+
+    // When the setting is not enabled, return the first URL
+    if (!enableFaviconChangePassword) {
       return urls[0].href;
     }
 
     for (const url of urls) {
-      const [reliable, wellKnownChangeUrl] = await Promise.all([
-        this.hasReliableHttpStatusCode(url.origin),
-        this.getWellKnownChangePasswordUrl(url.origin),
-      ]);
+      const wellKnownChangeUrl = await this.fetchWellKnownChangePasswordUri(url.href);
 
-      // Some servers return a 200 OK for a resource that should not exist
-      // Which means we cannot trust the well-known URL is valid, so we skip it
-      // to avoid potentially sending users to a 404 page
-      if (reliable && wellKnownChangeUrl != null) {
+      if (wellKnownChangeUrl) {
         return wellKnownChangeUrl;
       }
     }
@@ -60,55 +59,41 @@ export class DefaultChangeLoginPasswordService implements ChangeLoginPasswordSer
   }
 
   /**
-   * Checks if the server returns a non-200 status code for a resource that should not exist.
-   * See https://w3c.github.io/webappsec-change-password-url/response-code-reliability.html#semantics
-   * @param urlOrigin The origin of the URL to check
+   * Fetches the well-known change-password-uri for the given URL.
+   * @returns The full URL to the change password page, or null if it could not be found.
    */
-  private async hasReliableHttpStatusCode(urlOrigin: string): Promise<boolean> {
-    try {
-      const url = new URL(
-        "./.well-known/resource-that-should-not-exist-whose-status-code-should-not-be-200",
-        urlOrigin,
-      );
+  private async fetchWellKnownChangePasswordUri(url: string): Promise<string | null> {
+    const getChangePasswordUriRequest = await this.buildChangePasswordUriRequest(url);
 
-      const request = new Request(url, {
-        method: "GET",
-        mode: "same-origin",
-        credentials: "omit",
-        cache: "no-store",
-        redirect: "follow",
-      });
+    const response = await this.apiService.fetch(getChangePasswordUriRequest);
 
-      const response = await this.apiService.nativeFetch(request);
-      return !response.ok;
-    } catch {
-      return false;
+    if (!response.ok) {
+      return null;
     }
+
+    const data = await response.json();
+
+    const { uri } = new ChangePasswordUriResponse(data);
+
+    return uri;
   }
 
   /**
-   * Builds a well-known change password URL for the given origin. Attempts to fetch the URL to ensure a valid response
-   * is returned. Returns null if the request throws or the response is not 200 OK.
-   * See https://w3c.github.io/webappsec-change-password-url/
-   * @param urlOrigin The origin of the URL to check
+   * Construct the request for the change-password-uri endpoint.
    */
-  private async getWellKnownChangePasswordUrl(urlOrigin: string): Promise<string | null> {
-    try {
-      const url = new URL("./.well-known/change-password", urlOrigin);
+  private async buildChangePasswordUriRequest(cipherUri: string): Promise<Request> {
+    const searchParams = new URLSearchParams();
+    searchParams.set("uri", cipherUri);
 
-      const request = new Request(url, {
-        method: "GET",
-        mode: "same-origin",
-        credentials: "omit",
-        cache: "no-store",
-        redirect: "follow",
-      });
+    // The change-password-uri endpoint lives within the icons service
+    // as it uses decrypted cipher data.
+    const env = await firstValueFrom(this.environmentService.environment$);
+    const iconsUrl = env.getIconsUrl();
 
-      const response = await this.apiService.nativeFetch(request);
+    const url = new URL(`${iconsUrl}/change-password-uri?${searchParams.toString()}`);
 
-      return response.ok ? url.toString() : null;
-    } catch {
-      return null;
-    }
+    return new Request(url, {
+      method: "GET",
+    });
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 1b4fe5f40e3..a955d12294e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,11 +23,11 @@
         "@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.266",
+        "@bitwarden/sdk-internal": "0.2.0-main.311",
         "@electron/fuses": "1.8.0",
         "@emotion/css": "11.13.5",
         "@koa/multer": "4.0.0",
-        "@koa/router": "13.1.0",
+        "@koa/router": "14.0.0",
         "@microsoft/signalr": "8.0.7",
         "@microsoft/signalr-protocol-msgpack": "8.0.7",
         "@ng-select/ng-select": "14.9.0",
@@ -40,7 +40,7 @@
         "buffer": "6.0.3",
         "bufferutil": "4.0.9",
         "chalk": "4.1.2",
-        "commander": "11.1.0",
+        "commander": "14.0.0",
         "core-js": "3.45.0",
         "form-data": "4.0.4",
         "https-proxy-agent": "7.0.6",
@@ -53,7 +53,7 @@
         "lit": "3.3.0",
         "lowdb": "1.0.0",
         "lunr": "2.3.9",
-        "multer": "1.4.5-lts.2",
+        "multer": "2.0.2",
         "ngx-toastr": "19.0.0",
         "node-fetch": "2.6.12",
         "node-forge": "1.3.1",
@@ -97,12 +97,12 @@
         "@storybook/test-runner": "0.22.0",
         "@storybook/theming": "8.6.12",
         "@storybook/web-components-webpack5": "8.6.12",
-        "@types/chrome": "0.0.306",
+        "@types/chrome": "0.1.12",
         "@types/firefox-webext-browser": "120.0.4",
         "@types/inquirer": "8.2.10",
         "@types/jest": "29.5.14",
         "@types/jsdom": "21.1.7",
-        "@types/koa": "2.15.0",
+        "@types/koa": "3.0.0",
         "@types/koa__multer": "2.0.7",
         "@types/koa__router": "12.0.4",
         "@types/koa-bodyparser": "4.3.7",
@@ -131,7 +131,7 @@
         "copy-webpack-plugin": "13.0.0",
         "cross-env": "10.0.0",
         "css-loader": "7.1.2",
-        "electron": "36.8.1",
+        "electron": "38.2.0",
         "electron-builder": "26.0.12",
         "electron-log": "5.4.0",
         "electron-reload": "2.0.0-alpha.1",
@@ -199,11 +199,11 @@
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@koa/multer": "4.0.0",
-        "@koa/router": "13.1.0",
+        "@koa/router": "14.0.0",
         "big-integer": "1.6.52",
         "browser-hrtime": "1.1.8",
         "chalk": "4.1.2",
-        "commander": "11.1.0",
+        "commander": "14.0.0",
         "core-js": "3.45.0",
         "form-data": "4.0.4",
         "https-proxy-agent": "7.0.6",
@@ -215,7 +215,7 @@
         "koa-json": "2.0.2",
         "lowdb": "1.0.0",
         "lunr": "2.3.9",
-        "multer": "1.4.5-lts.2",
+        "multer": "2.0.2",
         "node-fetch": "2.6.12",
         "node-forge": "1.3.1",
         "open": "10.1.2",
@@ -277,7 +277,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2025.9.0",
+      "version": "2025.9.1",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },
@@ -291,7 +291,7 @@
     },
     "apps/web": {
       "name": "@bitwarden/web-vault",
-      "version": "2025.9.0"
+      "version": "2025.9.1"
     },
     "libs/admin-console": {
       "name": "@bitwarden/admin-console",
@@ -375,6 +375,7 @@
     "libs/messaging-internal": {
       "name": "@bitwarden/messaging-internal",
       "version": "0.0.1",
+      "extraneous": true,
       "license": "GPL-3.0"
     },
     "libs/node": {
@@ -4670,10 +4671,6 @@
       "resolved": "libs/messaging",
       "link": true
     },
-    "node_modules/@bitwarden/messaging-internal": {
-      "resolved": "libs/messaging-internal",
-      "link": true
-    },
     "node_modules/@bitwarden/node": {
       "resolved": "libs/node",
       "link": true
@@ -4691,9 +4688,9 @@
       "link": true
     },
     "node_modules/@bitwarden/sdk-internal": {
-      "version": "0.2.0-main.266",
-      "resolved": "https://registry.npmjs.org/@bitwarden/sdk-internal/-/sdk-internal-0.2.0-main.266.tgz",
-      "integrity": "sha512-2Axa1D9AEkax2ssqahZYHVkk2RdguzLV2bJ6j99AZhh4qjGIYtDvmc5gDh7zhuw7Ig7H3mNpKwCZ/eJgadyH6g==",
+      "version": "0.2.0-main.311",
+      "resolved": "https://registry.npmjs.org/@bitwarden/sdk-internal/-/sdk-internal-0.2.0-main.311.tgz",
+      "integrity": "sha512-zJdQykNMFOyivpNaCB9jc85wZ1ci2HM8/E4hI+yS7FgRm0sRigK5rieF3+xRjiq7pEsZSD8AucR+u/XK9ADXiw==",
       "license": "GPL-3.0",
       "dependencies": {
         "type-fest": "^4.41.0"
@@ -8013,17 +8010,18 @@
       }
     },
     "node_modules/@koa/router": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/@koa/router/-/router-13.1.0.tgz",
-      "integrity": "sha512-mNVu1nvkpSd8Q8gMebGbCkDWJ51ODetrFvLKYusej+V0ByD4btqHYnPIzTBLXnQMVUlm/oxVwqmWBY3zQfZilw==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@koa/router/-/router-14.0.0.tgz",
+      "integrity": "sha512-LBSu5K0qAaaQcXX/0WIB9PGDevyCxxpnc1uq13vV/CgObaVxuis5hKl3Eboq/8gcb6ebnkAStW9NB/Em2eYyFA==",
       "license": "MIT",
       "dependencies": {
+        "debug": "^4.4.1",
         "http-errors": "^2.0.0",
         "koa-compose": "^4.1.0",
-        "path-to-regexp": "^6.3.0"
+        "path-to-regexp": "^8.2.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@leichtgewicht/ip-codec": {
@@ -13379,9 +13377,9 @@
       }
     },
     "node_modules/@types/chrome": {
-      "version": "0.0.306",
-      "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.306.tgz",
-      "integrity": "sha512-95kgcqvTNcaZCXmx/kIKY6uo83IaRNT3cuPxYqlB2Iu+HzKDCP4t7TUe7KhJijTdibcvn+SzziIcfSLIlgRnhQ==",
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.1.12.tgz",
+      "integrity": "sha512-jEkxs9GPQHx7g49WjkA8QDNcqODbMGDuBbWQOtjiS/Wf9AiEcDmQMIAgJvC/Xi36WoCVNx584g0Dd9ThJQCAiw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13713,9 +13711,9 @@
       }
     },
     "node_modules/@types/koa": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.15.0.tgz",
-      "integrity": "sha512-7QFsywoE5URbuVnG3loe03QXuGajrnotr3gQkXcEBShORai23MePfFYdhz90FEtBBpkyIYQbVD+evKtloCgX3g==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/koa/-/koa-3.0.0.tgz",
+      "integrity": "sha512-MOcVYdVYmkSutVHZZPh8j3+dAjLyR5Tl59CN0eKgpkE1h/LBSmPAsQQuWs+bKu7WtGNn+hKfJH9Gzml+PulmDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13723,7 +13721,7 @@
         "@types/content-disposition": "*",
         "@types/cookies": "*",
         "@types/http-assert": "*",
-        "@types/http-errors": "*",
+        "@types/http-errors": "^2",
         "@types/keygrip": "*",
         "@types/koa-compose": "*",
         "@types/node": "*"
@@ -18365,12 +18363,12 @@
       }
     },
     "node_modules/commander": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
-      "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.0.tgz",
+      "integrity": "sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==",
       "license": "MIT",
       "engines": {
-        "node": ">=16"
+        "node": ">=20"
       }
     },
     "node_modules/common-path-prefix": {
@@ -18473,20 +18471,34 @@
       "license": "MIT"
     },
     "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+      "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
       "engines": [
-        "node >= 0.8"
+        "node >= 6.0"
       ],
       "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
+        "readable-stream": "^3.0.2",
         "typedarray": "^0.0.6"
       }
     },
+    "node_modules/concat-stream/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/concurrently": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.0.tgz",
@@ -20147,9 +20159,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": "38.2.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-38.2.0.tgz",
+      "integrity": "sha512-Cw5Mb+N5NxsG0Hc1qr8I65Kt5APRrbgTtEEn3zTod30UNJRnAE1xbGk/1NOaDn3ODzI/MYn6BzT9T9zreP7xWA==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -30081,22 +30093,21 @@
       }
     },
     "node_modules/multer": {
-      "version": "1.4.5-lts.2",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.2.tgz",
-      "integrity": "sha512-VzGiVigcG9zUAoCNU+xShztrlr1auZOlurXynNvO9GiWD1/mTBbUljOKY+qMeazBqXgRnjzeEgJI/wyjJUHg9A==",
-      "deprecated": "Multer 1.x is impacted by a number of vulnerabilities, which have been patched in 2.x. You should upgrade to the latest 2.x version.",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz",
+      "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==",
       "license": "MIT",
       "dependencies": {
         "append-field": "^1.0.0",
-        "busboy": "^1.0.0",
-        "concat-stream": "^1.5.2",
-        "mkdirp": "^0.5.4",
+        "busboy": "^1.6.0",
+        "concat-stream": "^2.0.0",
+        "mkdirp": "^0.5.6",
         "object-assign": "^4.1.1",
-        "type-is": "^1.6.4",
-        "xtend": "^4.0.0"
+        "type-is": "^1.6.18",
+        "xtend": "^4.0.2"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 10.16.0"
       }
     },
     "node_modules/multer/node_modules/media-typer": {
@@ -32996,10 +33007,13 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
-      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
-      "license": "MIT"
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
+      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      }
     },
     "node_modules/path-type": {
       "version": "6.0.0",
@@ -35049,15 +35063,6 @@
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
       "license": "MIT"
     },
-    "node_modules/router/node_modules/path-to-regexp": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
-      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      }
-    },
     "node_modules/rrweb-cssom": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
diff --git a/package.json b/package.json
index 62ae69a2175..5015f8278b2 100644
--- a/package.json
+++ b/package.json
@@ -61,12 +61,12 @@
     "@storybook/test-runner": "0.22.0",
     "@storybook/theming": "8.6.12",
     "@storybook/web-components-webpack5": "8.6.12",
-    "@types/chrome": "0.0.306",
+    "@types/chrome": "0.1.12",
     "@types/firefox-webext-browser": "120.0.4",
     "@types/inquirer": "8.2.10",
     "@types/jest": "29.5.14",
     "@types/jsdom": "21.1.7",
-    "@types/koa": "2.15.0",
+    "@types/koa": "3.0.0",
     "@types/koa__multer": "2.0.7",
     "@types/koa__router": "12.0.4",
     "@types/koa-bodyparser": "4.3.7",
@@ -95,7 +95,7 @@
     "copy-webpack-plugin": "13.0.0",
     "cross-env": "10.0.0",
     "css-loader": "7.1.2",
-    "electron": "36.8.1",
+    "electron": "38.2.0",
     "electron-builder": "26.0.12",
     "electron-log": "5.4.0",
     "electron-reload": "2.0.0-alpha.1",
@@ -158,11 +158,11 @@
     "@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.266",
+    "@bitwarden/sdk-internal": "0.2.0-main.311",
     "@electron/fuses": "1.8.0",
     "@emotion/css": "11.13.5",
     "@koa/multer": "4.0.0",
-    "@koa/router": "13.1.0",
+    "@koa/router": "14.0.0",
     "@microsoft/signalr": "8.0.7",
     "@microsoft/signalr-protocol-msgpack": "8.0.7",
     "@ng-select/ng-select": "14.9.0",
@@ -175,7 +175,7 @@
     "buffer": "6.0.3",
     "bufferutil": "4.0.9",
     "chalk": "4.1.2",
-    "commander": "11.1.0",
+    "commander": "14.0.0",
     "core-js": "3.45.0",
     "form-data": "4.0.4",
     "https-proxy-agent": "7.0.6",
@@ -188,7 +188,7 @@
     "lit": "3.3.0",
     "lowdb": "1.0.0",
     "lunr": "2.3.9",
-    "multer": "1.4.5-lts.2",
+    "multer": "2.0.2",
     "ngx-toastr": "19.0.0",
     "node-fetch": "2.6.12",
     "node-forge": "1.3.1",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 3f903558f70..2d105d4263d 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -45,7 +45,6 @@
       "@bitwarden/key-management-ui": ["./libs/key-management-ui/src"],
       "@bitwarden/logging": ["libs/logging/src"],
       "@bitwarden/messaging": ["libs/messaging/src/index.ts"],
-      "@bitwarden/messaging-internal": ["libs/messaging-internal/src/index.ts"],
       "@bitwarden/node/*": ["./libs/node/src/*"],
       "@bitwarden/nx-plugin": ["libs/nx-plugin/src/index.ts"],
       "@bitwarden/platform": ["./libs/platform/src"],