Dylib

Add linking instruction everywhere
Use aarch64-apple-ios instead
2025-12-05 23:53:33 +00:00 · 2023-04-27 14:38:32 +02:00 · 2023-04-24 15:44:41 +02:00 · 2023-04-24 15:17:52 +02:00 · 2023-04-24 14:57:12 +02:00
360 changed files with 4246 additions and 23445 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Customer Support
-    url: https://bitwarden.com/contact/
-    about: Please contact our customer support for account issues and general customer support.
  - name: Report mobile autofill failure
    url: https://docs.google.com/forms/d/e/1FAIpQLScMopHyN7KGJs8hW562VTzbIGL4KcFnx0wJcsW0GYE1BnPiGA/viewform
    about: We are aware of some situations where the Bitwarden mobile app will not autofill information correctly. This is something the Bitwarden team is actively working on but need your help as a community and active Bitwarden users!
@@ -12,6 +9,9 @@ contact_links:
  - name: Bitwarden Community Forums
    url: https://community.bitwarden.com
    about: Please visit the community forums for general community discussion, support and the development roadmap.
+  - name: Customer Support
+    url: https://bitwarden.com/contact/
+    about: Please contact our customer support for account issues and general customer support.
  - name: Security Issues
    url: https://hackerone.com/bitwarden
    about: We use HackerOne to manage security disclosures.
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,19 +0,0 @@
-android:
- src/App/*
- src/Core/*
- src/Android/*
-
-iOS:
- src/App/*
- src/Core/*
- lib/ios/*
- src/iOS/*
- 'src/iOS.Autofill/*'
- 'src/iOS.Core/*'
- 'src/iOS.Extension/*'
- 'src/iOS.ShareExtension/*'
- 'src/iOS.Widget/*'
- src/watchOS/*
-
-watchOS:
- src/watchOS/*
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,37 +1,22 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",
-    ":combinePatchMinorReleases",
-    ":dependencyDashboard",
-    ":maintainLockFilesWeekly",
-    ":pinAllExceptPeerDependencies",
-    ":prConcurrentLimit10",
-    ":rebaseStalePrs",
-    "schedule:weekends",
-    ":separateMajorReleases"
-  ],
-  "enabledManagers": ["cargo", "github-actions", "npm", "nuget"],
-  "packageRules": [
-    {
-      "groupName": "cargo minor",
-      "matchManagers": ["cargo"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "gh minor",
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "npm minor",
-      "matchManagers": ["npm"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "nuget minor",
-      "matchManagers": ["nuget"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-  ]
-}
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+      "config:base",
+      "schedule:monthly",
+      ":maintainLockFilesMonthly",
+      ":preserveSemverRanges",
+      ":rebaseStalePrs",
+      ":disableDependencyDashboard"
+    ],
+    "enabledManagers": [
+      "nuget"
+    ],
+    "packageRules": [
+      {
+        "matchManagers": ["nuget"],
+        "groupName": "Nuget updates",
+        "groupSlug": "nuget",
+        "separateMajorMinor": false
+      }
+    ]
+  }
--- a/.github/workflows/automatic-issue-responses.yml
+++ b/.github/workflows/automatic-issue-responses.yml
@@ -14,7 +14,7 @@ jobs:
      # Feature request
      - if: github.event.label.name == 'feature-request'
        name: Feature request
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
        with:
          comment: |
            We use GitHub issues as a place to track bugs and other development related issues. The [Bitwarden Community Forums](https://community.bitwarden.com/) has a [Feature Requests](https://community.bitwarden.com/c/feature-requests) section for submitting, voting for, and discussing requests like this one.
@@ -25,7 +25,7 @@ jobs:
      # Intended behavior
      - if: github.event.label.name == 'intended-behavior'
        name: Intended behaviour
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
        with:
          comment: |
            Your issue appears to be describing the intended behavior of the software. If you want this to be changed, it would be a feature request.
@@ -38,7 +38,7 @@ jobs:
      # Customer support request
      - if: github.event.label.name == 'customer-support'
        name: Customer Support request
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
        with:
          comment: |
            We use GitHub issues as a place to track bugs and other development related issues. Your issue appears to be a support request, or would otherwise be better handled by our dedicated Customer Success team.
@@ -49,14 +49,14 @@ jobs:
      # Resolved
      - if: github.event.label.name == 'resolved'
        name: Resolved
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
        with:
          comment: |
            We’ve closed this issue, as it appears the original problem has been resolved. If this happens again or continues to be an problem, please respond to this issue with any additional detail to assist with reproduction and root cause analysis.
      # Stale
      - if: github.event.label.name == 'stale'
        name: Stale
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
        with:
          comment: |
            As we haven’t heard from you about this problem in some time, this issue will now be closed.
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846

      - name: Set up CLOC
        run: |
@@ -36,7 +36,7 @@ jobs:
      hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
        with:
          submodules: 'true'

@@ -67,17 +67,12 @@ jobs:
        variant: ["prod", "qa"]
    steps:
      - name: Setup NuGet
-        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
        with:
          nuget-version: 5.9.0

-      - name: Set up .NET
-        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
-        with:
-          dotnet-version: '3.1.x'
-
      - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1
+        uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab

      - name: Setup Windows builder
        run: choco install checksum --no-progress
@@ -110,7 +105,7 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
        with:
          fetch-depth: 0
      - name: Decrypt secrets
@@ -162,7 +157,7 @@ jobs:
        shell: pwsh

      - name: Report test results
-        uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226 # v1.6.0
+        uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226
        if: always()
        with:
          name: Test Results
@@ -196,7 +191,7 @@ jobs:
          $androidPath = $($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj");
          $packageName = "com.x8bit.bitwarden";

-          if ("${{ matrix.variant }}" -ne "prod")
+          if ("${{ matrix.variant }}" -ne "prod") 
          {
            $packageName = "com.x8bit.bitwarden.${{ matrix.variant }}";
          }
@@ -237,7 +232,7 @@ jobs:
        shell: pwsh
      - name: Upload Prod .aab artifact
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: com.x8bit.bitwarden.aab
          path: ./com.x8bit.bitwarden.aab
@@ -245,7 +240,7 @@ jobs:

      - name: Upload Prod .apk artifact
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: com.x8bit.bitwarden.apk
          path: ./com.x8bit.bitwarden.apk
@@ -253,7 +248,7 @@ jobs:

      - name: Upload Other .apk artifact
        if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: com.x8bit.bitwarden.${{ matrix.variant }}.apk
          path: ./com.x8bit.bitwarden.${{ matrix.variant }}.apk
@@ -273,7 +268,7 @@ jobs:

      - name: Upload .apk sha file for prod
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: bw-android-apk-sha256.txt
          path: ./bw-android-apk-sha256.txt
@@ -281,7 +276,7 @@ jobs:

      - name: Upload .apk sha file for other
        if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: bw-android-${{ matrix.variant }}-apk-sha256.txt
          path: ./bw-android-${{ matrix.variant }}-apk-sha256.txt
@@ -308,12 +303,12 @@ jobs:
    runs-on: windows-2022
    steps:
      - name: Setup NuGet
-        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
        with:
          nuget-version: 5.9.0

      - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1
+        uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab

      - name: Setup Windows builder
        run: choco install checksum --no-progress
@@ -347,7 +342,7 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846

      - name: Decrypt secrets
        env:
@@ -482,7 +477,7 @@ jobs:
        shell: pwsh

      - name: Upload F-Droid .apk artifact
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: com.x8bit.bitwarden-fdroid.apk
          path: ./com.x8bit.bitwarden-fdroid.apk
@@ -494,7 +489,7 @@ jobs:
            -t sha256 | Out-File -Encoding ASCII ./bw-fdroid-apk-sha256.txt

      - name: Upload F-Droid sha file
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: bw-fdroid-apk-sha256.txt
          path: ./bw-fdroid-apk-sha256.txt
@@ -507,7 +502,7 @@ jobs:
    needs: setup
    steps:
      - name: Setup NuGet
-        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
        with:
          nuget-version: 5.9.0

@@ -520,19 +515,19 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
        with:
          submodules: 'true'

-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure - Prod Subscription
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}

      - name: Retrieve secrets
        id: retrieve-secrets
        env:
-          KEYVAULT: bitwarden-ci
+          KEYVAULT: bitwarden-prod-kv
          SECRETS: |
            appcenter-ios-token
        run: |
@@ -703,7 +698,7 @@ jobs:
        shell: bash

      - name: Upload App Store .ipa & dSYMs artifacts
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: Bitwarden iOS
          path: |
@@ -776,17 +771,17 @@ jobs:
      _CROWDIN_PROJECT_ID: "269690"
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846

-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}

      - name: Retrieve secrets
        id: retrieve-secrets
        env:
-          KEYVAULT: bitwarden-ci
+          KEYVAULT: bitwarden-prod-kv
          SECRETS: |
            crowdin-api-token
        run: |
@@ -798,7 +793,7 @@ jobs:
          done

      - name: Upload Sources
-        uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0
+        uses: crowdin/github-action@9237b4cb361788dfce63feb2e2f15c09e2fe7415
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
@@ -844,17 +839,17 @@ jobs:
              exit 1
          fi

-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure - Prod Subscription
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
        if: failure()
        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}

      - name: Retrieve secrets
        id: retrieve-secrets
        if: failure()
        env:
-          KEYVAULT: bitwarden-ci
+          KEYVAULT: bitwarden-prod-kv
          SECRETS: |
            devops-alerts-slack-webhook-url
        run: |
@@ -866,7 +861,7 @@ jobs:
          done

      - name: Notify Slack on failure
-        uses: act10ns/slack@ed1309ab9862e57e9e583e51c7889486b9a00b0f # v2.0.0
+        uses: act10ns/slack@da3191ebe2e67f49b46880b4633f5591a96d1d33
        if: failure()
        env:
          SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}
--- a/.github/workflows/crowdin-pull.yml
+++ b/.github/workflows/crowdin-pull.yml
@@ -15,22 +15,22 @@ jobs:
      _CROWDIN_PROJECT_ID: "269690"
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4

-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af 
        with:
-          keyvault: "bitwarden-ci"
+          keyvault: "bitwarden-prod-kv"               
          secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"

      - name: Download translations
-        uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0
+        uses: crowdin/github-action@12143a68c213f3c6d9913c9e5023224f7231face
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
@@ -48,4 +48,4 @@ jobs:
          pull_request_title: "Autosync Crowdin Translations"
          pull_request_body: "Autosync the updated translations"
          gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
-          gpg_passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
+          gpg_passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}   
--- a/.github/workflows/enforce-labels.yml
+++ b/.github/workflows/enforce-labels.yml
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Enforce Label
-        uses: yogevbd/enforce-label-action@a3c219da6b8fa73f6ba62b68ff09c469b3a1c024 # 2.2.2
+        uses: yogevbd/enforce-label-action@8d1e1709b1011e6d90400a0e6cf7c0b77aa5efeb
        with:
          BANNED_LABELS: "hold,needs-qa"
          BANNED_LABELS_DESCRIPTION: "PRs with the hold or needs-qa labels cannot be merged"
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -1,17 +0,0 @@
---
-name: "Pull Request Labeler"
-
-on:
-  pull_request_target: {}
-
-jobs:
-  labeler:
-    name: "Pull Request Labeler"
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/labeler@ba790c862c380240c6d5e7427be5ace9a05c754b  # v4.0.3
-        with:
-          sync-labels: true
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,11 +38,11 @@ jobs:
          fi

      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0

      - name: Check Release Version
        id: version
-        uses: bitwarden/gh-actions/release-version-check@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/release-version-check@8f055ef543c7433c967a1b9b04a0f230923233bb
        with:
          release-type: ${{ github.event.inputs.release_type }}
          project-type: xamarin
@@ -56,7 +56,7 @@ jobs:

      - name: Create GitHub deployment
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: chrnorm/deployment-action@d42cde7132fcec920de534fffc3be83794335c00 # v2.0.5
+        uses: chrnorm/deployment-action@1b599fe41a0ef1f95191e7f2eec4743f2d7dfc48
        id: deployment
        with:
          token: '${{ secrets.GITHUB_TOKEN }}'
@@ -68,7 +68,7 @@ jobs:

      - name: Download all artifacts
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
        with:
          workflow: build.yml
          workflow_conclusion: success
@@ -76,7 +76,7 @@ jobs:

      - name: Dry Run - Download all artifacts
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
        with:
          workflow: build.yml
          workflow_conclusion: success
@@ -104,7 +104,7 @@ jobs:

      - name: Update deployment status to Success
        if: ${{ github.event.inputs.release_type != 'Dry Run' && success() }}
-        uses: chrnorm/deployment-status@2afb7d27101260f4a764219439564d954d10b5b0 # v2.0.1
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
        with:
          token: '${{ secrets.GITHUB_TOKEN }}'
          state: 'success'
@@ -112,7 +112,7 @@ jobs:

      - name: Update deployment status to Failure
        if: ${{ github.event.inputs.release_type != 'Dry Run' && failure() }}
-        uses: chrnorm/deployment-status@2afb7d27101260f4a764219439564d954d10b5b0 # v2.0.1
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
        with:
          token: '${{ secrets.GITHUB_TOKEN }}'
          state: 'failure'
@@ -126,11 +126,11 @@ jobs:
    if: inputs.fdroid_publish
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0

      - name: Download F-Droid .apk artifact
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
        with:
          workflow: build.yml
          workflow_conclusion: success
@@ -139,7 +139,7 @@ jobs:

      - name: Dry Run - Download F-Droid .apk artifact
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
        with:
          workflow: build.yml
          workflow_conclusion: success
--- a/.github/workflows/version-auto-bump.yml
+++ b/.github/workflows/version-auto-bump.yml
@@ -14,7 +14,7 @@ jobs:
      version_number: ${{ steps.version.outputs.new-version }}
    steps:
      - name: Checkout Branch
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579

      - name: Calculate bumped version
        id: version
@@ -32,10 +32,14 @@ jobs:
          echo "new-version=$NEW_VER" >> $GITHUB_OUTPUT

  trigger_version_bump:
-    name: Bump version to ${{ needs.setup.outputs.version_number }}
-    needs: setup
-    uses: ./.github/workflows/version-bump.yml
-    secrets:
-      AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-    with:
-      version_number: ${{ needs.setup.outputs.version_number }}
+    name: "Version bump"
+    runs-on: ubuntu-22.04
+    needs:
+      - setup
+    steps:
+      - name: Bump version to ${{ needs.setup.outputs.version_number }}
+        uses: ./.github/workflows/version-bump.yml
+        secrets:
+          AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
+        with:
+          version_number: ${{ needs.setup.outputs.version_number }}
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -11,7 +11,6 @@ on:
    inputs:
      version_number:
        required: true
-        type: string
    secrets:
      AZURE_PROD_KV_CREDENTIALS:
        required: true
@@ -22,22 +21,22 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout Branch
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579

-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure - Prod Subscription
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
        with:
-         creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+         creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af
        with:
-          keyvault: "bitwarden-ci"
+          keyvault: "bitwarden-prod-kv"
          secrets: "github-gpg-private-key, github-gpg-private-key-passphrase"

      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549 # v5.2.0
+        uses: crazy-max/ghaction-import-gpg@c8bb57c57e8df1be8c73ff3d59deab1dbc00e0d1
        with:
          gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
          passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
@@ -48,31 +47,31 @@ jobs:
        run: git switch -c version_bump_${{ github.event.inputs.version_number }}

      - name: Bump Version - Android XML
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/Android/Properties/AndroidManifest.xml"

      - name: Bump Version - iOS.Autofill
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS.Autofill/Info.plist"

      - name: Bump Version - iOS.Extension
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS.Extension/Info.plist"

      - name: Bump Version - iOS.ShareExtension
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS.ShareExtension/Info.plist"

      - name: Bump Version - iOS
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS/Info.plist"
--- a/.github/workflows/workflow-linter.yml
+++ b/.github/workflows/workflow-linter.yml
@@ -8,4 +8,4 @@ on:

 jobs:
  call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@34ecb67b2a357795dc893549df0795e7383ff50f
+    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@master
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 # Bitwarden Mobile Application

-<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on F-Droid" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>
+<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on Google Play" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>

 The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin iOS, and Xamarin Forms.

--- a/crowdin.yml
+++ b/crowdin.yml
@@ -38,15 +38,3 @@ files:
        pt-PT: pt-PT
        en-GB: en-GB
        en-IN: en-IN
-  - source: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/Localizable.strings"
-    dest: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/%original_file_name%"
-    translation: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization//%two_letters_code%.lproj/%original_file_name%"
-    update_option: update_as_unapproved
-    languages_mapping:
-      two_letters_code:
-        zh-CN: zh-Hans
-        zh-TW: zh-Hant
-        pt-BR: pt-BR
-        pt-PT: pt-PT
-        en-GB: en-GB
-        en-IN: en-IN
--- a/lib/ios/libbitwarden_c.a
+++ b/lib/ios/libbitwarden_c.a
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -78,20 +78,21 @@
      <Version>1.9.0</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1.1" />
-    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.16" />
-    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.19" />
-    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.0" />
+    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.14" />
+    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.17" />
+    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.15" />
    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.3.1.1" />
    <PackageReference Include="Xamarin.Essentials">
-      <Version>1.7.5</Version>
+      <Version>1.7.3</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.Firebase.Messaging">
-      <Version>123.1.1.1</Version>
+      <Version>123.0.8</Version>
    </PackageReference>
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
-    <PackageReference Include="Xamarin.Google.Dagger" Version="2.44.2.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.1.1" />
+    <PackageReference Include="Xamarin.Google.Dagger" Version="2.41.0.2" />
    <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
-      <Version>118.0.1.3</Version>
+      <Version>118.0.1.2</Version>
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
@@ -159,7 +160,6 @@
    <Compile Include="Constants.cs" />
    <Compile Include="Effects\RemoveFontPaddingEffect.cs" />
    <Compile Include="Services\WatchDeviceService.cs" />
-    <Compile Include="Renderers\CustomLabelRenderer.cs" />
  </ItemGroup>
  <ItemGroup>
    <AndroidAsset Include="Assets\bwi-font.ttf" />
@@ -233,18 +233,6 @@
      <SubType></SubType>
      <Generator></Generator>
    </AndroidResource>
-    <AndroidResource Include="Resources\layout\validatable_input_dialog_layout.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
-    <AndroidResource Include="Resources\drawable\empty_uris_placeholder.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
-    <AndroidResource Include="Resources\drawable\empty_uris_placeholder_dark.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\drawable\splash_screen.xml" />
--- a/src/Android/Assets/bwi-font.ttf
+++ b/src/Android/Assets/bwi-font.ttf
--- a/src/Android/Autofill/FieldCollection.cs
+++ b/src/Android/Autofill/FieldCollection.cs
@@ -12,7 +12,7 @@ namespace Bit.Droid.Autofill
        private List<Field> _passwordFields = null;
        private List<Field> _usernameFields = null;
        private HashSet<string> _ignoreSearchTerms = new HashSet<string> { "search", "find", "recipient", "edit" };
-        private HashSet<string> _usernameTerms = new HashSet<string> { "email", "phone", "username" };
+        private HashSet<string> _usernameTerms = new HashSet<string> { "email", "phone", "username"};
        private HashSet<string> _passwordTerms = new HashSet<string> { "password", "pswd" };

        public List<AutofillId> AutofillIds { get; private set; } = new List<AutofillId>();
@@ -54,14 +54,15 @@ namespace Bit.Droid.Autofill
                    if (HintToFieldsMap.ContainsKey(View.AutofillHintPassword))
                    {
                        _passwordFields.AddRange(HintToFieldsMap[View.AutofillHintPassword]);
-                        return _passwordFields;
                    }
                }
-
-                _passwordFields = Fields.Where(f => FieldIsPassword(f)).ToList();
-                if (!_passwordFields.Any())
+                else
                {
-                    _passwordFields = Fields.Where(f => FieldHasPasswordTerms(f)).ToList();
+                    _passwordFields = Fields.Where(f => FieldIsPassword(f)).ToList();
+                    if (!_passwordFields.Any())
+                    {
+                        _passwordFields = Fields.Where(f => FieldHasPasswordTerms(f)).ToList();
+                    }
                }
                return _passwordFields;
            }
@@ -86,25 +87,23 @@ namespace Bit.Droid.Autofill
                    {
                        _usernameFields.AddRange(HintToFieldsMap[View.AutofillHintUsername]);
                    }
-                    if (_usernameFields.Any())
-                    {
-                        return _usernameFields;
-                    }
                }
-
-                foreach (var passwordField in PasswordFields)
+                else
                {
-                    var usernameField = Fields.TakeWhile(f => f.AutofillId != passwordField.AutofillId)
-                        .LastOrDefault();
-                    if (usernameField != null)
+                    foreach (var passwordField in PasswordFields)
                    {
-                        _usernameFields.Add(usernameField);
+                        var usernameField = Fields.TakeWhile(f => f.AutofillId != passwordField.AutofillId)
+                            .LastOrDefault();
+                        if (usernameField != null)
+                        {
+                            _usernameFields.Add(usernameField);
+                        }
                    }
-                }

-                if (!_usernameFields.Any())
-                {
-                    _usernameFields = Fields.Where(f => FieldIsUsername(f)).ToList();
+                    if (!_usernameFields.Any())
+                    {
+                        _usernameFields = Fields.Where(f => FieldIsUsername(f)).ToList();
+                    }
                }
                return _usernameFields;
            }
--- a/src/Android/MainApplication.cs
+++ b/src/Android/MainApplication.cs
@@ -21,7 +21,6 @@ using Bit.App.Utilities;
 using Bit.App.Pages;
 using Bit.App.Utilities.AccountManagement;
 using Bit.App.Controls;
-using Bit.Core.Enums;
 #if !FDROID
 using Android.Gms.Security;
 #endif
@@ -148,7 +147,7 @@ namespace Bit.Droid
            var storageMediatorService = new StorageMediatorService(mobileStorageService, secureStorageService, preferencesStorage);
            var stateService = new StateService(mobileStorageService, secureStorageService, storageMediatorService, messagingService);
            var stateMigrationService =
-                new StateMigrationService(DeviceType.Android, liteDbStorage, preferencesStorage, secureStorageService);
+                new StateMigrationService(liteDbStorage, preferencesStorage, secureStorageService);
            var clipboardService = new ClipboardService(stateService);
            var deviceActionService = new DeviceActionService(stateService, messagingService);
            var fileService = new FileService(stateService, broadcasterService);
@@ -156,7 +155,7 @@ namespace Bit.Droid
                messagingService, broadcasterService);
            var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService,
                platformUtilsService, new LazyResolve<IEventService>());
-            var biometricService = new BiometricService(stateService);
+            var biometricService = new BiometricService();
            var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
            var cryptoService = new CryptoService(stateService, cryptoFunctionService);
            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.7.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.3.3" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
--- a/src/Android/Renderers/CustomLabelRenderer.cs
+++ b/src/Android/Renderers/CustomLabelRenderer.cs
@@ -1,43 +0,0 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.OS;
-using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(CustomLabel), typeof(CustomLabelRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomLabelRenderer : LabelRenderer
-    {
-        public CustomLabelRenderer(Context context)
-            : base(context)
-        { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
-        {
-            base.OnElementChanged(e);
-
-            if (Control != null && e.NewElement is CustomLabel label)
-            {
-                if (label.FontWeight.HasValue && Build.VERSION.SdkInt >= BuildVersionCodes.P)
-                {
-                    Control.Typeface = Android.Graphics.Typeface.Create(null, label.FontWeight.Value, false);
-                }
-            }
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            var label = sender as CustomLabel;
-            switch (e.PropertyName)
-            {
-                case nameof(CustomLabel.AutomationId):
-                    Control.ContentDescription = label.AutomationId;
-                    break;
-            }
-            base.OnElementPropertyChanged(sender, e);
-        }
-    }
-}
--- a/src/Android/Resources/drawable/empty_uris_placeholder.xml
+++ b/src/Android/Resources/drawable/empty_uris_placeholder.xml
@@ -1,35 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="129"
-    android:viewportHeight="124"
-    android:width="129dp"
-    android:height="124dp">
-    <path
-        android:pathData="M126.8227 61.9441A59.6843 59.6843 0 0 1 7.4541 61.9441A59.6843 59.6843 0 0 1 126.8227 61.9441Z"
-        android:fillColor="#F0F0F0"
-        android:strokeColor="#89929F"
-        android:strokeWidth="3" />
-    <path
-        android:pathData="M21.6167 100.851C52.597 103.31 79.6937 80.3264 82.1391 49.5156C83.6205 30.8497 76.0789 14.8844 62.7275 3.63385"
-        android:strokeColor="#89929F"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M14.5633 34.2845C12.2035 66.7711 38.5225 96.3429 72.6666 98.8232C74.2596 98.9389 78.629 98.9975 80.1951 99C84.6245 98.8232 97.8063 96.593 106.813 91.8485C113.439 88.3581 119.745 84.6984 124.644 79.1121"
-        android:strokeColor="#89929F"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M124.502 48.5051C106.554 24.3817 68.8237 21.6709 41.4178 42.0617C24.8146 54.4149 14.7327 72.4183 13.9255 90.1427"
-        android:strokeColor="#89929F"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M83.4034 28.3934A5 5 0 0 1 73.4034 28.3934A5 5 0 0 1 83.4034 28.3934Z"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M24.7698 66.5518A5 5 0 0 1 14.7698 66.5518A5 5 0 0 1 24.7698 66.5518Z"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M57.344 94.4726A5 5 0 0 1 47.344 94.4726A5 5 0 0 1 57.344 94.4726Z"
-        android:fillColor="#89929F" />
-</vector>
--- a/src/Android/Resources/drawable/empty_uris_placeholder_dark.xml
+++ b/src/Android/Resources/drawable/empty_uris_placeholder_dark.xml
@@ -1,35 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="129"
-    android:viewportHeight="124"
-    android:width="129dp"
-    android:height="124dp">
-    <path
-        android:pathData="M126.8227 61.9441A59.6843 59.6843 0 0 1 7.4541 61.9441A59.6843 59.6843 0 0 1 126.8227 61.9441Z"
-        android:fillColor="@android:color/transparent"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="3" />
-    <path
-        android:pathData="M21.6167 100.851C52.597 103.31 79.6937 80.3264 82.1391 49.5156C83.6205 30.8497 76.0789 14.8844 62.7275 3.63385"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M14.5633 34.2845C12.2035 66.7711 38.5225 96.3429 72.6666 98.8232C74.2596 98.9389 78.629 98.9975 80.1951 99C84.6245 98.8232 97.8063 96.593 106.813 91.8485C113.439 88.3581 119.745 84.6984 124.644 79.1121"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M124.502 48.5051C106.554 24.3817 68.8237 21.6709 41.4178 42.0617C24.8146 54.4149 14.7327 72.4183 13.9255 90.1427"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M83.4034 28.3934A5 5 0 0 1 73.4034 28.3934A5 5 0 0 1 83.4034 28.3934Z"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M24.7698 66.5518A5 5 0 0 1 14.7698 66.5518A5 5 0 0 1 24.7698 66.5518Z"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M57.344 94.4726A5 5 0 0 1 47.344 94.4726A5 5 0 0 1 57.344 94.4726Z"
-        android:fillColor="#A3A3A3" />
-</vector>
--- a/src/Android/Resources/layout/validatable_input_dialog_layout.xml
+++ b/src/Android/Resources/layout/validatable_input_dialog_layout.xml
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="30dp"
-    android:paddingRight="30dp">
-    <TextView
-        android:id="@+id/lblHeader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/dialog_header_text_size"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="-3dp"
-        android:labelFor="@+id/txtValue"/>
-    <EditText
-        android:id="@id/txtValue"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/dialog_input_text_size"/>
-    <TextView
-        android:id="@+id/lblValueSubinfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/dialog_sub_value_info_text_size"/>
-</LinearLayout>
-
--- a/src/Android/Resources/values/dimens.xml
+++ b/src/Android/Resources/values/dimens.xml
@@ -2,7 +2,4 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
  <dimen name="design_bottom_navigation_text_size" tools:override="true">15sp</dimen>
  <dimen name="design_bottom_navigation_active_text_size" tools:override="true">15sp</dimen>
-  <dimen name="dialog_input_text_size">16sp</dimen>
-  <dimen name="dialog_header_text_size">12sp</dimen>
-  <dimen name="dialog_sub_value_info_text_size">12sp</dimen>
 </resources>
--- a/src/Android/Services/BiometricService.cs
+++ b/src/Android/Services/BiometricService.cs
@@ -4,6 +4,7 @@ using Android.OS;
 using Android.Security.Keystore;
 using Bit.Core.Abstractions;
 using Bit.Core.Services;
+using Bit.Core.Utilities;
 using Java.Security;
 using Javax.Crypto;

@@ -11,8 +12,6 @@ namespace Bit.Droid.Services
 {
    public class BiometricService : IBiometricService
    {
-        private readonly IStateService _stateService;
-
        private const string KeyName = "com.8bit.bitwarden.biometric_integrity";

        private const string KeyStoreName = "AndroidKeyStore";
@@ -24,28 +23,28 @@ namespace Bit.Droid.Services

        private readonly KeyStore _keystore;

-        public BiometricService(IStateService stateService)
+        public BiometricService()
        {
-            _stateService = stateService;
            _keystore = KeyStore.GetInstance(KeyStoreName);
            _keystore.Load(null);
        }

-        public async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
+        public Task<bool> SetupBiometricAsync(string bioIntegrityKey = null)
        {
+            // bioIntegrityKey used in iOS only
            if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
            {
-                await CreateKeyAsync(bioIntegritySrcKey);
+                CreateKey();
            }

-            return true;
+            return Task.FromResult(true);
        }

-        public async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
+        public Task<bool> ValidateIntegrityAsync(string bioIntegrityKey = null)
        {
            if (Build.VERSION.SdkInt < BuildVersionCodes.M)
            {
-                return true;
+                return Task.FromResult(true);
            }

            try
@@ -56,7 +55,7 @@ namespace Bit.Droid.Services

                if (key == null || cipher == null)
                {
-                    return true;
+                    return Task.FromResult(true);
                }

                cipher.Init(CipherMode.EncryptMode, key);
@@ -64,32 +63,25 @@ namespace Bit.Droid.Services
            catch (KeyPermanentlyInvalidatedException e)
            {
                // Biometric has changed
-                await ClearStateAsync(bioIntegritySrcKey);
-                return false;
+                return Task.FromResult(false);
            }
            catch (UnrecoverableKeyException e)
            {
                // Biometric was disabled and re-enabled
-                await ClearStateAsync(bioIntegritySrcKey);
-                return false;
+                return Task.FromResult(false);
            }
            catch (InvalidKeyException e)
            {
                // Fallback for old bitwarden users without a key
                LoggerHelper.LogEvenIfCantBeResolved(e);
-                await CreateKeyAsync(bioIntegritySrcKey);
+                CreateKey();
            }

-            return true;
+            return Task.FromResult(true);
        }

-        private async Task CreateKeyAsync(string bioIntegritySrcKey = null)
+        private void CreateKey()
        {
-            bioIntegritySrcKey ??= Core.Constants.BiometricIntegritySourceKey;
-            await _stateService.SetSystemBiometricIntegrityState(bioIntegritySrcKey,
-                await GetStateAsync(bioIntegritySrcKey));
-            await _stateService.SetAccountBiometricIntegrityValidAsync(bioIntegritySrcKey);
-
            try
            {
                var keyGen = KeyGenerator.GetInstance(KeyAlgorithm, KeyStoreName);
@@ -109,16 +101,5 @@ namespace Bit.Droid.Services
                LoggerHelper.LogEvenIfCantBeResolved(e);
            }
        }
-
-        private async Task<string> GetStateAsync(string bioIntegritySrcKey)
-        {
-            return await _stateService.GetSystemBiometricIntegrityState(bioIntegritySrcKey) ??
-                   Guid.NewGuid().ToString();
-        }
-
-        private async Task ClearStateAsync(string bioIntegritySrcKey)
-        {
-            await _stateService.SetSystemBiometricIntegrityState(bioIntegritySrcKey, null);
-        }
    }
 }
--- a/src/Android/Services/DeviceActionService.cs
+++ b/src/Android/Services/DeviceActionService.cs
@@ -13,13 +13,12 @@ using Android.Views.InputMethods;
 using Android.Widget;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.App.Utilities.Prompts;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Utilities;
 using Bit.Droid.Utilities;
 using Plugin.CurrentActivity;
-using Xamarin.Forms.Platform.Android;
+using static Bit.App.Pages.SettingsPageViewModel;

 namespace Bit.Droid.Services
 {
@@ -210,7 +209,10 @@ namespace Bit.Droid.Services
            }
            if (numericKeyboard)
            {
-                SetNumericKeyboardTo(input);
+                input.InputType = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;
+#pragma warning disable CS0618 // Type or member is obsolete
+                input.KeyListener = DigitsKeyListener.GetInstance(false, false);
+#pragma warning restore CS0618 // Type or member is obsolete
            }
            if (password)
            {
@@ -246,83 +248,6 @@ namespace Bit.Droid.Services
            return result.Task;
        }

-        public Task<ValidatablePromptResponse?> DisplayValidatablePromptAsync(ValidatablePromptConfig config)
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            if (activity == null)
-            {
-                return Task.FromResult<ValidatablePromptResponse?>(null);
-            }
-
-            var alertBuilder = new AlertDialog.Builder(activity);
-            alertBuilder.SetTitle(config.Title);
-            var view = activity.LayoutInflater.Inflate(Resource.Layout.validatable_input_dialog_layout, null);
-            alertBuilder.SetView(view);
-            
-            var result = new TaskCompletionSource<ValidatablePromptResponse?>();
-
-            alertBuilder.SetOnCancelListener(new BasicDialogWithResultCancelListener(result));
-            alertBuilder.SetPositiveButton(config.OkButtonText ?? AppResources.Ok, listener: null);
-            alertBuilder.SetNegativeButton(config.CancelButtonText ?? AppResources.Cancel, (sender, args) => result.TrySetResult(null));
-            if (!string.IsNullOrEmpty(config.ThirdButtonText))
-            {
-                alertBuilder.SetNeutralButton(config.ThirdButtonText, (sender, args) => result.TrySetResult(new ValidatablePromptResponse(null, true)));
-            }
-
-            var alert = alertBuilder.Create();
-
-            var input = view.FindViewById<EditText>(Resource.Id.txtValue);
-            var lblHeader = view.FindViewById<TextView>(Resource.Id.lblHeader);
-            var lblValueSubinfo = view.FindViewById<TextView>(Resource.Id.lblValueSubinfo);
-
-            lblHeader.Text = config.Subtitle;
-            lblValueSubinfo.Text = config.ValueSubInfo;
-
-            var defaultSubInfoColor = lblValueSubinfo.TextColors;
-
-            input.InputType = InputTypes.ClassText;
-
-            if (config.NumericKeyboard)
-            {
-                SetNumericKeyboardTo(input);
-            }
-
-            input.ImeOptions = input.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning | (ImeAction)ImeFlags.NoExtractUi;
-            input.Text = config.Text ?? string.Empty;
-            input.SetSelection(config.Text?.Length ?? 0);
-            input.AfterTextChanged += (sender, args) =>
-            {
-                if (lblValueSubinfo.Text != config.ValueSubInfo)
-                {
-                    lblValueSubinfo.Text = config.ValueSubInfo;
-                    lblHeader.SetTextColor(defaultSubInfoColor);
-                    lblValueSubinfo.SetTextColor(defaultSubInfoColor);
-                }
-            };
-
-            alert.Window.SetSoftInputMode(SoftInput.StateVisible);
-            alert.Show();
-
-            var positiveButton = alert.GetButton((int)DialogButtonType.Positive);
-            positiveButton.Click += (sender, args) =>
-            {
-                var error = config.ValidateText(input.Text);
-                if (error != null)
-                {
-                    lblHeader.SetTextColor(ThemeManager.GetResourceColor("DangerColor").ToAndroid());
-                    lblValueSubinfo.SetTextColor(ThemeManager.GetResourceColor("DangerColor").ToAndroid());
-                    lblValueSubinfo.Text = error;
-                    lblValueSubinfo.SendAccessibilityEvent(Android.Views.Accessibility.EventTypes.ViewFocused);
-                    return;
-                }
-
-                result.TrySetResult(new ValidatablePromptResponse(input.Text, false));
-                alert.Dismiss();
-            };
-
-            return result.Task;
-        }
-
        public void RateApp()
        {
            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
@@ -600,29 +525,5 @@ namespace Bit.Droid.Services
            // only used by iOS
            throw new NotImplementedException();
        }
-
-        private void SetNumericKeyboardTo(EditText editText)
-        {
-            editText.InputType = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;
-#pragma warning disable CS0618 // Type or member is obsolete
-            editText.KeyListener = DigitsKeyListener.GetInstance(false, false);
-#pragma warning restore CS0618 // Type or member is obsolete
-        }
-    }
-
-    class BasicDialogWithResultCancelListener : Java.Lang.Object, IDialogInterfaceOnCancelListener
-    {
-        private readonly TaskCompletionSource<ValidatablePromptResponse?> _taskCompletionSource;
-
-        public BasicDialogWithResultCancelListener(TaskCompletionSource<ValidatablePromptResponse?> taskCompletionSource)
-        {
-            _taskCompletionSource = taskCompletionSource;
-        }
-
-        public void OnCancel(IDialogInterface dialog)
-        {
-            _taskCompletionSource?.TrySetResult(null);
-            dialog?.Dismiss();
-        }
    }
 }
--- a/src/Android/Utilities/IntentExtensions.cs
+++ b/src/Android/Utilities/IntentExtensions.cs
@@ -1,6 +1,5 @@
 using Android.Content;
 using Android.OS;
-using Java.Lang;

 namespace Bit.Droid.Utilities
 {
@@ -14,12 +13,7 @@ namespace Bit.Droid.Utilities
                // Note: getting the bundle like this will cause to call unparcel() internally
                var b = intent?.Extras?.GetBundle("trashstringwhichhasnousebuttocheckunparcel");
            }
-            catch (Exception ex) when
-            (
-                ex is BadParcelableException ||
-                ex is ClassNotFoundException ||
-                ex is RuntimeException
-            )
+            catch (BadParcelableException)
            {
                intent.ReplaceExtras((Bundle)null);
            }
--- a/src/App/Abstractions/IDeviceActionService.cs
+++ b/src/App/Abstractions/IDeviceActionService.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Bit.App.Utilities.Prompts;
 using Bit.Core.Enums;
 using Bit.Core.Models;

@@ -19,7 +18,6 @@ namespace Bit.App.Abstractions
        Task<string> DisplayPromptAync(string title = null, string description = null, string text = null,
            string okButtonText = null, string cancelButtonText = null, bool numericKeyboard = false,
            bool autofocus = true, bool password = false);
-        Task<ValidatablePromptResponse?> DisplayValidatablePromptAsync(ValidatablePromptConfig config);
        Task<string> DisplayAlertAsync(string title, string message, string cancel, params string[] buttons);
        Task<string> DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons);

--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -14,11 +14,11 @@

  <ItemGroup>
    <PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.3" />
-    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.6" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.2" />
+    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.5" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
    <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
    <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
    <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
    <PackageReference Include="MessagePack" Version="2.4.59" />
@@ -145,8 +145,6 @@
    <Folder Include="Controls\DateTime\" />
    <Folder Include="Controls\IconLabelButton\" />
    <Folder Include="Controls\PasswordStrengthProgressBar\" />
-    <Folder Include="Utilities\Automation\" />
-    <Folder Include="Utilities\Prompts\" />
  </ItemGroup>

  <ItemGroup>
@@ -442,7 +440,5 @@
    <None Remove="MessagePack" />
    <None Remove="MessagePack.MSBuild.Tasks" />
    <None Remove="Controls\PasswordStrengthProgressBar\" />
-    <None Remove="Utilities\Automation\" />
-    <None Remove="Utilities\Prompts\" />
  </ItemGroup>
 </Project>
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -38,7 +38,6 @@ namespace Bit.App
        private readonly IFileService _fileService;
        private readonly IAccountsManager _accountsManager;
        private readonly IPushNotificationService _pushNotificationService;
-        private readonly IConfigService _configService;
        private static bool _isResumed;
        // these variables are static because the app is launching new activities on notification click, creating new instances of App. 
        private static bool _pendingCheckPasswordlessLoginRequests;
@@ -62,7 +61,6 @@ namespace Bit.App
            _fileService = ServiceContainer.Resolve<IFileService>();
            _accountsManager = ServiceContainer.Resolve<IAccountsManager>("accountsManager");
            _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>();
-            _configService = ServiceContainer.Resolve<IConfigService>();

            _accountsManager.Init(() => Options, this);

@@ -163,18 +161,6 @@ namespace Bit.App
                                new NavigationPage(new RemoveMasterPasswordPage()));
                        });
                    }
-                    else if (message.Command == Constants.ForceUpdatePassword)
-                    {
-                        Device.BeginInvokeOnMainThread(async () =>
-                        {
-                            await Application.Current.MainPage.Navigation.PushModalAsync(
-                                new NavigationPage(new UpdateTempPasswordPage()));
-                        });
-                    }
-                    else if (message.Command == "syncCompleted")
-                    {
-                        await _configService.GetAsync(true);
-                    }
                    else if (message.Command == Constants.PasswordlessLoginRequestKey
                        || message.Command == "unlocked"
                        || message.Command == AccountsManagerMessageCommands.ACCOUNT_SWITCH_COMPLETED)
@@ -299,8 +285,6 @@ namespace Bit.App
                // Reset delay on every start
                _vaultTimeoutService.DelayLockAndLogoutMs = null;
            }
-
-            await _configService.GetAsync();
            _messagingService.Send("startEventTimer");
        }

--- a/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml
+++ b/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml
@@ -30,15 +30,13 @@
                BackgroundColor="{DynamicResource BackgroundColor}"
                VerticalOptions="Start"
                RowHeight="{Binding AccountListRowHeight, Source={x:Reference _mainOverlay}}"
-                effects:ScrollViewContentInsetAdjustmentBehaviorEffect.ContentInsetAdjustmentBehavior="Never"
-                AutomationId="AccountListView">
+                effects:ScrollViewContentInsetAdjustmentBehaviorEffect.ContentInsetAdjustmentBehavior="Never">
                <ListView.ItemTemplate>
                    <DataTemplate x:DataType="view:AccountView">
                        <controls:AccountViewCell
                            Account="{Binding .}"
                            SelectAccountCommand="{Binding SelectAccountCommand, Source={x:Reference _mainOverlay}}"
                            LongPressAccountCommand="{Binding LongPressAccountCommand, Source={x:Reference _mainOverlay}}"
-                            AutomationId="AccountViewCell"
                            />
                    </DataTemplate>
                </ListView.ItemTemplate>
--- a/src/App/Controls/AccountViewCell/AccountViewCell.xaml
+++ b/src/App/Controls/AccountViewCell/AccountViewCell.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
          xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
          xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
@@ -60,23 +60,20 @@
                    Text="{Binding AccountView.Email}"
                    IsVisible="{Binding IsActive}"
                    StyleClass="accountlist-title, accountlist-title-platform"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountEmailLabel" />
+                    LineBreakMode="TailTruncation" />
                <Label
                    Grid.Row="0"
                    Text="{Binding AccountView.Email}"
                    IsVisible="{Binding IsActive, Converter={StaticResource inverseBool}}"
                    StyleClass="accountlist-title, accountlist-title-platform"
                    TextColor="{DynamicResource MutedColor}"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountEmailLabel" />
+                    LineBreakMode="TailTruncation" />
                <Label
                    Grid.Row="1"
                    IsVisible="{Binding ShowHostname}"
                    Text="{Binding AccountView.Hostname}"
                    StyleClass="accountlist-sub, accountlist-sub-platform"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountHostUrlLabel" />
+                    LineBreakMode="TailTruncation" />
                <Label
                    Grid.Row="2"
                    Text="{u:I18n AccountUnlocked}"
@@ -84,8 +81,7 @@
                    StyleClass="accountlist-sub, accountlist-sub-platform"
                    FontAttributes="Italic"
                    TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountStatusLabel" />
+                    LineBreakMode="TailTruncation" />
                <Label
                    Grid.Row="2"
                    Text="{u:I18n AccountLocked}"
@@ -93,8 +89,7 @@
                    StyleClass="accountlist-sub, accountlist-sub-platform"
                    FontAttributes="Italic"
                    TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountStatusLabel" />
+                    LineBreakMode="TailTruncation" />
                <Label
                    Grid.Row="2"
                    Text="{u:I18n AccountLoggedOut}"
@@ -102,8 +97,7 @@
                    StyleClass="accountlist-sub, accountlist-sub-platform"
                    FontAttributes="Italic"
                    TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountStatusLabel" />
+                    LineBreakMode="TailTruncation" />
            </Grid>

            <controls:IconLabel
@@ -113,8 +107,7 @@
                Margin="12,0"
                HorizontalOptions="Center"
                VerticalOptions="Center"
-                StyleClass="list-icon, list-icon-platform"
-                AutomationId="InactiveVaultIcon" />
+                StyleClass="list-icon, list-icon-platform" />
            <controls:IconLabel
                Grid.Column="2"
                Text="{Binding AuthStatusIconActive}" 
@@ -123,8 +116,7 @@
                HorizontalOptions="Center"
                VerticalOptions="Center"
                StyleClass="list-icon, list-icon-platform"
-                TextColor="{DynamicResource TextColor}"
-                AutomationId="ActiveVaultIcon" />
+                TextColor="{DynamicResource TextColor}"/>
        </Grid>

        <Grid
@@ -155,8 +147,7 @@
                StyleClass="accountlist-title, accountlist-title-platform"
                LineBreakMode="TailTruncation"
                VerticalOptions="Center"
-                Grid.Column="1"
-                AutomationId="AddAccountButton" />
+                Grid.Column="1" />
        </Grid>
    </Grid>
 </ViewCell>
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -9,8 +9,7 @@
    StyleClass="list-row, list-row-platform"
    RowSpacing="0"
    ColumnSpacing="0"
-    x:DataType="controls:CipherViewCellViewModel"
-    AutomationId="CipherCell">
+    x:DataType="controls:CipherViewCellViewModel">

    <Grid.Resources>
        <u:IconGlyphConverter x:Key="iconGlyphConverter"/>
@@ -37,8 +36,7 @@
        IsVisible="{Binding ShowIconImage, Converter={StaticResource inverseBool}}"
        Text="{Binding Cipher, Converter={StaticResource iconGlyphConverter}}"
        ShouldUpdateFontSizeDynamicallyForAccesibility="True"
-        AutomationProperties.IsInAccessibleTree="False"
-        AutomationId="CipherTypeIcon" />
+        AutomationProperties.IsInAccessibleTree="False" />

    <ff:CachedImage
        x:Name="_iconImage"
@@ -54,8 +52,7 @@
        Aspect="AspectFit"
        IsVisible="{Binding ShowIconImage}"
        Source="{Binding IconImageSource, Mode=OneTime}"
-        AutomationProperties.IsInAccessibleTree="False"
-        AutomationId="CipherWebsiteIcon" />
+        AutomationProperties.IsInAccessibleTree="False" />

    <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center" Padding="0, 7">
        <Grid.RowDefinitions>
@@ -74,8 +71,7 @@
            Grid.Column="0"
            Grid.Row="0"
            StyleClass="list-title, list-title-platform"
-            Text="{Binding Cipher.Name}"
-            AutomationId="CipherNameLabel" />
+            Text="{Binding Cipher.Name}" />
        <Label
            LineBreakMode="TailTruncation"
            Grid.Column="0"
@@ -84,8 +80,7 @@
            StyleClass="list-subtitle, list-subtitle-platform"
            Text="{Binding Cipher.SubTitle}"
            IsVisible="{Binding Source={RelativeSource Self}, Path=Text,
-                        Converter={StaticResource stringHasValueConverter}}"
-            AutomationId="CipherSubTitleLabel" />
+                        Converter={StaticResource stringHasValueConverter}}"/>
        <controls:IconLabel
            Grid.Column="1"
            Grid.Row="0"
@@ -96,8 +91,7 @@
            Text="{Binding Source={x:Static core:BitwardenIcons.Collection}}"
            IsVisible="{Binding Cipher.Shared, Mode=OneTime}"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Shared}"
-            AutomationId="CipherInCollectionIcon" />
+            AutomationProperties.Name="{u:I18n Shared}" />
        <controls:IconLabel
            Grid.Column="2"
            Grid.Row="0"
@@ -108,8 +102,7 @@
            Text="{Binding Source={x:Static core:BitwardenIcons.Paperclip}}"
            IsVisible="{Binding Cipher.HasAttachments, Mode=OneTime}"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Attachments}"
-            AutomationId="CipherWithAttachmentsIcon" />
+            AutomationProperties.Name="{u:I18n Attachments}" />
    </Grid>

    <controls:MiButton
@@ -121,7 +114,6 @@
        VerticalOptions="CenterAndExpand"
        HorizontalOptions="EndAndExpand"
        AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n Options}"
-        AutomationId="CipherOptionsButton" />
+        AutomationProperties.Name="{u:I18n Options}" />

 </controls:ExtendedGrid>
--- a/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
+++ b/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
@@ -31,7 +31,7 @@ namespace Bit.App.Controls
        public bool ShowIconImage
        {
            get => WebsiteIconsEnabled
-                && !string.IsNullOrWhiteSpace(Cipher.LaunchUri)
+                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
                && IconImageSource != null;
        }

@@ -41,7 +41,7 @@ namespace Bit.App.Controls
            {
                if (_iconImageSource == string.Empty) // default value since icon source can return null
                {
-                    _iconImageSource = IconImageHelper.GetIconImage(Cipher);
+                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
                }
                return _iconImageSource;
            }
--- a/src/App/Controls/CustomLabel.cs
+++ b/src/App/Controls/CustomLabel.cs
@@ -1,13 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class CustomLabel : Label
-    {
-        public CustomLabel()
-        {
-        }
-
-        public int? FontWeight { get; set; }
-    }
-}
--- a/src/App/Controls/SendViewCell/SendViewCell.xaml
+++ b/src/App/Controls/SendViewCell/SendViewCell.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Controls.SendViewCell"
@@ -54,16 +54,14 @@
            Grid.Column="0"
            Grid.Row="0"
            StyleClass="list-title, list-title-platform"
-            Text="{Binding Send.Name}"
-            AutomationId="SendNameLabel" />
+            Text="{Binding Send.Name}" />
        <Label
            LineBreakMode="TailTruncation"
            Grid.Column="0"
            Grid.Row="1"
            Grid.ColumnSpan="6"
            StyleClass="list-subtitle, list-subtitle-platform"
-            Text="{Binding Send.DisplayDate}"
-            AutomationId="SendDateLabel" />
+            Text="{Binding Send.DisplayDate}" />
        <controls:IconLabel
            Grid.Column="1"
            Grid.Row="0"
@@ -74,8 +72,7 @@
            Text="{Binding Source={x:Static core:BitwardenIcons.ExclamationTriangle}}"
            IsVisible="{Binding Send.Disabled, Mode=OneTime}"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Disabled}"
-            AutomationId="DisabledSendLabel" />
+            AutomationProperties.Name="{u:I18n Disabled}" />
        <controls:IconLabel
            Grid.Column="2"
            Grid.Row="0"
@@ -86,8 +83,7 @@
            Text="{Binding Source={x:Static core:BitwardenIcons.Key}}"
            IsVisible="{Binding Send.HasPassword, Mode=OneTime}"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Password}"
-            AutomationId="PasswordProtectedSendLabel" />
+            AutomationProperties.Name="{u:I18n Password}" />
        <controls:IconLabel
            Grid.Column="3"
            Grid.Row="0"
@@ -98,8 +94,7 @@
            Text="{Binding Source={x:Static core:BitwardenIcons.Ban}}"
            IsVisible="{Binding Send.MaxAccessCountReached, Mode=OneTime}"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n MaxAccessCountReached}"
-            AutomationId="SendMaxAccessCountReachedLabel" />
+            AutomationProperties.Name="{u:I18n MaxAccessCountReached}" />
        <controls:IconLabel
            Grid.Column="4"
            Grid.Row="0"
@@ -110,8 +105,7 @@
            Text="{Binding Source={x:Static core:BitwardenIcons.Clock}}"
            IsVisible="{Binding Send.Expired, Mode=OneTime}"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Expired}"
-            AutomationId="ExpiredSendLabel" />
+            AutomationProperties.Name="{u:I18n Expired}" />
        <controls:IconLabel
            Grid.Column="5"
            Grid.Row="0"
@@ -122,8 +116,7 @@
            Text="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
            IsVisible="{Binding Send.PendingDelete, Mode=OneTime}"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n PendingDelete}"
-            AutomationId="SendWithPendingDeletionLabel" />
+            AutomationProperties.Name="{u:I18n PendingDelete}" />
    </Grid>

    <controls:MiButton
@@ -136,7 +129,6 @@
        VerticalOptions="CenterAndExpand"
        HorizontalOptions="EndAndExpand"
        AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n Options}"
-        AutomationId="SendOptionsButton" />
+        AutomationProperties.Name="{u:I18n Options}" />

 </controls:ExtendedGrid>
--- a/src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml
@@ -33,8 +33,7 @@
            StyleClass="box-label"
            Grid.Row="0"
            Grid.Column="0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
-            AutomationId="BooleanCustomFieldNameLabel" />
+            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
        <Label
            Text="{Binding Field.Name, Mode=OneWay}"
            IsVisible="{Binding IsEditing}"
@@ -50,15 +49,13 @@
            Grid.Row="1"
            Grid.Column="0"
            Margin="0, 5, 0, 0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
-            AutomationId="BooleanCustomFieldValueLabel" />
+            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"  />
        <Switch
            IsToggled="{Binding BooleanValue}"
            IsVisible="{Binding IsEditing}"
            Grid.Row="0"
            Grid.Column="1"
-            Grid.RowSpan="2"
-            AutomationId="BooleanCustomFieldValueToggle" />
+            Grid.RowSpan="2" />
        <controls:IconButton 
            StyleClass="box-row-button, box-row-button-platform"
            Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
--- a/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml
@@ -31,8 +31,7 @@
            Text="{Binding Field.Name, Mode=OneWay}"
            StyleClass="box-label"
            Grid.Row="0"
-            Grid.Column="0"
-            AutomationId="HiddenCustomFieldNameLabel" />
+            Grid.Column="0" />
        <StackLayout
            Grid.Row="1"
            Grid.Column="0"
@@ -40,8 +39,7 @@
            <controls:MonoLabel
                Text="{Binding ValueText, Mode=OneWay}"
                StyleClass="box-value"
-                IsVisible="{Binding ShowHiddenValue}"
-                AutomationId="HiddenCustomFieldValueLabel" />
+                IsVisible="{Binding ShowHiddenValue}" />
            <controls:MonoLabel
                Text="{Binding Field.MaskedValue, Mode=OneWay}"
                StyleClass="box-value"
@@ -56,10 +54,7 @@
            IsPassword="{Binding ShowHiddenValue, Converter={StaticResource inverseBool}}"
            IsEnabled="{Binding ShowViewHidden}"
            IsSpellCheckEnabled="False"
-            IsTextPredictionEnabled="False"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Field.Name}"
-            AutomationId="HiddenCustomFieldValueEntry">
+            IsTextPredictionEnabled="False">
            <Entry.Keyboard>
                <Keyboard x:FactoryMethod="Create">
                    <x:Arguments>
@@ -77,8 +72,7 @@
            Grid.Column="1"
            Grid.RowSpan="2"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n ToggleVisibility}"
-            AutomationId="HiddenCustomFieldShowValueButton" />
+            AutomationProperties.Name="{u:I18n ToggleVisibility}" />
        <controls:IconButton
            StyleClass="box-row-button, box-row-button-platform"
            Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
--- a/src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml
@@ -29,15 +29,13 @@
            Text="{Binding Field.Name, Mode=OneWay}"
            StyleClass="box-label"
            Grid.Row="0"
-            Grid.Column="0"
-            AutomationId="LinkedCustomFieldNameLabel" />
+            Grid.Column="0" />
        <controls:IconLabel
            Text="{Binding ValueText, Mode=OneWay}"
            StyleClass="box-value"
            Grid.Row="1"
            Grid.Column="0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
-            AutomationId="LinkedCustomFieldValueLabel" />
+            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
        <StackLayout
            StyleClass="box-row, box-row-input"
            IsVisible="{Binding IsEditing}">
@@ -46,8 +44,7 @@
                ItemsSource="{Binding LinkedFieldOptions, Mode=OneTime}"
                SelectedIndex="{Binding LinkedFieldOptionSelectedIndex}"
                ItemDisplayBinding="{Binding Key}"
-                StyleClass="box-value"
-                AutomationId="LinkedCustomFieldValuePicker" />
+                StyleClass="box-value" />
        </StackLayout>
        <controls:IconButton 
            StyleClass="box-row-button, box-row-button-platform"
@@ -58,8 +55,7 @@
            Grid.Column="1"
            Grid.RowSpan="2"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Options}"
-            AutomationId="LinkedCustomFieldOptionsButton" />
+            AutomationProperties.Name="{u:I18n Options}" />
    </Grid>
    <BoxView StyleClass="box-row-separator" IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
 </StackLayout>
--- a/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml
@@ -29,24 +29,19 @@
            Text="{Binding Field.Name, Mode=OneWay}"
            StyleClass="box-label"
            Grid.Row="0"
-            Grid.Column="0"
-            AutomationId="TextCustomFieldNameLabel" />
+            Grid.Column="0" />
        <Label
            Text="{Binding ValueText, Mode=OneWay}"
            StyleClass="box-value"
            Grid.Row="1"
            Grid.Column="0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
-            AutomationId="TextCustomFieldValueLabel" />
+            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
        <Entry
            Text="{Binding Field.Value}"
            StyleClass="box-value"
            Grid.Row="1"
            Grid.Column="0"
-            IsVisible="{Binding IsEditing}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Field.Name}"
-            AutomationId="TextCustomFieldValueEntry" />
+            IsVisible="{Binding IsEditing}" />
        <controls:IconButton
            StyleClass="box-row-button, box-row-button-platform"
            Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -56,8 +51,7 @@
            Grid.Column="1"
            Grid.RowSpan="2"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Copy}"
-            AutomationId="TextCustomFieldCopyValue" />
+            AutomationProperties.Name="{u:I18n Copy}" />
        <controls:IconButton 
            StyleClass="box-row-button, box-row-button-platform"
            Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
@@ -67,8 +61,7 @@
            Grid.Column="1"
            Grid.RowSpan="2"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Options}"
-            AutomationId="TextCustomFieldOptionsButton" />
+            AutomationProperties.Name="{u:I18n Options}" />
    </Grid>
    <BoxView StyleClass="box-row-separator" IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
 </StackLayout>
--- a/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs
+++ b/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs
@@ -1,7 +1,10 @@
-using System.Text;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Domain;
@@ -70,13 +73,13 @@ namespace Bit.App.Pages
            set => SetProperty(ref _policy, value);
        }

-        public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
+        public string ShowPasswordIcon => ShowPassword ? "" : "";
        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
        public string MasterPassword { get; set; }
        public string ConfirmMasterPassword { get; set; }
        public string Hint { get; set; }

-        public virtual async Task InitAsync(bool forceSync = false)
+        public async Task InitAsync(bool forceSync = false)
        {
            if (forceSync)
            {
--- a/src/App/Pages/Accounts/EnvironmentPage.xaml
+++ b/src/App/Pages/Accounts/EnvironmentPage.xaml
@@ -34,8 +34,7 @@
                        Placeholder="ex. https://bitwarden.company.com"
                        StyleClass="box-value"
                        ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="ServerUrlEntry"/>
+                        ReturnCommand="{Binding SubmitCommand}" />
                </StackLayout>
                <Label
                    Text="{u:I18n SelfHostedEnvironmentFooter}"
@@ -54,8 +53,7 @@
                        x:Name="_webVaultEntry"
                        Text="{Binding WebVaultUrl}"
                        Keyboard="Url"
-                        StyleClass="box-value"
-                        AutomationId="WebVaultUrlEntry"/>
+                        StyleClass="box-value" />
                </StackLayout>
                <StackLayout StyleClass="box-row">
                    <Label
@@ -65,8 +63,7 @@
                        x:Name="_apiEntry"
                        Text="{Binding ApiUrl}"
                        Keyboard="Url"
-                        StyleClass="box-value"
-                        AutomationId="ApiUrlEntry"/>
+                        StyleClass="box-value" />
                </StackLayout>
                <StackLayout StyleClass="box-row">
                    <Label
@@ -76,8 +73,7 @@
                        x:Name="_identityEntry"
                        Text="{Binding IdentityUrl}"
                        Keyboard="Url"
-                        StyleClass="box-value"
-                        AutomationId="IdentityUrlEntry"/>
+                        StyleClass="box-value" />
                </StackLayout>
                <StackLayout StyleClass="box-row">
                    <Label
@@ -89,8 +85,7 @@
                        Keyboard="Url"
                        StyleClass="box-value"
                        ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="IconsUrlEntry"/>
+                        ReturnCommand="{Binding SubmitCommand}" />
                </StackLayout>
                <Label
                    Text="{u:I18n CustomEnvironmentFooter}"
--- a/src/App/Pages/Accounts/EnvironmentPageViewModel.cs
+++ b/src/App/Pages/Accounts/EnvironmentPageViewModel.cs
@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
-using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;

@@ -19,8 +18,7 @@ namespace Bit.App.Pages
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");

            PageTitle = AppResources.Settings;
-            BaseUrl = _environmentService.BaseUrl == EnvironmentUrlData.DefaultEU.Base || EnvironmentUrlData.DefaultUS.Base == _environmentService.BaseUrl ?
-                string.Empty : _environmentService.BaseUrl;
+            BaseUrl = _environmentService.BaseUrl;
            WebVaultUrl = _environmentService.WebVaultUrl;
            ApiUrl = _environmentService.ApiUrl;
            IdentityUrl = _environmentService.IdentityUrl;
--- a/src/App/Pages/Accounts/HomePage.xaml
+++ b/src/App/Pages/Accounts/HomePage.xaml
@@ -23,9 +23,12 @@
            Priority="-1"
            UseOriginalImage="True"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}"
-            AutomationId="AccountIconButton" />
+            AutomationProperties.Name="{u:I18n Account}" />
        <ToolbarItem x:Name="_closeButton" Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1"/>
+        <ToolbarItem
+            Icon="cog_environment.png" Clicked="Environment_Clicked" Order="Primary"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n Options}" />
    </ContentPage.ToolbarItems>

    <ContentPage.Resources>
@@ -50,9 +53,7 @@
                        Keyboard="Email"
                        StyleClass="box-value"
                        ReturnType="Go"
-                        ReturnCommand="{Binding ContinueCommand}"
-                        AutomationId="EmailAddressEntry"
-                        >
+                        ReturnCommand="{Binding ContinueCommand}">
                        <VisualStateManager.VisualStateGroups>
                            <VisualStateGroup x:Name="CommonStates">
                                <VisualState x:Name="Disabled">
@@ -65,28 +66,7 @@
                    </Entry>
                    <StackLayout
                        Orientation="Horizontal"
-                        Margin="0, 6, 0 ,0">
-                        <StackLayout.GestureRecognizers>
-                            <TapGestureRecognizer
-                                Command="{Binding ShowEnvironmentPickerCommand}" />
-                        </StackLayout.GestureRecognizers>
-                        <Label
-                            Text="{Binding RegionText}"
-                            FontSize="13"
-                            TextColor="{DynamicResource MutedColor}"
-                            VerticalOptions="Center"
-                            VerticalTextAlignment="Center"/>
-                        <controls:IconLabel
-                            Text="{Binding SelectedEnvironmentName}"
-                            FontSize="13"
-                            TextColor="{DynamicResource PrimaryColor}"
-                            VerticalOptions="Center"
-                            VerticalTextAlignment="Center"
-                            AutomationId="RegionSelectorDropdown"/>
-                    </StackLayout>
-                    <StackLayout
-                        Orientation="Horizontal"
-                        Margin="0, 20, 0 ,0">
+                        Margin="0, 16, 0 ,0">
                        <StackLayout.GestureRecognizers>
                            <TapGestureRecognizer
                                Command="{Binding RememberEmailCommand}" />
@@ -96,27 +76,21 @@
                            StyleClass="text-sm"
                            HorizontalOptions="FillAndExpand"
                            VerticalOptions="Center"
-                            VerticalTextAlignment="Center"
-                            />
+                            VerticalTextAlignment="Center"/>
                        <Switch
                            Scale="0.8"
                            IsToggled="{Binding RememberEmail}"
-                            VerticalOptions="Center"
-                            AutomationId="RememberMeSwitch"
-                            />
+                            VerticalOptions="Center"/>
                    </StackLayout>
                </StackLayout>
                <Button Text="{u:I18n Continue}"
                        StyleClass="btn-primary"
                        IsEnabled="{Binding CanContinue}"
-                        Command="{Binding ContinueCommand}"
-                        AutomationId="ContinueButton"
-                        />
+                        Command="{Binding ContinueCommand}" />
                        
                <Label FormattedText="{Binding CreateAccountText}"
                       Margin="0, 10"
-                        StyleClass="box-footer-label"
-                        AutomationId="CreateAccountLabel">
+                        StyleClass="box-footer-label">
                    <Label.GestureRecognizers>
                        <TapGestureRecognizer Command="{Binding CreateAccountCommand}" />
                    </Label.GestureRecognizers>
@@ -142,4 +116,5 @@
            MainPage="{Binding Source={x:Reference _page}}"
            BindingContext="{Binding AccountSwitchingOverlayViewModel}"/>
    </AbsoluteLayout>
+
 </pages:BaseContentPage>
--- a/src/App/Pages/Accounts/HomePage.xaml.cs
+++ b/src/App/Pages/Accounts/HomePage.xaml.cs
@@ -15,8 +15,6 @@ namespace Bit.App.Pages
        private readonly AppOptions _appOptions;
        private IBroadcasterService _broadcasterService;

-        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>();
-
        public HomePage(AppOptions appOptions = null)
        {
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
@@ -72,14 +70,6 @@ namespace Bit.App.Pages
                    });
                }
            });
-            try
-            {
-                await _vm.UpdateEnvironment();
-            }
-            catch (Exception ex)
-            {
-                _logger.Value?.Exception(ex);
-            }
        }

        protected override bool OnBackButtonPressed()
@@ -138,6 +128,14 @@ namespace Bit.App.Pages
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

+        private void Environment_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.StartEnvironmentAction();
+            }
+        }
+
        private async Task StartEnvironmentAsync()
        {
            await _accountListOverlay.HideAsync();
--- a/src/App/Pages/Accounts/HomePageViewModel.cs
+++ b/src/App/Pages/Accounts/HomePageViewModel.cs
@@ -4,10 +4,7 @@ using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
 using Bit.App.Utilities;
-using Bit.Core;
 using Bit.Core.Abstractions;
-using Bit.Core.Models.Data;
-using Bit.Core.Models.Response;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -20,19 +17,16 @@ namespace Bit.App.Pages
    {
        private readonly IStateService _stateService;
        private readonly IMessagingService _messagingService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly ILogger _logger;
-        private readonly IEnvironmentService _environmentService;
-        private readonly IAccountsManager _accountManager;
-        private readonly IConfigService _configService;

        private bool _showCancelButton;
        private bool _rememberEmail;
        private string _email;
-        private string _selectedEnvironmentName;
        private bool _isEmailEnabled;
        private bool _canLogin;
-        private bool _displayEuEnvironment;
+        private IPlatformUtilsService _platformUtilsService;
+        private ILogger _logger;
+        private IEnvironmentService _environmentService;
+        private IAccountsManager _accountManager;

        public HomeViewModel()
        {
@@ -42,7 +36,6 @@ namespace Bit.App.Pages
            _logger = ServiceContainer.Resolve<ILogger>();
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>();
            _accountManager = ServiceContainer.Resolve<IAccountsManager>();
-            _configService = ServiceContainer.Resolve<IConfigService>();

            PageTitle = AppResources.Bitwarden;

@@ -56,8 +49,6 @@ namespace Bit.App.Pages
                onException: _logger.Exception, allowsMultipleExecutions: false);
            CloseCommand = new AsyncCommand(async () => await Device.InvokeOnMainThreadAsync(CloseAction),
                onException: _logger.Exception, allowsMultipleExecutions: false);
-            ShowEnvironmentPickerCommand = new AsyncCommand(ShowEnvironmentPickerAsync,
-                onException: _logger.Exception, allowsMultipleExecutions: false);
            InitAsync().FireAndForget();
        }

@@ -80,13 +71,6 @@ namespace Bit.App.Pages
                additionalPropertyNames: new[] { nameof(CanContinue) });
        }

-        public string SelectedEnvironmentName
-        {
-            get => $"{_selectedEnvironmentName} {BitwardenIcons.AngleDown}";
-            set => SetProperty(ref _selectedEnvironmentName, value);
-        }
-
-        public string RegionText => $"{AppResources.Region}:";
        public bool CanContinue => !string.IsNullOrEmpty(Email);

        public FormattedString CreateAccountText
@@ -117,13 +101,11 @@ namespace Bit.App.Pages
        public AsyncCommand ContinueCommand { get; }
        public AsyncCommand CloseCommand { get; }
        public AsyncCommand CreateAccountCommand { get; }
-        public AsyncCommand ShowEnvironmentPickerCommand { get; }

        public async Task InitAsync()
        {
            Email = await _stateService.GetRememberedEmailAsync();
            RememberEmail = !string.IsNullOrEmpty(Email);
-            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag, forceRefresh: true);
        }

        public async Task ContinueToLoginStepAsync()
@@ -162,59 +144,5 @@ namespace Bit.App.Pages
                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage, AppResources.AnErrorHasOccurred, AppResources.Ok);
            }
        }
-
-        public async Task ShowEnvironmentPickerAsync()
-        {
-            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag);
-            var options = _displayEuEnvironment
-                    ? new string[] { AppResources.US, AppResources.EU, AppResources.SelfHosted }
-                    : new string[] { AppResources.US, AppResources.SelfHosted };
-
-            await Device.InvokeOnMainThreadAsync(async () =>
-            {
-                var result = await Page.DisplayActionSheet(AppResources.DataRegion, AppResources.Cancel, null, options);
-
-                if (result is null || result == AppResources.Cancel)
-                {
-                    return;
-                }
-
-                if (result == AppResources.SelfHosted)
-                {
-                    StartEnvironmentAction?.Invoke();
-                    return;
-                }
-
-                await _environmentService.SetUrlsAsync(result == AppResources.EU ? EnvironmentUrlData.DefaultEU : EnvironmentUrlData.DefaultUS);
-                await _configService.GetAsync(true);
-                SelectedEnvironmentName = result;
-            });
-        }
-
-        public async Task UpdateEnvironment()
-        {
-            var environmentsSaved = await _stateService.GetPreAuthEnvironmentUrlsAsync();
-            if (environmentsSaved == null || environmentsSaved.IsEmpty)
-            {
-                await _environmentService.SetUrlsAsync(EnvironmentUrlData.DefaultUS);
-                environmentsSaved = EnvironmentUrlData.DefaultUS;
-                SelectedEnvironmentName = AppResources.US;
-                return;
-            }
-
-            if (environmentsSaved.Base == EnvironmentUrlData.DefaultUS.Base)
-            {
-                SelectedEnvironmentName = AppResources.US;
-            }
-            else if (environmentsSaved.Base == EnvironmentUrlData.DefaultEU.Base)
-            {
-                SelectedEnvironmentName = AppResources.EU;
-            }
-            else
-            {
-                await _configService.GetAsync(true);
-                SelectedEnvironmentName = AppResources.SelfHosted;
-            }
-        }
    }
 }
--- a/src/App/Pages/Accounts/LockPage.xaml
+++ b/src/App/Pages/Accounts/LockPage.xaml
@@ -24,8 +24,7 @@
                Priority="-1"
                UseOriginalImage="True"
                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Account}"
-                AutomationId="AccountIconButton" />
+                AutomationProperties.Name="{u:I18n Account}" />
    </ContentPage.ToolbarItems>
    
    <ContentPage.Resources>
@@ -72,8 +71,7 @@
                                Grid.Row="1"
                                Grid.Column="0"
                                ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}" 
-                                AutomationId="PinEntry" />
+                                ReturnCommand="{Binding SubmitCommand}" />
                            <controls:IconButton
                                StyleClass="box-row-button, box-row-button-platform"
                                Text="{Binding ShowPasswordIcon}"
@@ -83,8 +81,7 @@
                                Grid.RowSpan="2"
                                AutomationProperties.IsInAccessibleTree="True"
                                AutomationProperties.Name="{u:I18n ToggleVisibility}" 
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                AutomationId="PinVisibilityToggle" />
+                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
                        </Grid>
                        <Grid
                            x:Name="_passwordGrid"
@@ -114,8 +111,7 @@
                                Grid.Row="1"
                                Grid.Column="0"
                                ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}"
-                                AutomationId="MasterPasswordEntry" />
+                                ReturnCommand="{Binding SubmitCommand}" />
                            <controls:IconButton
                                StyleClass="box-row-button, box-row-button-platform"
                                Text="{Binding ShowPasswordIcon}"
@@ -125,9 +121,7 @@
                                Grid.RowSpan="2"
                                AutomationProperties.IsInAccessibleTree="True"
                                AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                AutomationId="PasswordVisibilityToggle"
-                                />
+                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                        </Grid>
                        <StackLayout
                            StyleClass="box-row"
@@ -143,7 +137,7 @@
                    </StackLayout>
                    <StackLayout Padding="10, 0">
                        <Label
-                            Text="{u:I18n AccountBiometricInvalidated}"
+                            Text="{u:I18n BiometricInvalidated}"
                            StyleClass="box-footer-label,text-danger,text-bold"
                            IsVisible="{Binding BiometricIntegrityValid, Converter={StaticResource inverseBool}}" />
                        <Button Text="{Binding BiometricButtonText}" Clicked="Biometric_Clicked"
@@ -153,8 +147,7 @@
                            x:Name="_unlockButton"
                            Text="{u:I18n Unlock}"
                            StyleClass="btn-primary"
-                            Clicked="Unlock_Clicked"
-                            AutomationId="UnlockVaultButton" />
+                            Clicked="Unlock_Clicked" />
                    </StackLayout>
                </StackLayout>
            </ScrollView>
--- a/src/App/Pages/Accounts/LockPageViewModel.cs
+++ b/src/App/Pages/Accounts/LockPageViewModel.cs
@@ -31,8 +31,6 @@ namespace Bit.App.Pages
        private readonly ILogger _logger;
        private readonly IWatchDeviceService _watchDeviceService;
        private readonly WeakEventManager<int?> _secretEntryFocusWeakEventManager = new WeakEventManager<int?>();
-        private readonly IPolicyService _policyService;
-        private readonly IPasswordGenerationService _passwordGenerationService;

        private string _email;
        private string _masterPassword;
@@ -63,8 +61,6 @@ namespace Bit.App.Pages
            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
            _logger = ServiceContainer.Resolve<ILogger>("logger");
            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
-            _policyService = ServiceContainer.Resolve<IPolicyService>();
-            _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>();

            PageTitle = AppResources.VerifyMasterPassword;
            TogglePasswordCommand = new Command(TogglePassword);
@@ -209,7 +205,7 @@ namespace Bit.App.Pages

            if (BiometricLock)
            {
-                BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
+                BiometricIntegrityValid = await _biometricService.ValidateIntegrityAsync();
                if (!_biometricIntegrityValid)
                {
                    BiometricButtonVisible = false;
@@ -298,7 +294,6 @@ namespace Bit.App.Pages
                var key = await _cryptoService.MakeKeyAsync(MasterPassword, _email, kdfConfig);
                var storedKeyHash = await _cryptoService.GetKeyHashAsync();
                var passwordValid = false;
-                MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;

                if (storedKeyHash != null)
                {
@@ -310,11 +305,9 @@ namespace Bit.App.Pages
                    var keyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
                    var request = new PasswordVerificationRequest();
                    request.MasterPasswordHash = keyHash;
-
                    try
                    {
-                        var response = await _apiService.PostAccountVerifyPasswordAsync(request);
-                        enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
+                        await _apiService.PostAccountVerifyPasswordAsync(request);
                        passwordValid = true;
                        var localKeyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
                        await _cryptoService.SetKeyHashAsync(localKeyHash);
@@ -335,14 +328,6 @@ namespace Bit.App.Pages
                        var pinKey = await _cryptoService.MakePinKeyAysnc(decPin, _email, kdfConfig);
                        await _stateService.SetPinProtectedKeyAsync(await _cryptoService.EncryptAsync(key.Key, pinKey));
                    }
-
-                    if (await RequirePasswordChangeAsync(enforcedMasterPasswordOptions))
-                    {
-                        // Save the ForcePasswordResetReason to force a password reset after unlock
-                        await _stateService.SetForcePasswordResetReasonAsync(
-                            ForcePasswordResetReason.WeakMasterPasswordOnLogin);
-                    }
-
                    MasterPassword = string.Empty;
                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                    await SetKeyAndContinueAsync(key);
@@ -367,37 +352,6 @@ namespace Bit.App.Pages
            }
        }

-        /// <summary>
-        /// Checks if the master password requires updating to meet the enforced policy requirements
-        /// </summary>
-        /// <param name="options"></param>
-        private async Task<bool> RequirePasswordChangeAsync(MasterPasswordPolicyOptions options = null)
-        {
-            // If no policy options are provided, attempt to load them from the policy service
-            var enforcedOptions = options ?? await _policyService.GetMasterPasswordPolicyOptions();
-
-            // No policy to enforce on login/unlock
-            if (!(enforcedOptions is { EnforceOnLogin: true }))
-            {
-                return false;
-            }
-
-            var strength = _passwordGenerationService.PasswordStrength(
-                MasterPassword, _passwordGenerationService.GetPasswordStrengthUserInput(_email))?.Score;
-
-            if (!strength.HasValue)
-            {
-                _logger.Error("Unable to evaluate master password strength during unlock");
-                return false;
-            }
-
-            return !await _policyService.EvaluateMasterPassword(
-                strength.Value,
-                MasterPassword,
-                enforcedOptions
-            );
-        }
-
        public async Task LogOutAsync()
        {
            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.LogoutConfirmation,
@@ -431,8 +385,7 @@ namespace Bit.App.Pages

        public async Task PromptBiometricAsync()
        {
-            BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
-            BiometricButtonVisible = BiometricIntegrityValid;
+            BiometricIntegrityValid = await _biometricService.ValidateIntegrityAsync();
            if (!BiometricLock || !BiometricIntegrityValid)
            {
                return;
--- a/src/App/Pages/Accounts/LoginPage.xaml
+++ b/src/App/Pages/Accounts/LoginPage.xaml
@@ -9,23 +9,23 @@
    xmlns:u="clr-namespace:Bit.App.Utilities"
    x:DataType="pages:LoginPageViewModel"
    x:Name="_page"
-    Title="{Binding PageTitle}"
-    AutomationId="PageTitleLabel">
+    Title="{Binding PageTitle}">
    
    <ContentPage.BindingContext>
        <pages:LoginPageViewModel />
    </ContentPage.BindingContext>
+
    <ContentPage.ToolbarItems>
        <controls:ExtendedToolbarItem
                x:Name="_accountAvatar"
+                x:Key="accountAvatar"
                IconImageSource="{Binding AvatarImageSource}"
                Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
                Order="Primary"
                Priority="-1"
                UseOriginalImage="True"
                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Account}"
-                AutomationId="AccountIconButton" />
+                AutomationProperties.Name="{u:I18n Account}" />
    </ContentPage.ToolbarItems>

    <ContentPage.Resources>
@@ -34,8 +34,7 @@
            <ToolbarItem Icon="more_vert.png" Clicked="More_Clicked" Order="Primary"
                x:Name="_moreItem" x:Key="moreItem"
                 AutomationProperties.IsInAccessibleTree="True"
-                 AutomationProperties.Name="{u:I18n Options}"
-                 AutomationId="OptionsButton" />
+                 AutomationProperties.Name="{u:I18n Options}" />
            <ToolbarItem Text="{u:I18n GetPasswordHint}"
                x:Key="getPasswordHint"
                x:Name="_getPasswordHint"
@@ -76,9 +75,7 @@
                                Grid.Row="1"
                                Grid.Column="0"
                                ReturnType="Go"
-                                ReturnCommand="{Binding LogInCommand}"
-                                AutomationId="MasterPasswordEntry"
-                            />
+                                ReturnCommand="{Binding LogInCommand}" />
                            <controls:IconButton
                                StyleClass="box-row-button, box-row-button-platform"
                                Text="{Binding ShowPasswordIcon}"
@@ -87,7 +84,6 @@
                                Grid.Column="1"
                                Grid.RowSpan="1"
                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationId="PasswordVisibilityToggle"
                                AutomationProperties.Name="{u:I18n ToggleVisibility}"
                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
                            <Label
@@ -97,9 +93,7 @@
                                Padding="0,5,0,0"
                                Grid.Row="2"
                                Grid.Column="0"
-                                Grid.ColumnSpan="2"
-                                AutomationId="GetMasterPasswordHintLabel"
-                                >
+                                Grid.ColumnSpan="2">
                                <Label.GestureRecognizers>
                                    <TapGestureRecognizer Tapped="Hint_Clicked" />
                                </Label.GestureRecognizers>
@@ -110,24 +104,19 @@
                        <Button x:Name="_loginWithMasterPassword"
                            Text="{u:I18n LogInWithMasterPassword}" 
                                StyleClass="btn-primary"
-                                Clicked="LogIn_Clicked"
-                                AutomationId="LogInWithMasterPasswordButton"
-                                />
+                                Clicked="LogIn_Clicked" />
                        <controls:IconLabelButton
                            HorizontalOptions="Fill"
                            VerticalOptions="CenterAndExpand"
                            Icon="{Binding Source={x:Static core:BitwardenIcons.Device}}"
                            Label="{u:I18n LogInWithAnotherDevice}"
                            ButtonCommand="{Binding LogInWithDeviceCommand}"
-                            IsVisible="{Binding IsKnownDevice}"
-                            AutomationId="LogInWithAnotherDeviceButton"
-                            />
+                            IsVisible="{Binding IsKnownDevice}"/>
                        <controls:IconLabelButton
                            HorizontalOptions="Fill"
                            VerticalOptions="CenterAndExpand"
                            Icon="{Binding Source={x:Static core:BitwardenIcons.Suitcase}}"
-                            Label="{u:I18n LogInSso}"
-                            AutomationId="LogInWithSsoButton">
+                            Label="{u:I18n LogInSso}">
                            <controls:IconLabelButton.GestureRecognizers>
                                <TapGestureRecognizer Tapped="LogInSSO_Clicked" />
                            </controls:IconLabelButton.GestureRecognizers>
@@ -135,15 +124,12 @@
                        <Label
                            Text="{Binding LoggingInAsText}"
                            StyleClass="text-sm"
-                            Margin="0,40,0,0"
-                            AutomationId="LoggingInAsLabel"
-                            />
+                            Margin="0,40,0,0"/>
                        <Label
                            Text="{u:I18n NotYou}"
                            StyleClass="text-md"
                            HorizontalOptions="Start"
-                            TextColor="{DynamicResource HyperlinkColor}"
-                            AutomationId="NotYouLabel">
+                            TextColor="{DynamicResource HyperlinkColor}">
                            <Label.GestureRecognizers>
                                <TapGestureRecognizer Tapped="Cancel_Clicked" />
                            </Label.GestureRecognizers>
--- a/src/App/Pages/Accounts/LoginPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPageViewModel.cs
@@ -41,7 +41,6 @@ namespace Bit.App.Pages
        private bool _isEmailEnabled;
        private bool _isKnownDevice;
        private bool _isExecutingLogin;
-        private string _environmentHostName;

        public LoginPageViewModel()
        {
@@ -116,16 +115,6 @@ namespace Bit.App.Pages
            set => SetProperty(ref _isKnownDevice, value);
        }

-        public string EnvironmentDomainName
-        {
-            get => _environmentHostName;
-            set => SetProperty(ref _environmentHostName, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(LoggingInAsText)
-                });
-        }
-
        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
        public Command LogInCommand { get; }
        public Command TogglePasswordCommand { get; }
@@ -133,7 +122,7 @@ namespace Bit.App.Pages
        public ICommand LogInWithDeviceCommand { get; }
        public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
-        public string LoggingInAsText => string.Format(AppResources.LoggingInAsXOnY, Email, EnvironmentDomainName);
+        public string LoggingInAsText => string.Format(AppResources.LoggingInAsX, Email);
        public bool IsIosExtension { get; set; }
        public bool CanRemoveAccount { get; set; }
        public Action StartTwoFactorAction { get; set; }
@@ -162,7 +151,6 @@ namespace Bit.App.Pages
                    Email = await _stateService.GetRememberedEmailAsync();
                }
                CanRemoveAccount = await _stateService.GetActiveUserEmailAsync() != Email;
-                EnvironmentDomainName = CoreHelpers.GetDomain((await _stateService.GetPreAuthEnvironmentUrlsAsync())?.Base);
                IsKnownDevice = await _apiService.GetKnownDeviceAsync(Email, await _appIdService.GetAppIdAsync());
            }
            catch (ApiException apiEx) when (apiEx.Error.StatusCode == System.Net.HttpStatusCode.Unauthorized)
--- a/src/App/Pages/Accounts/LoginPasswordlessPage.xaml
+++ b/src/App/Pages/Accounts/LoginPasswordlessPage.xaml
@@ -32,8 +32,7 @@
                <Label
                    Text="{Binding LogInAttemptByLabel}"
                    FontSize="Small"
-                    Margin="0,0,0,24"
-                    AutomationId="LogInAttemptByLabel" />
+                    Margin="0,0,0,24"/>
                <Label
                    Text="{u:I18n FingerprintPhrase}"
                    FontSize="Small"
@@ -42,8 +41,7 @@
                    FormattedText="{Binding LoginRequest.FingerprintPhrase}"
                    FontSize="Medium"
                    TextColor="{DynamicResource FingerprintPhrase}"
-                    Margin="0,0,0,27"
-                    AutomationId="FingerprintValueLabel" />
+                    Margin="0,0,0,27"/>
                <Label
                    Text="{u:I18n DeviceType}"
                    FontSize="Small"
@@ -51,8 +49,7 @@
                <Label
                    Text="{Binding LoginRequest.DeviceType}"
                    FontSize="Small"
-                    Margin="0,0,0,21"
-                    AutomationId="DeviceTypeValueLabel" />
+                    Margin="0,0,0,21"/>
                <Label
                    Text="{u:I18n IpAddress}"
                    IsVisible="{Binding ShowIpAddress}"
@@ -62,8 +59,7 @@
                    Text="{Binding LoginRequest.IpAddress}"
                    IsVisible="{Binding ShowIpAddress}"
                    FontSize="Small"
-                    Margin="0,0,0,21"
-                    AutomationId="IpAddressValueLabel" />
+                    Margin="0,0,0,21"/>
                <Label
                    Text="{u:I18n Time}"
                    FontSize="Small"
@@ -71,8 +67,7 @@
                <Label
                    Text="{Binding TimeOfRequestText}"
                    FontSize="Small"
-                    Margin="0,0,0,57"
-                    AutomationId="TimeOfRequestValueLabel" />
+                    Margin="0,0,0,57"/>
            </StackLayout>
        </ScrollView>

@@ -80,13 +75,11 @@
                Text="{u:I18n ConfirmLogIn}"
                Command="{Binding AcceptRequestCommand}"
                Margin="0,0,0,17"
-                StyleClass="btn-primary"
-                AutomationId="ConfirmLoginButton" />
+                StyleClass="btn-primary"/>
        <Button
                Text="{u:I18n DenyLogIn}"
                Command="{Binding RejectRequestCommand}"
-                StyleClass="btn-secundary"
-                AutomationId="DenyLoginButton" />
+                StyleClass="btn-secundary"/>

    </StackLayout>
 </pages:BaseContentPage>
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
@@ -24,8 +24,7 @@
                Text="{u:I18n LogInInitiated}"
                FontSize="Title"
                FontAttributes="Bold"
-                Margin="0,14,0,21"
-                AutomationId="LogInInitiatedLabel" />
+                Margin="0,14,0,21"/>
            <Label
                Text="{u:I18n ANotificationHasBeenSentToYourDevice}"
                FontSize="Small"
@@ -41,15 +40,13 @@
            <controls:MonoLabel
                FormattedText="{Binding FingerprintPhrase}"
                FontSize="Medium"
-                TextColor="{DynamicResource FingerprintPhrase}"
-                AutomationId="FingerprintPhraseValue" />
+                TextColor="{DynamicResource FingerprintPhrase}"/>
            <Label
                Text="{u:I18n ResendNotification}"
                StyleClass="text-md"
                HorizontalOptions="Start"
                Margin="0,40,0,0"
-                TextColor="{DynamicResource HyperlinkColor}"
-                AutomationId="ResendNotificationButton">
+                TextColor="{DynamicResource HyperlinkColor}">
                <Label.GestureRecognizers>
                    <TapGestureRecognizer Command="{Binding CreatePasswordlessLoginCommand}" />
                </Label.GestureRecognizers>
@@ -67,8 +64,7 @@
                    VerticalTextAlignment="End"
                    VerticalOptions="CenterAndExpand"
                    Margin="5, 0"
-                    TextColor="{DynamicResource HyperlinkColor}"
-                    AutomationId="ViewAllLoginOptionsButton">
+                    TextColor="{DynamicResource HyperlinkColor}">
                    <Label.GestureRecognizers>
                        <TapGestureRecognizer Command="{Binding CloseCommand}" />
                    </Label.GestureRecognizers>
--- a/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
@@ -121,8 +121,9 @@ namespace Bit.App.Pages

                var ssoToken = response.Token;

-                var passwordOptions = PasswordGenerationOptions.CreateDefault
-                                                               .WithLength(64);
+
+                var passwordOptions = new PasswordGenerationOptions(true);
+                passwordOptions.Length = 64;

                var codeVerifier = await _passwordGenerationService.GeneratePasswordAsync(passwordOptions);
                var codeVerifierHash = await _cryptoFunctionService.HashAsync(codeVerifier, CryptoHashAlgorithm.Sha256);
--- a/src/App/Pages/Accounts/RegisterPage.xaml
+++ b/src/App/Pages/Accounts/RegisterPage.xaml
@@ -35,8 +35,7 @@
                        x:Name="_email"
                        Text="{Binding Email}"
                        Keyboard="Email"
-                        StyleClass="box-value"
-                        AutomationId="EmailAddressEntry"/>
+                        StyleClass="box-value" />
                </StackLayout>
                <Grid StyleClass="box-row">
                    <Grid.RowDefinitions>
@@ -60,8 +59,7 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="MasterPasswordEntry"/>
+                        Grid.Column="0" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -71,8 +69,7 @@
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}" 
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="PasswordVisibilityToggle"/>
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
                </Grid>
                <Label
                    StyleClass="box-sub-label"
@@ -112,8 +109,7 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="ConfirmMasterPasswordEntry"/>
+                        Grid.Column="0" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -122,7 +118,6 @@
                        Grid.Column="1"
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationId="ConfirmPasswordVisibilityToggle"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                </Grid>
@@ -135,8 +130,7 @@
                        Text="{Binding Hint}"
                        StyleClass="box-value"
                        ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="MasterPasswordHintLabel" />
+                        ReturnCommand="{Binding SubmitCommand}" />
                </StackLayout>
                <Label
                    Text="{u:I18n MasterPasswordHintDescription}"
@@ -148,8 +142,7 @@
                        IsToggled="{Binding CheckExposedMasterPassword}"
                        StyleClass="box-value"
                        HorizontalOptions="Start"
-                        Margin="0, 0, 10, 0"
-                        AutomationId="CheckExposedMasterPasswordToggle"/>
+                        Margin="0, 0, 10, 0"/>
                    <Label
                        Text="{u:I18n CheckKnownDataBreachesForThisPassword}"
                        StyleClass="box-footer-label"
@@ -161,8 +154,7 @@
                        IsToggled="{Binding AcceptPolicies}"
                        StyleClass="box-value"
                        HorizontalOptions="Start"
-                        Margin="0, 0, 10, 0"
-                        AutomationId="AcceptPoliciesToggle"/>
+                        Margin="0, 0, 10, 0"/>
                    <Label StyleClass="box-footer-label"
                           HorizontalOptions="Fill">
                        <Label.FormattedText>
--- a/src/App/Pages/Accounts/UpdateTempPasswordPage.xaml
+++ b/src/App/Pages/Accounts/UpdateTempPasswordPage.xaml
@@ -46,7 +46,7 @@
                           BackgroundColor="Transparent"
                           BorderColor="{DynamicResource PrimaryColor}">
                        <Label
-                            Text="{Binding UpdateMasterPasswordWarningText }"
+                            Text="{u:I18n UpdateMasterPasswordWarning}"
                            StyleClass="text-muted, text-sm, text-bold"
                            HorizontalTextAlignment="Center" />
                    </Frame>
@@ -74,40 +74,6 @@
                            HorizontalTextAlignment="Start" />
                    </Frame>
                </Grid>
-                <Grid StyleClass="box-row" IsVisible="{Binding RequireCurrentPassword }">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Label
-                        Text="{u:I18n CurrentMasterPassword}"
-                        StyleClass="box-label" 
-                        Grid.Row="0"
-                        Grid.Column="0" />
-                    <controls:MonoEntry
-                        x:Name="_currentMasterPassword"
-                        Text="{Binding CurrentMasterPassword}"
-                        StyleClass="box-value"
-                        IsSpellCheckEnabled="False"
-                        IsTextPredictionEnabled="False"
-                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                        Grid.Row="1"
-                        Grid.Column="0" />
-                    <controls:IconButton
-                        StyleClass="box-row-button, box-row-button-platform"
-                        Text="{Binding ShowPasswordIcon}"
-                        Command="{Binding TogglePasswordCommand}"
-                        Grid.Row="0"
-                        Grid.Column="1"
-                        Grid.RowSpan="2"
-                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
-                </Grid>
                <Grid StyleClass="box-row">
                    <Grid.RowDefinitions>
                        <RowDefinition Height="Auto" />
--- a/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
@@ -1,68 +1,27 @@
 using System;
 using System.Threading.Tasks;
 using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;

 namespace Bit.App.Pages
 {
    public class UpdateTempPasswordPageViewModel : BaseChangePasswordViewModel
    {
-        private readonly IUserVerificationService _userVerificationService;
-
-        private ForcePasswordResetReason _reason = ForcePasswordResetReason.AdminForcePasswordReset;
-
        public UpdateTempPasswordPageViewModel()
        {
            PageTitle = AppResources.UpdateMasterPassword;
            TogglePasswordCommand = new Command(TogglePassword);
            ToggleConfirmPasswordCommand = new Command(ToggleConfirmPassword);
-            SubmitCommand = new AsyncCommand(SubmitAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
+            SubmitCommand = new Command(async () => await SubmitAsync());
        }

-        public AsyncCommand SubmitCommand { get; }
+        public Command SubmitCommand { get; }
        public Command TogglePasswordCommand { get; }
        public Command ToggleConfirmPasswordCommand { get; }
        public Action UpdateTempPasswordSuccessAction { get; set; }
        public Action LogOutAction { get; set; }
-        public string CurrentMasterPassword { get; set; }
-
-        public override async Task InitAsync(bool forceSync = false)
-        {
-            await base.InitAsync(forceSync);
-
-            var forcePasswordResetReason = await _stateService.GetForcePasswordResetReasonAsync();
-
-            if (forcePasswordResetReason.HasValue)
-            {
-                _reason = forcePasswordResetReason.Value;
-            }
-        }
-
-        public bool RequireCurrentPassword
-        {
-            get => _reason == ForcePasswordResetReason.WeakMasterPasswordOnLogin;
-        }
-
-        public string UpdateMasterPasswordWarningText
-        {
-            get
-            {
-                return _reason == ForcePasswordResetReason.WeakMasterPasswordOnLogin
-                    ? AppResources.UpdateWeakMasterPasswordWarning
-                    : AppResources.UpdateMasterPasswordWarning;
-            }
-        }

        public void TogglePassword()
        {
@@ -83,12 +42,6 @@ namespace Bit.App.Pages
                return;
            }

-            if (RequireCurrentPassword &&
-                !await _userVerificationService.VerifyUser(CurrentMasterPassword, VerificationType.MasterPassword))
-            {
-                return;
-            }
-
            // Retrieve details for key generation
            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
            var email = await _stateService.GetEmailAsync();
@@ -100,29 +53,21 @@ namespace Bit.App.Pages
            // Create new encKey for the User
            var newEncKey = await _cryptoService.RemakeEncKeyAsync(key);

+            // Create request
+            var request = new UpdateTempPasswordRequest
+            {
+                Key = newEncKey.Item2.EncryptedString,
+                NewMasterPasswordHash = masterPasswordHash,
+                MasterPasswordHint = Hint
+            };
+
            // Initiate API action
            try
            {
                await _deviceActionService.ShowLoadingAsync(AppResources.UpdatingPassword);
-
-                switch (_reason)
-                {
-                    case ForcePasswordResetReason.AdminForcePasswordReset:
-                        await UpdateTempPasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
-                        break;
-                    case ForcePasswordResetReason.WeakMasterPasswordOnLogin:
-                        await UpdatePasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
+                await _apiService.PutUpdateTempPasswordAsync(request);
                await _deviceActionService.HideLoadingAsync();

-                // Clear the force reset password reason
-                await _stateService.SetForcePasswordResetReasonAsync(null);
-
-                _platformUtilsService.ShowToast(null, null, AppResources.UpdatedMasterPassword);
-
                UpdateTempPasswordSuccessAction?.Invoke();
            }
            catch (ApiException e)
@@ -140,32 +85,5 @@ namespace Bit.App.Pages
                }
            }
        }
-
-        private async Task UpdateTempPasswordAsync(string newMasterPasswordHash, string newEncKey)
-        {
-            var request = new UpdateTempPasswordRequest
-            {
-                Key = newEncKey,
-                NewMasterPasswordHash = newMasterPasswordHash,
-                MasterPasswordHint = Hint
-            };
-
-            await _apiService.PutUpdateTempPasswordAsync(request);
-        }
-
-        private async Task UpdatePasswordAsync(string newMasterPasswordHash, string newEncKey)
-        {
-            var currentPasswordHash = await _cryptoService.HashPasswordAsync(CurrentMasterPassword, null);
-
-            var request = new PasswordRequest
-            {
-                MasterPasswordHash = currentPasswordHash,
-                Key = newEncKey,
-                NewMasterPasswordHash = newMasterPasswordHash,
-                MasterPasswordHint = Hint
-            };
-
-            await _apiService.PostPasswordAsync(request);
-        }
    }
 }
--- a/src/App/Pages/Generator/GeneratorHistoryPage.xaml
+++ b/src/App/Pages/Generator/GeneratorHistoryPage.xaml
@@ -27,8 +27,7 @@
                         Clicked="Clear_Clicked"
                         Order="Secondary"
                         x:Name="_clearItem"
-                         x:Key="clearItem"
-                         AutomationId="ClearPasswordList" />
+                         x:Key="clearItem" />
            <ToolbarItem Icon="more_vert.png"
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n Options}"
@@ -44,8 +43,7 @@
               Margin="20, 0"
               VerticalOptions="CenterAndExpand"
               HorizontalOptions="CenterAndExpand"
-               HorizontalTextAlignment="Center"
-               AutomationId="NoPasswordsDisplayedLabel"></Label>
+               HorizontalTextAlignment="Center"></Label>
        <controls:ExtendedCollectionView
                  IsVisible="{Binding ShowNoData, Converter={StaticResource inverseBool}}"
                  ItemsSource="{Binding History}"
@@ -58,8 +56,7 @@
                        StyleClass="list-row, list-row-platform"
                        Padding="10"
                        RowSpacing="0"
-                        ColumnSpacing="10"
-                        AutomationId="GeneratedPasswordRow">
+                        ColumnSpacing="10">

                        <Grid.RowDefinitions>
                            <RowDefinition Height="Auto" />
@@ -74,14 +71,12 @@
                            Grid.Column="0"
                            Grid.Row="0"
                            StyleClass="list-title, list-title-platform, text-html"
-                            Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}"
-                            AutomationId="GeneratedPasswordValue" />
+                            Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}" />
                        <Label LineBreakMode="TailTruncation"
                            Grid.Column="0"
                            Grid.Row="1"
                            StyleClass="list-subtitle, list-subtitle-platform"
-                            Text="{Binding Date, Mode=OneWay, Converter={StaticResource dateTime}}"
-                            AutomationId="GeneratedPasswordDateLabel" />
+                            Text="{Binding Date, Mode=OneWay, Converter={StaticResource dateTime}}" />
                        <controls:IconButton
                            StyleClass="list-row-button, list-row-button-platform"
                            Text="{Binding Source={x:Static core:BitwardenIcons.Paste}}"
@@ -91,8 +86,7 @@
                            Grid.Column="1"
                            Grid.RowSpan="2"
                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n CopyPassword}"
-                            AutomationId="CopyPasswordValueButton" />
+                            AutomationProperties.Name="{u:I18n CopyPassword}" />
                    </Grid>
                </DataTemplate>
            </CollectionView.ItemTemplate>
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -71,8 +71,7 @@
                        <Label
                            Text="{u:I18n PasswordGeneratorPolicyInEffect}"
                            StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Center"
-                            AutomationId="PasswordGeneratorPolicyInEffectLabel" />
+                            HorizontalTextAlignment="Center" />
                    </Frame>
                </Grid>
                <Grid IsVisible="{Binding IsUsername, Converter={StaticResource inverseBool}}"
@@ -83,24 +82,21 @@
                        x:Name="lblPassword"
                        StyleClass="text-lg, text-html"
                        Text="{Binding ColoredPassword, Mode=OneWay}"
-                        Margin="0, 20"
-                        AutomationId="GeneratedPasswordLabel" />
+                        Margin="0, 20" />
                    <controls:IconButton 
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                        Command="{Binding CopyCommand}"
                        Grid.Column="1"
                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n CopyPassword}"
-                        AutomationId="CopyValueButton" />
+                        AutomationProperties.Name="{u:I18n CopyPassword}" />
                    <controls:IconButton 
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
                        Command="{Binding RegenerateCommand}"
                        Grid.Column="2"
                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n GeneratePassword}"
-                        AutomationId="RegenerateValueButton" />
+                        AutomationProperties.Name="{u:I18n GeneratePassword}" />
                </Grid>
                <Grid IsVisible="{Binding IsUsername}"
                        StyleClass="box-row"                  
@@ -111,24 +107,21 @@
                        StyleClass="text-lg, text-html"
                        Text="{Binding ColoredUsername, Mode=OneWay}"
                        Margin="0, 20"
-                        HorizontalOptions="Start"
-                        AutomationId="GeneratedPasswordLabel" />
+                        HorizontalOptions="Start" />
                    <controls:IconButton 
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                        Command="{Binding CopyCommand}"
                        Grid.Column="1"
                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n CopyUsername}"
-                        AutomationId="CopyValueButton" />
+                        AutomationProperties.Name="{u:I18n CopyUsername}" />
                    <controls:IconButton 
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
                        Command="{Binding RegenerateUsernameCommand}"
                        Grid.Column="2"
                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n GenerateUsername}"
-                        AutomationId="RegenerateValueButton" />
+                        AutomationProperties.Name="{u:I18n GenerateUsername}" />
                </Grid>
                <BoxView StyleClass="box-row-separator"/>
                <StackLayout StyleClass="box"
@@ -142,8 +135,7 @@
                        ItemsSource="{Binding GeneratorTypeOptions, Mode=OneTime}"
                        SelectedItem="{Binding GeneratorTypeSelected}"
                        ItemDisplayBinding="{Binding ., Converter={StaticResource localizableEnum}}"
-                        StyleClass="box-value"
-                        AutomationId="GeneratorTypePicker" />
+                        StyleClass="box-value" />
                </StackLayout>
                <Label Text="{u:I18n Options, Header=True}"
                       StyleClass="box-header, box-header-platform"
@@ -169,8 +161,7 @@
                        ItemsSource="{Binding UsernameTypeOptions, Mode=OneTime}"
                        SelectedItem="{Binding UsernameTypeSelected}"
                        ItemDisplayBinding="{Binding ., Converter={StaticResource localizableEnum}}"
-                        StyleClass="box-value"
-                        AutomationId="UsernameTypePicker" />
+                        StyleClass="box-value" />
                    <Label
                        StyleClass="box-footer-label"
                        Text="{Binding UsernameTypeDescriptionLabel}" />
@@ -181,8 +172,7 @@
                            StyleClass="box-label" />
                        <Entry x:Name="_plusAddressedEmailEntry"
                            Text="{Binding PlusAddressedEmail}"
-                            StyleClass="box-value"
-                            AutomationId="PlusAddressedEmailEntry" />
+                            StyleClass="box-value" />
                        <Label IsVisible="{Binding ShowUsernameEmailType}"
                            Text="{u:I18n EmailType}"
                            StyleClass="box-label"
@@ -213,8 +203,7 @@
                        <Entry
                            x:Name="_catchAllEmailDomainNameEntry"
                            Text="{Binding CatchAllEmailDomain}"
-                            StyleClass="box-value"
-                            AutomationId="CatchAllEmailDomainEntry" />
+                            StyleClass="box-value" />
                        <Label IsVisible="{Binding ShowUsernameEmailType}"
                            Text="{u:I18n EmailType}"
                            StyleClass="box-label" 
@@ -247,27 +236,26 @@
                            ItemsSource="{Binding ForwardedEmailServiceTypeOptions, Mode=OneTime}"
                            SelectedItem="{Binding ForwardedEmailServiceSelected}"
                            ItemDisplayBinding="{Binding ., Converter={StaticResource localizableEnum}}"
-                            StyleClass="box-value"
-                            AutomationId="ServiceTypePicker" />
-                        <Grid 
-                            Grid.RowDefinitions="Auto,*"
-                            Grid.ColumnDefinitions="*,Auto">
+                            StyleClass="box-value" />
+                        <!--ANONADDY OPTIONS-->
+                        <Grid IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
+                              Grid.RowDefinitions="Auto,*"
+                              Grid.ColumnDefinitions="*,Auto">
                            <Label
                                Margin="0,10,0,0"
-                                Text="{Binding ForwardedEmailApiSecretLabel}"
+                                Text="{u:I18n APIAccessToken}"
                                StyleClass="box-label"/>
                            <Entry
-                                Text="{Binding ForwardedEmailApiSecret}"
-                                IsPassword="{Binding ShowForwardedEmailApiSecret, Converter={StaticResource inverseBool}}"
-                                Grid.Row="1"
-                                AutomationId="ForwardedEmailApiSecretEntry" />
+                                x:Name="_anonAddyApiAccessTokenEntry"
+                                Text="{Binding AnonAddyApiAccessToken}"
+                                IsPassword="{Binding ShowAnonAddyApiAccessToken, Converter={StaticResource inverseBool}}"
+                                Grid.Row="1"/>
                            <controls:IconButton
                                StyleClass="box-row-button, box-row-button-platform"
-                                Text="{Binding ShowForwardedEmailApiSecret, Converter={StaticResource inverseBool, iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
+                                Text="{Binding ShowAnonAddyApiAccessToken, Converter={StaticResource inverseBool, iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
                                Command="{Binding ToggleForwardedEmailHiddenValueCommand}"
                                Grid.Row="1"
-                                Grid.Column="1"
-                                AutomationId="ShowForwardedEmailApiSecretButton" />
+                                Grid.Column="1"/>
                        </Grid>
                        <Label IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
                            Text="{u:I18n DomainNameRequiredParenthesis}"
@@ -276,8 +264,91 @@
                        <Entry IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
                            x:Name="_anonAddyDomainNameEntry"
                            Text="{Binding AnonAddyDomainName}"
-                            StyleClass="box-value"
-                            AutomationId="AnonAddyDomainNameEntry" />
+                            StyleClass="box-value"/>
+                        <!--FIREFOX RELAY OPTIONS-->
+                        <Grid StyleClass="box-row, box-row-input"
+                              IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.FirefoxRelay}}"
+                              Grid.RowDefinitions="Auto,*"
+                              Grid.ColumnDefinitions="*,Auto">
+                            <Label
+                                Text="{u:I18n APIAccessToken}"
+                                StyleClass="box-label"/>
+                            <Entry
+                                x:Name="_firefoxRelayApiAccessTokenEntry"
+                                Text="{Binding FirefoxRelayApiAccessToken}"
+                                StyleClass="box-value"
+                                Grid.Row="1"
+                                IsPassword="{Binding ShowFirefoxRelayApiAccessToken, Converter={StaticResource inverseBool}}"/>
+                            <controls:IconButton
+                                StyleClass="box-row-button, box-row-button-platform"
+                                Text="{Binding ShowFirefoxRelayApiAccessToken, Converter={StaticResource inverseBool, iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
+                                Command="{Binding ToggleForwardedEmailHiddenValueCommand}"
+                                Grid.Row="1"
+                                Grid.Column="1"/>
+                        </Grid>
+                        <!--SIMPLELOGIN OPTIONS-->
+                        <Grid StyleClass="box-row, box-row-input"
+                              IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.SimpleLogin}}"
+                              Grid.RowDefinitions="Auto,*"
+                              Grid.ColumnDefinitions="*,Auto">
+                            <Label
+                                Text="{u:I18n APIKeyRequiredParenthesis}"
+                                StyleClass="box-label"/>
+                            <Entry
+                                x:Name="_simpleLoginApiKeyEntry"
+                                Text="{Binding SimpleLoginApiKey}"
+                                StyleClass="box-value" 
+                                Grid.Row="1"
+                                IsPassword="{Binding ShowSimpleLoginApiKey, Converter={StaticResource inverseBool}}"/>
+                            <controls:IconButton 
+                                StyleClass="box-row-button, box-row-button-platform"
+                                Text="{Binding ShowSimpleLoginApiKey, Converter={StaticResource inverseBool, iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
+                                Command="{Binding ToggleForwardedEmailHiddenValueCommand}"
+                                Grid.Row="1"
+                                Grid.Column="1"/>
+                        </Grid>
+                        <!--DUCKDUCKGO OPTIONS-->
+                        <Grid StyleClass="box-row, box-row-input"
+                              IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.DuckDuckGo}}"
+                              Grid.RowDefinitions="Auto,*"
+                              Grid.ColumnDefinitions="*,Auto">
+                            <Label
+                                Text="{u:I18n APIKeyRequiredParenthesis}"
+                                StyleClass="box-label"/>
+                            <Entry
+                                x:Name="_duckDuckGoApiAccessTokenEntry"
+                                Text="{Binding DuckDuckGoApiKey}"
+                                StyleClass="box-value"
+                                Grid.Row="1"
+                                IsPassword="{Binding ShowDuckDuckGoApiKey, Converter={StaticResource inverseBool}}"/>
+                            <controls:IconButton
+                                StyleClass="box-row-button, box-row-button-platform"
+                                Text="{Binding ShowDuckDuckGoApiKey, Converter={StaticResource inverseBool, iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
+                                Command="{Binding ToggleForwardedEmailHiddenValueCommand}"
+                                Grid.Row="1"
+                                Grid.Column="1"/>
+                        </Grid>
+                        <!--FASTMAIL OPTIONS-->
+                        <Grid StyleClass="box-row, box-row-input"
+                              IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.Fastmail}}"
+                              Grid.RowDefinitions="Auto,*"
+                              Grid.ColumnDefinitions="*,Auto">
+                            <Label
+                                Text="{u:I18n APIKeyRequiredParenthesis}"
+                                StyleClass="box-label"/>
+                            <Entry
+                                x:Name="_fastmailApiAccessTokenEntry"
+                                Text="{Binding FastmailApiKey}"
+                                StyleClass="box-value"
+                                Grid.Row="1"
+                                IsPassword="{Binding ShowFastmailApiKey, Converter={StaticResource inverseBool}}"/>
+                            <controls:IconButton
+                                StyleClass="box-row-button, box-row-button-platform"
+                                Text="{Binding ShowFastmailApiKey, Converter={StaticResource iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
+                                Command="{Binding ToggleForwardedEmailHiddenValueCommand}"
+                                Grid.Row="1"
+                                Grid.Column="1"/>
+                        </Grid>
                    </StackLayout>                    
                    <!--RANDOM WORD OPTIONS-->
                    <Grid IsVisible="{Binding UsernameTypeSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:UsernameType.RandomWord}}">
@@ -288,8 +359,7 @@
                        <Switch
                            IsToggled="{Binding CapitalizeRandomWordUsername}"
                            StyleClass="box-value"
-                            HorizontalOptions="End"
-                            AutomationId="CapitalizeRandomWordUsernameToggle" />
+                            HorizontalOptions="End" />
                    </Grid>
                    <BoxView IsVisible="{Binding UsernameTypeSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:UsernameType.RandomWord}}"
                        StyleClass="box-row-separator" />
@@ -301,8 +371,7 @@
                        <Switch
                            IsToggled="{Binding IncludeNumberRandomWordUsername}"
                            StyleClass="box-value"
-                            HorizontalOptions="End"
-                            AutomationId="IncludeNumberRandomWordUsernameToggle" />
+                            HorizontalOptions="End" />
                    </Grid>
                    <BoxView IsVisible="{Binding UsernameTypeSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:UsernameType.RandomWord}}"
                        StyleClass="box-row-separator" />
@@ -317,8 +386,7 @@
                            x:Name="_passwordTypePicker"
                            ItemsSource="{Binding PasswordTypeOptions, Mode=OneTime}"
                            SelectedIndex="{Binding PasswordTypeSelectedIndex}"
-                            StyleClass="box-value"
-                            AutomationId="PasswordTypePicker" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout Spacing="0"
                                 Padding="0"
@@ -335,14 +403,12 @@
                                HorizontalOptions="FillAndExpand"
                                HorizontalTextAlignment="End"
                                VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center"
-                                AutomationId="NumberOfWordsLabel" />
+                                VerticalTextAlignment="Center" />
                            <controls:ExtendedStepper
                                Value="{Binding NumWords}"
                                Maximum="20"
                                Minimum="3"
-                                Increment="1"
-                                AutomationId="NumberOfWordsStepper" />
+                                Increment="1" />
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                        <StackLayout StyleClass="box-row, box-row-input">
@@ -353,8 +419,7 @@
                                Text="{Binding WordSeparator}"
                                IsSpellCheckEnabled="False"
                                IsTextPredictionEnabled="False"
-                                StyleClass="box-value"
-                                AutomationId="WordSeparatorEntry">
+                                StyleClass="box-value">
                                <Entry.Effects>
                                    <effects:NoEmojiKeyboardEffect />
                                </Entry.Effects>
@@ -370,8 +435,7 @@
                                IsEnabled="{Binding EnforcedPolicyOptions.Capitalize,
                                    Converter={StaticResource inverseBool}}"
                                StyleClass="box-value"
-                                HorizontalOptions="End"
-                                AutomationId="CapitalizePassphraseToggle" />
+                                HorizontalOptions="End" />
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                        <StackLayout StyleClass="box-row, box-row-switch">
@@ -384,8 +448,7 @@
                                IsEnabled="{Binding EnforcedPolicyOptions.IncludeNumber,
                                    Converter={StaticResource inverseBool}}"
                                StyleClass="box-value"
-                                HorizontalOptions="End"
-                                AutomationId="IncludeNumbersToggle" />
+                                HorizontalOptions="End" />
                        </StackLayout>
                    </StackLayout>
                    <StackLayout Spacing="0" Padding="0" IsVisible="{Binding IsPassword}">
@@ -399,8 +462,7 @@
                                StyleClass="box-sub-label"
                                VerticalOptions="CenterAndExpand"
                                HorizontalTextAlignment="End"
-                                WidthRequest="50"
-                                AutomationId="PasswordLengthLabel" />
+                                WidthRequest="50" />
                            <controls:ExtendedSlider
                                DragCompleted="LengthSlider_DragCompleted"
                                Value="{Binding Length}"
@@ -409,8 +471,7 @@
                                VerticalOptions="CenterAndExpand"
                                HorizontalOptions="FillAndExpand"
                                Maximum="128"
-                                Minimum="5"
-                                AutomationId="PasswordLengthSlider" />
+                                Minimum="5" />
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                        <StackLayout StyleClass="box-row, box-row-switch">
@@ -427,8 +488,7 @@
                                StyleClass="box-value"
                                HorizontalOptions="End" 
                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n UppercaseAtoZ}"
-                                AutomationId="UppercaseAtoZToggle" />
+                                AutomationProperties.Name="{u:I18n UppercaseAtoZ}"/>
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                        <StackLayout StyleClass="box-row, box-row-switch">
@@ -445,8 +505,7 @@
                                StyleClass="box-value"
                                HorizontalOptions="End"
                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n LowercaseAtoZ}"
-                                AutomationId="LowercaseAtoZToggle" />
+                                AutomationProperties.Name="{u:I18n LowercaseAtoZ}"/>
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                        <StackLayout StyleClass="box-row, box-row-switch">
@@ -463,8 +522,7 @@
                                StyleClass="box-value"
                                HorizontalOptions="End" 
                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n NumbersZeroToNine}"
-                                AutomationId="NumbersZeroToNineToggle" />
+                                AutomationProperties.Name="{u:I18n NumbersZeroToNine}"/>
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                        <StackLayout StyleClass="box-row, box-row-switch">
@@ -481,8 +539,7 @@
                                StyleClass="box-value"
                                HorizontalOptions="End"
                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n SpecialCharacters}"
-                                AutomationId="SpecialCharactersToggle" />
+                                AutomationProperties.Name="{u:I18n SpecialCharacters}"/>
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                        <StackLayout StyleClass="box-row, box-row-stepper">
@@ -497,14 +554,12 @@
                                HorizontalOptions="FillAndExpand"
                                HorizontalTextAlignment="End"
                                VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center"
-                                AutomationId="MinNumberValueLabel" />
+                                VerticalTextAlignment="Center" />
                            <controls:ExtendedStepper
                                Value="{Binding MinNumber}"
                                Maximum="5"
                                Minimum="0"
-                                Increment="1"
-                                AutomationId="MinNumberStepper" />
+                                Increment="1" />
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                        <StackLayout StyleClass="box-row, box-row-stepper">
@@ -519,14 +574,12 @@
                                HorizontalOptions="FillAndExpand"
                                HorizontalTextAlignment="End"
                                VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center"
-                                AutomationId="MinSpecialValueLabel" />
+                                VerticalTextAlignment="Center" />
                            <controls:ExtendedStepper
                                Value="{Binding MinSpecial}"
                                Maximum="5"
                                Minimum="0"
-                                Increment="1"
-                                AutomationId="MinSpecialStepper" />
+                                Increment="1" />
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                        <StackLayout StyleClass="box-row, box-row-switch">
@@ -537,8 +590,7 @@
                            <Switch
                                IsToggled="{Binding AvoidAmbiguousChars}"
                                StyleClass="box-value"
-                                HorizontalOptions="End"
-                                AutomationId="AvoidAmbiguousCharsToggle" />
+                                HorizontalOptions="End" />
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                    </StackLayout>
--- a/src/App/Pages/Generator/GeneratorPageViewModel.cs
+++ b/src/App/Pages/Generator/GeneratorPageViewModel.cs
@@ -8,7 +8,6 @@ using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -24,7 +23,7 @@ namespace Bit.App.Pages
        private readonly IUsernameGenerationService _usernameGenerationService;
        private readonly ITokenService _tokenService;
        private readonly IDeviceActionService _deviceActionService;
-        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>();
+        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");

        private PasswordGenerationOptions _options;
        private UsernameGenerationOptions _usernameOptions;
@@ -50,7 +49,11 @@ namespace Bit.App.Pages
        private bool _doneIniting;
        private bool _showTypePicker;
        private string _emailWebsite;
-        private bool _showForwardedEmailApiSecret;
+        private bool _showFirefoxRelayApiAccessToken;
+        private bool _showAnonAddyApiAccessToken;
+        private bool _showSimpleLoginApiKey;
+        private bool _showDuckDuckGoApiKey;
+        private bool _showFastmailApiKey;
        private bool _editMode;

        public GeneratorPageViewModel()
@@ -93,7 +96,7 @@ namespace Bit.App.Pages
            UsernameTypePromptHelpCommand = new Command(UsernameTypePromptHelp);
            RegenerateCommand = new AsyncCommand(RegenerateAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
            RegenerateUsernameCommand = new AsyncCommand(RegenerateUsernameAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
-            ToggleForwardedEmailHiddenValueCommand = new Command(() => ShowForwardedEmailApiSecret = !ShowForwardedEmailApiSecret);
+            ToggleForwardedEmailHiddenValueCommand = new AsyncCommand(ToggleForwardedEmailHiddenValueAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
            CopyCommand = new AsyncCommand(CopyAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
            CloseCommand = new AsyncCommand(CloseAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
        }
@@ -412,6 +415,7 @@ namespace Bit.App.Pages

        public string UsernameTypeDescriptionLabel => GetUsernameTypeLabelDescription(UsernameTypeSelected);

+
        public ForwardedEmailServiceType ForwardedEmailServiceSelected
        {
            get => _usernameOptions.ServiceType;
@@ -421,11 +425,7 @@ namespace Bit.App.Pages
                {
                    _usernameOptions.ServiceType = value;
                    Username = Constants.DefaultUsernameGenerated;
-                    TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected), new string[]
-                    {
-                        nameof(ForwardedEmailApiSecret),
-                        nameof(ForwardedEmailApiSecretLabel)
-                    });
+                    TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected));
                    SaveUsernameOptionsAsync(false).FireAndForget();
                }
            }
@@ -445,104 +445,27 @@ namespace Bit.App.Pages
            }
        }

-        public string ForwardedEmailApiSecret
+        public string AnonAddyApiAccessToken
        {
-            get
-            {
-                switch (ForwardedEmailServiceSelected)
-                {
-                    case ForwardedEmailServiceType.AnonAddy:
-                        return _usernameOptions.AnonAddyApiAccessToken;
-                    case ForwardedEmailServiceType.DuckDuckGo:
-                        return _usernameOptions.DuckDuckGoApiKey;
-                    case ForwardedEmailServiceType.Fastmail:
-                        return _usernameOptions.FastMailApiKey;
-                    case ForwardedEmailServiceType.FirefoxRelay:
-                        return _usernameOptions.FirefoxRelayApiAccessToken;
-                    case ForwardedEmailServiceType.SimpleLogin:
-                        return _usernameOptions.SimpleLoginApiKey;
-                    default:
-                        return null;
-                }
-            }
+            get => _usernameOptions.AnonAddyApiAccessToken;
            set
            {
-                bool changed = false;
-                switch (ForwardedEmailServiceSelected)
+                if (_usernameOptions.AnonAddyApiAccessToken != value)
                {
-                    case ForwardedEmailServiceType.AnonAddy:
-                        if (_usernameOptions.AnonAddyApiAccessToken != value)
-                        {
-                            _usernameOptions.AnonAddyApiAccessToken = value;
-                            changed = true;
-                        }
-                        break;
-                    case ForwardedEmailServiceType.DuckDuckGo:
-                        if (_usernameOptions.DuckDuckGoApiKey != value)
-                        {
-                            _usernameOptions.DuckDuckGoApiKey = value;
-                            changed = true;
-                        }
-                        break;
-                    case ForwardedEmailServiceType.Fastmail:
-                        if (_usernameOptions.FastMailApiKey != value)
-                        {
-                            _usernameOptions.FastMailApiKey = value;
-                            changed = true;
-                        }
-                        break;
-                    case ForwardedEmailServiceType.FirefoxRelay:
-                        if (_usernameOptions.FirefoxRelayApiAccessToken != value)
-                        {
-                            _usernameOptions.FirefoxRelayApiAccessToken = value;
-                            changed = true;
-                        }
-                        break;
-                    case ForwardedEmailServiceType.SimpleLogin:
-                        if (_usernameOptions.SimpleLoginApiKey != value)
-                        {
-                            _usernameOptions.SimpleLoginApiKey = value;
-                            changed = true;
-                        }
-                        break;
-                    default:
-                        break;
-                }
-
-                if (changed)
-                {
-                    TriggerPropertyChanged(nameof(ForwardedEmailApiSecret));
+                    _usernameOptions.AnonAddyApiAccessToken = value;
+                    TriggerPropertyChanged(nameof(AnonAddyApiAccessToken));
                    SaveUsernameOptionsAsync(false).FireAndForget();
                }
            }
        }

-        public string ForwardedEmailApiSecretLabel
+        public bool ShowAnonAddyApiAccessToken
        {
            get
            {
-                switch (ForwardedEmailServiceSelected)
-                {
-                    case ForwardedEmailServiceType.AnonAddy:
-                    case ForwardedEmailServiceType.FirefoxRelay:
-                        return AppResources.APIAccessToken;
-                    case ForwardedEmailServiceType.DuckDuckGo:
-                    case ForwardedEmailServiceType.Fastmail:
-                    case ForwardedEmailServiceType.SimpleLogin:
-                        return AppResources.APIKeyRequiredParenthesis;
-                    default:
-                        return null;
-                }
+                return _showAnonAddyApiAccessToken;
            }
-        }
-
-        public bool ShowForwardedEmailApiSecret
-        {
-            get
-            {
-                return _showForwardedEmailApiSecret;
-            }
-            set => SetProperty(ref _showForwardedEmailApiSecret, value);
+            set => SetProperty(ref _showAnonAddyApiAccessToken, value);
        }

        public string AnonAddyDomainName
@@ -559,6 +482,99 @@ namespace Bit.App.Pages
            }
        }

+        public string FirefoxRelayApiAccessToken
+        {
+            get => _usernameOptions.FirefoxRelayApiAccessToken;
+            set
+            {
+                if (_usernameOptions.FirefoxRelayApiAccessToken != value)
+                {
+                    _usernameOptions.FirefoxRelayApiAccessToken = value;
+                    TriggerPropertyChanged(nameof(FirefoxRelayApiAccessToken));
+                    SaveUsernameOptionsAsync(false).FireAndForget();
+                }
+            }
+        }
+
+        public bool ShowFirefoxRelayApiAccessToken
+        {
+            get
+            {
+                return _showFirefoxRelayApiAccessToken;
+            }
+            set => SetProperty(ref _showFirefoxRelayApiAccessToken, value);
+        }
+
+        public string SimpleLoginApiKey
+        {
+            get => _usernameOptions.SimpleLoginApiKey;
+            set
+            {
+                if (_usernameOptions.SimpleLoginApiKey != value)
+                {
+                    _usernameOptions.SimpleLoginApiKey = value;
+                    TriggerPropertyChanged(nameof(SimpleLoginApiKey));
+                    SaveUsernameOptionsAsync(false).FireAndForget();
+                }
+            }
+        }
+
+        public bool ShowSimpleLoginApiKey
+        {
+            get
+            {
+                return _showSimpleLoginApiKey;
+            }
+            set => SetProperty(ref _showSimpleLoginApiKey, value);
+        }
+
+        public string DuckDuckGoApiKey
+        {
+            get => _usernameOptions.DuckDuckGoApiKey;
+            set
+            {
+                if (_usernameOptions.DuckDuckGoApiKey != value)
+                {
+                    _usernameOptions.DuckDuckGoApiKey = value;
+                    TriggerPropertyChanged(nameof(DuckDuckGoApiKey));
+                    SaveUsernameOptionsAsync(false).FireAndForget();
+                }
+            }
+        }
+
+        public bool ShowDuckDuckGoApiKey
+        {
+            get
+            {
+                return _showDuckDuckGoApiKey;
+            }
+            set => SetProperty(ref _showDuckDuckGoApiKey, value);
+        }
+
+
+        public string FastmailApiKey
+        {
+            get => _usernameOptions.FastMailApiKey;
+            set
+            {
+                if (_usernameOptions.FastMailApiKey != value)
+                {
+                    _usernameOptions.FastMailApiKey = value;
+                    TriggerPropertyChanged(nameof(FastmailApiKey));
+                    SaveUsernameOptionsAsync(false).FireAndForget();
+                }
+            }
+        }
+
+        public bool ShowFastmailApiKey
+        {
+            get
+            {
+                return _showFastmailApiKey;
+            }
+            set => SetProperty(ref _showFastmailApiKey, value);
+        }
+
        public bool CapitalizeRandomWordUsername
        {
            get => _usernameOptions.CapitalizeRandomWordUsername;
@@ -791,9 +807,12 @@ namespace Bit.App.Pages
            TriggerPropertyChanged(nameof(PlusAddressedEmailTypeSelected));
            TriggerPropertyChanged(nameof(IncludeNumberRandomWordUsername));
            TriggerPropertyChanged(nameof(CapitalizeRandomWordUsername));
-            TriggerPropertyChanged(nameof(ForwardedEmailApiSecret));
-            TriggerPropertyChanged(nameof(ForwardedEmailApiSecretLabel));
+            TriggerPropertyChanged(nameof(SimpleLoginApiKey));
+            TriggerPropertyChanged(nameof(FirefoxRelayApiAccessToken));
            TriggerPropertyChanged(nameof(AnonAddyDomainName));
+            TriggerPropertyChanged(nameof(AnonAddyApiAccessToken));
+            TriggerPropertyChanged(nameof(DuckDuckGoApiKey));
+            TriggerPropertyChanged(nameof(FastmailApiKey));
            TriggerPropertyChanged(nameof(CatchAllEmailDomain));
            TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected));
            TriggerPropertyChanged(nameof(UsernameTypeSelected));
@@ -808,7 +827,7 @@ namespace Bit.App.Pages
        private void SetOptions()
        {
            _options.AllowAmbiguousChar = AllowAmbiguousChars;
-            _options.Type = PasswordTypeSelectedIndex == 1 ? PasswordGenerationOptions.TYPE_PASSPHRASE : PasswordGenerationOptions.TYPE_PASSWORD;
+            _options.Type = PasswordTypeSelectedIndex == 1 ? "passphrase" : "password";
            _options.MinNumber = MinNumber;
            _options.MinSpecial = MinSpecial;
            _options.Special = Special;
@@ -826,23 +845,15 @@ namespace Bit.App.Pages
        {
            _logger.Value.Exception(ex);

-            string message = AppResources.GenericErrorMessage;
-
            if (IsUsername && UsernameTypeSelected == UsernameType.ForwardedEmailAlias)
            {
-                if (ex is ForwardedEmailInvalidSecretException)
-                {
-                    message = ForwardedEmailServiceSelected == ForwardedEmailServiceType.AnonAddy || ForwardedEmailServiceSelected == ForwardedEmailServiceType.FirefoxRelay
-                                ? AppResources.InvalidAPIToken
-                                : AppResources.InvalidAPIKey;
-                }
-                else
-                {
-                    message = string.Format(AppResources.UnknownXErrorMessage, ForwardedEmailServiceSelected);
-                }
+                await Device.InvokeOnMainThreadAsync(() => Page.DisplayAlert(
+                    AppResources.AnErrorHasOccurred, string.Format(AppResources.UnknownXErrorMessage, ForwardedEmailServiceSelected), AppResources.Ok));
+            }
+            else
+            {
+                await Device.InvokeOnMainThreadAsync(() => Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok));
            }
-
-            await Device.InvokeOnMainThreadAsync(() => Page.DisplayAlert(AppResources.AnErrorHasOccurred, message, AppResources.Ok));
        }

        private string GetUsernameTypeLabelDescription(UsernameType value)
@@ -859,5 +870,27 @@ namespace Bit.App.Pages
                    return string.Empty;
            }
        }
+
+        private async Task ToggleForwardedEmailHiddenValueAsync()
+        {
+            switch (ForwardedEmailServiceSelected)
+            {
+                case ForwardedEmailServiceType.AnonAddy:
+                    ShowAnonAddyApiAccessToken = !ShowAnonAddyApiAccessToken;
+                    break;
+                case ForwardedEmailServiceType.FirefoxRelay:
+                    ShowFirefoxRelayApiAccessToken = !ShowFirefoxRelayApiAccessToken;
+                    break;
+                case ForwardedEmailServiceType.SimpleLogin:
+                    ShowSimpleLoginApiKey = !ShowSimpleLoginApiKey;
+                    break;
+                case ForwardedEmailServiceType.DuckDuckGo:
+                    ShowDuckDuckGoApiKey = !ShowDuckDuckGoApiKey;
+                    break;
+                case ForwardedEmailServiceType.Fastmail:
+                    ShowFastmailApiKey = !ShowFastmailApiKey;
+                    break;
+            }
+        }
    }
 }
--- a/src/App/Pages/Send/SendAddEditPage.xaml
+++ b/src/App/Pages/Send/SendAddEditPage.xaml
@@ -71,8 +71,7 @@
                            <Label
                                Text="{u:I18n SendDisabledWarning}"
                                StyleClass="text-muted, text-sm, text-bold"
-                                HorizontalTextAlignment="Center"
-                                AutomationId="SendDisabledWarningMessageLabel" />
+                                HorizontalTextAlignment="Center" />
                        </Frame>
                        <Frame
                            IsVisible="{Binding SendOptionsPolicyInEffect}"
@@ -84,8 +83,7 @@
                            <Label
                                Text="{u:I18n SendOptionsPolicyInEffect}"
                                StyleClass="text-muted, text-sm, text-bold"
-                                HorizontalTextAlignment="Center"
-                                AutomationId="SendOptionsPolicyInEffectLabel" />
+                                HorizontalTextAlignment="Center" />
                        </Frame>
                        <StackLayout StyleClass="box-row">
                            <Label
@@ -95,8 +93,7 @@
                                x:Name="_nameEntry"
                                Text="{Binding Send.Name}"
                                IsEnabled="{Binding SendEnabled}"
-                                StyleClass="box-value"
-                                AutomationId="SendNameEntry" />
+                                StyleClass="box-value" />
                            <Label
                                Text="{u:I18n NameInfo}"
                                StyleClass="box-footer-label"
@@ -126,7 +123,6 @@
                                    AutomationProperties.IsInAccessibleTree="True"
                                    AutomationProperties.Name="{u:I18n File}"
                                    AutomationProperties.HelpText="{Binding FileTypeAccessibilityLabel}"
-                                    AutomationId="SendFileButton"
                                    Grid.Column="0">
                                </Button>
                                <Button
@@ -139,7 +135,6 @@
                                    AutomationProperties.IsInAccessibleTree="True"
                                    AutomationProperties.Name="{u:I18n Text}"
                                    AutomationProperties.HelpText="{Binding TextTypeAccessibilityLabel}"
-                                    AutomationId="SendTextButton"
                                    Grid.Column="1">
                                </Button>
                            </Grid>
@@ -157,14 +152,12 @@
                                    Text="{Binding Send.File.FileName, Mode=OneWay}"
                                    StyleClass="box-value"
                                    VerticalTextAlignment="Center"
-                                    HorizontalOptions="StartAndExpand"
-                                    AutomationId="SendFileNameLabel" />
+                                    HorizontalOptions="StartAndExpand" />
                                <Label
                                    Text="{Binding Send.File.SizeName, Mode=OneWay}"
                                    StyleClass="box-sub-label"
                                    HorizontalTextAlignment="End"
-                                    VerticalTextAlignment="Center"
-                                    AutomationId="SendFileSizeLabel" />
+                                    VerticalTextAlignment="Center" />
                            </StackLayout>
                            <StackLayout
                                IsVisible="{Binding EditMode, Converter={StaticResource inverseBool}}"
@@ -175,23 +168,20 @@
                                    LineBreakMode="CharacterWrap"
                                    StyleClass="text-sm, text-muted"
                                    HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Center"
-                                    AutomationId="SendNoFileChosenLabel" />
+                                    HorizontalTextAlignment="Center" />
                                <Label
                                    IsVisible="{Binding FileName, Converter={StaticResource notNull}}"
                                    Text="{Binding FileName}"
                                    LineBreakMode="CharacterWrap"
                                    StyleClass="text-sm, text-muted"
                                    HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Center"
-                                    AutomationId="SendCurrentFileNameLabel" />
+                                    HorizontalTextAlignment="Center" />
                                <Button
                                    Text="{u:I18n ChooseFile}"
                                    IsVisible="{Binding IsAddFromShare, Converter={StaticResource inverseBool}}"
                                    IsEnabled="{Binding SendEnabled}"
                                    StyleClass="box-button-row"
-                                    Clicked="ChooseFile_Clicked"
-                                    AutomationId="SendChooseFileButton" />
+                                    Clicked="ChooseFile_Clicked" />
                                <Label
                                    Margin="0, 5, 0, 0"
                                    Text="{u:I18n MaxFileSize}"
@@ -217,8 +207,7 @@
                                Text="{Binding Send.Text.Text}"
                                IsEnabled="{Binding SendEnabled}"
                                StyleClass="box-value"
-                                Margin="{Binding EditorMargins}"
-                                AutomationId="SendTextContentEntry"
+                                Margin="{Binding EditorMargins}" 
                                effects:ScrollEnabledEffect.IsScrollEnabled="false" >
                                <Editor.Behaviors>
                                    <behaviors:EditorPreventAutoBottomScrollingOnFocusedBehavior ParentScrollView="{x:Reference _scrollView}" />
@@ -246,8 +235,7 @@
                                    IsToggled="{Binding Send.Text.Hidden}"
                                    IsEnabled="{Binding SendEnabled}"
                                    HorizontalOptions="End"
-                                    Margin="10,0,0,0"
-                                    AutomationId="SendHideTextByDefaultToggle" />
+                                    Margin="10,0,0,0" />
                            </StackLayout>
                        </StackLayout>
                        <StackLayout
@@ -261,8 +249,7 @@
                                IsToggled="{Binding ShareOnSave}"
                                IsEnabled="{Binding SendEnabled}"
                                HorizontalOptions="End"
-                                Margin="10,0,0,0"
-                                AutomationId="SendShareSendAfterSaveToggle" />
+                                Margin="10,0,0,0" />
                        </StackLayout>
                        <StackLayout
                            Orientation="Horizontal"
@@ -276,24 +263,21 @@
                                StyleClass="box-row-button"
                                TextColor="{DynamicResource PrimaryColor}"
                                Margin="0"
-                                AutomationProperties.IsInAccessibleTree="False"
-                                AutomationId="SendShowHideOptionsButton" />
+                                AutomationProperties.IsInAccessibleTree="False"/>
                            <controls:IconButton
                                x:Name="_btnOptionsUp"
                                Text="{Binding Source={x:Static core:BitwardenIcons.ChevronUp}}"
                                StyleClass="box-row-button"
                                TextColor="{DynamicResource PrimaryColor}"
                                IsVisible="{Binding ShowOptions}" 
-                                AutomationProperties.IsInAccessibleTree="False"
-                                AutomationId="SendOptionsDisplayed" />
+                                AutomationProperties.IsInAccessibleTree="False"/>
                            <controls:IconButton
                                x:Name="_btnOptionsDown"
                                Text="{Binding Source={x:Static core:BitwardenIcons.AngleDown}}"
                                StyleClass="box-row-button"
                                TextColor="{DynamicResource PrimaryColor}"
                                IsVisible="{Binding ShowOptions, Converter={StaticResource inverseBool}}" 
-                                AutomationProperties.IsInAccessibleTree="False"
-                                AutomationId="SendOptionsHidden" />
+                                AutomationProperties.IsInAccessibleTree="False"/>
                        </StackLayout>
                        <StackLayout IsVisible="{Binding ShowOptions}">
                            <StackLayout
@@ -310,8 +294,7 @@
                                    IsEnabled="{Binding SendEnabled}"
                                    StyleClass="box-value"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n DeletionTime}"
-                                    AutomationId="SendDeletionOptionsPicker" />
+                                    AutomationProperties.Name="{u:I18n DeletionTime}" />
                                <Grid
                                    IsVisible="{Binding ShowDeletionCustomPickers}"
                                    Margin="0,5,0,0">
@@ -325,16 +308,14 @@
                                        IsEnabled="{Binding SendEnabled}"
                                        AutomationProperties.IsInAccessibleTree="True"
                                        AutomationProperties.Name="{u:I18n DeletionDate}"
-                                        Grid.Column="0"
-                                        AutomationId="SendCustomDeletionDatePicker" />
+                                        Grid.Column="0" />
                                    <controls:ExtendedTimePicker
                                        NullableTime="{Binding DeletionDateTimeViewModel.Time, Mode=TwoWay}"
                                        Format="t"
                                        IsEnabled="{Binding SendEnabled}"
                                        AutomationProperties.IsInAccessibleTree="True"
                                        AutomationProperties.Name="{u:I18n DeletionTime}"
-                                        Grid.Column="1"
-                                        AutomationId="SendCustomDeletionTimePicker" />
+                                        Grid.Column="1" />
                                </Grid>
                                <Label
                                    Text="{u:I18n DeletionDateInfo}"
@@ -353,8 +334,7 @@
                                    IsEnabled="{Binding SendEnabled}"
                                    StyleClass="box-value"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n ExpirationTime}"
-                                    AutomationId="SendExpirationOptionsPicker" />
+                                    AutomationProperties.Name="{u:I18n ExpirationTime}" />
                                <Grid
                                    IsVisible="{Binding ShowExpirationCustomPickers}"
                                    Margin="0,5,0,0">
@@ -369,8 +349,7 @@
                                        IsEnabled="{Binding SendEnabled}"
                                        AutomationProperties.IsInAccessibleTree="True"
                                        AutomationProperties.Name="{u:I18n ExpirationDate}"
-                                        Grid.Column="0"
-                                        AutomationId="SendCustomExpirationDatePicker" />
+                                        Grid.Column="0" />
                                    <controls:ExtendedTimePicker
                                        NullableTime="{Binding ExpirationDateTimeViewModel.Time, Mode=TwoWay}"
                                        PlaceHolder="--:-- --"
@@ -378,8 +357,7 @@
                                        IsEnabled="{Binding SendEnabled}"
                                        AutomationProperties.IsInAccessibleTree="True"
                                        AutomationProperties.Name="{u:I18n ExpirationTime}"
-                                        Grid.Column="1"
-                                        AutomationId="SendCustomExpirationTimePicker" />
+                                        Grid.Column="1" />
                                </Grid>
                                <StackLayout
                                    Orientation="Horizontal"
@@ -396,8 +374,7 @@
                                        FontSize="{Binding SegmentedButtonFontSize}"
                                        IsEnabled="{Binding SendEnabled}"
                                        StyleClass="box-row-button"
-                                        Clicked="ClearExpirationDate_Clicked"
-                                        AutomationId="SendClearExpirationDateButton" />
+                                        Clicked="ClearExpirationDate_Clicked" />
                                </StackLayout>
                            </StackLayout>
                            <StackLayout
@@ -416,15 +393,13 @@
                                        Keyboard="Numeric"
                                        MaxLength="9"
                                        TextChanged="OnMaxAccessCountTextChanged"
-                                        HorizontalOptions="FillAndExpand"
-                                        AutomationId="SendMaxAccessCountEntry" />
+                                        HorizontalOptions="FillAndExpand" />
                                    <controls:ExtendedStepper
                                        x:Name="_maxAccessCountStepper"
                                        Value="{Binding MaxAccessCount}"
                                        Maximum="999999999"
                                        IsEnabled="{Binding SendEnabled}"
-                                        Margin="10,0,0,0"
-                                        AutomationId="SendMaxAccessCountStepper" />
+                                        Margin="10,0,0,0" />
                                </StackLayout>
                                <Label
                                    Text="{u:I18n MaximumAccessCountInfo}"
@@ -444,8 +419,7 @@
                                    <Label
                                        Text="{Binding Send.AccessCount, Mode=OneWay}"
                                        StyleClass="box-label"
-                                        VerticalTextAlignment="Center"
-                                        AutomationId="SendCurrentAccessCountLabel" />
+                                        VerticalTextAlignment="Center" />
                                </StackLayout>
                            </StackLayout>
                            <StackLayout
@@ -462,8 +436,7 @@
                                        StyleClass="box-value"
                                        IsSpellCheckEnabled="False"
                                        IsTextPredictionEnabled="False"
-                                        HorizontalOptions="FillAndExpand"
-                                        AutomationId="SendNewPasswordEntry" />
+                                        HorizontalOptions="FillAndExpand" />
                                    <controls:IconButton
                                        IsEnabled="{Binding SendEnabled}"
                                        StyleClass="box-row-button, box-row-button-platform"
@@ -472,8 +445,7 @@
                                        Margin="10,0,0,0"
                                        AutomationProperties.IsInAccessibleTree="True"
                                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                        AutomationId="SendShowHidePasswordButton" />
+                                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                                </StackLayout>
                                <Label
                                    Text="{u:I18n PasswordInfo}"
@@ -492,8 +464,7 @@
                                    IsEnabled="{Binding SendEnabled}"
                                    StyleClass="box-value"
                                    Margin="{Binding EditorMargins}"
-                                    effects:ScrollEnabledEffect.IsScrollEnabled="false"
-                                    AutomationId="SendNotesEntry">
+                                    effects:ScrollEnabledEffect.IsScrollEnabled="false" >
                                    <Editor.Behaviors>
                                        <behaviors:EditorPreventAutoBottomScrollingOnFocusedBehavior ParentScrollView="{x:Reference _scrollView}" />
                                    </Editor.Behaviors>
@@ -521,8 +492,7 @@
                                    IsToggled="{Binding Send.HideEmail}"
                                    IsEnabled="{Binding DisableHideEmailControl, Converter={StaticResource inverseBool}}"
                                    HorizontalOptions="End"
-                                    Margin="10,0,0,0"
-                                    AutomationId="SendHideEmailSwitch" />
+                                    Margin="10,0,0,0" />
                            </StackLayout>
                            <StackLayout
                                StyleClass="box-row, box-row-switch"
@@ -536,8 +506,7 @@
                                    IsToggled="{Binding Send.Disabled}"
                                    IsEnabled="{Binding SendEnabled}"
                                    HorizontalOptions="End"
-                                    Margin="10,0,0,0"
-                                    AutomationId="SendDeactivateSwitch" />
+                                    Margin="10,0,0,0" />
                            </StackLayout>
                        </StackLayout>

--- a/src/App/Pages/Send/SendAddOnlyPage.xaml
+++ b/src/App/Pages/Send/SendAddOnlyPage.xaml
@@ -25,8 +25,7 @@
            Priority="-2"
            UseOriginalImage="True"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}"
-            AutomationId="AccountIconButton" />
+            AutomationProperties.Name="{u:I18n Account}" />
        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" x:Name="_closeItem" />
        <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" Order="Primary" x:Name="_saveItem"/>
    </ContentPage.ToolbarItems>
--- a/src/App/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml
+++ b/src/App/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml
@@ -44,15 +44,13 @@
                <controls:SendViewCell
                    Send="{Binding Send}"
                    ButtonCommand="{Binding BindingContext.SendOptionsCommand, Source={x:Reference _page}}"
-                    ShowOptions="{Binding BindingContext.SendEnabled, Source={x:Reference _page}}"
-                    AutomationId="SendCell" />
+                    ShowOptions="{Binding BindingContext.SendEnabled, Source={x:Reference _page}}" />
            </DataTemplate>

            <DataTemplate x:Key="sendGroupTemplate"
                          x:DataType="pages:SendGroupingsPageListItem">
                <controls:ExtendedStackLayout Orientation="Horizontal" 
-                                              StyleClass="list-row, list-row-platform"
-                                              AutomationId="{Binding AutomationId}">
+                                              StyleClass="list-row, list-row-platform">
                    <controls:IconLabel Text="{Binding Icon, Mode=OneWay}"
                                      HorizontalOptions="Start"
                                      VerticalOptions="Center"
@@ -66,14 +64,12 @@
                           LineBreakMode="TailTruncation"
                           HorizontalOptions="FillAndExpand"
                           VerticalOptions="CenterAndExpand"
-                           StyleClass="list-title"
-                           AutomationId="SendFilterNameLabel" />
+                           StyleClass="list-title" />
                    <Label Text="{Binding ItemCount, Mode=OneWay}"
                           HorizontalOptions="End"
                           VerticalOptions="CenterAndExpand"
                           HorizontalTextAlignment="End"
-                           StyleClass="list-sub"
-                           AutomationId="SendFilterCountLabel" />
+                           StyleClass="list-sub" />
                </controls:ExtendedStackLayout>
            </DataTemplate>

--- a/src/App/Pages/Send/SendGroupingsPage/SendGroupingsPageListItem.cs
+++ b/src/App/Pages/Send/SendGroupingsPage/SendGroupingsPageListItem.cs
@@ -66,27 +66,5 @@ namespace Bit.App.Pages
                return _icon;
            }
        }
-
-        public string AutomationId
-        {
-            get
-            {
-                if (_name != null)
-                {
-                    return "SendItem";
-                }
-                if (Type != null)
-                {
-                    switch (Type.Value)
-                    {
-                        case SendType.Text:
-                            return "SendTextFilter";
-                        case SendType.File:
-                            return "SendFileFilter";
-                    }
-                }
-                return null;
-            }
-        }
    }
 }
--- a/src/App/Pages/Send/SendsPage.xaml
+++ b/src/App/Pages/Send/SendsPage.xaml
@@ -59,8 +59,7 @@
               Margin="20, 0"
               VerticalOptions="CenterAndExpand"
               HorizontalOptions="CenterAndExpand"
-               HorizontalTextAlignment="Center"
-               AutomationId="NoSendDisplayedLabel" />
+               HorizontalTextAlignment="Center" />
        <controls:ExtendedCollectionView
               IsVisible="{Binding ShowList}"
               ItemsSource="{Binding Sends}"
@@ -68,15 +67,13 @@
               SelectionMode="Single"
               SelectionChanged="RowSelected"
               StyleClass="list, list-platform"
-               ExtraDataForLogging="Sends Page"
-               AutomationId="SendCellList">
+               ExtraDataForLogging="Sends Page">
            <CollectionView.ItemTemplate>
                <DataTemplate x:DataType="views:SendView">
                    <controls:SendViewCell
                        Send="{Binding .}"
                        ButtonCommand="{Binding BindingContext.SendOptionsCommand, Source={x:Reference _page}}"
-                        ShowOptions="{Binding BindingContext.SendEnabled, Source={x:Reference _page}}"
-                        AutomationId="SendCell" />
+                        ShowOptions="{Binding BindingContext.SendEnabled, Source={x:Reference _page}}" />
                </DataTemplate>
            </CollectionView.ItemTemplate>
        </controls:ExtendedCollectionView>
--- a/src/App/Pages/Settings/BlockAutofillUrisPage.xaml
+++ b/src/App/Pages/Settings/BlockAutofillUrisPage.xaml
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<pages:BaseContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.BlockAutofillUrisPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    x:DataType="pages:BlockAutofillUrisPageViewModel"
-    NavigationPage.HasBackButton="False"
-    Title="{u:I18n BlockAutoFill}">
-    <ContentPage.BindingContext>
-        <pages:BlockAutofillUrisPageViewModel />
-    </ContentPage.BindingContext>
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-        </ResourceDictionary>
-    </ContentPage.Resources>
-    <StackLayout Orientation="Vertical">
-        <Image
-            x:Name="_emptyUrisPlaceholder"
-            HorizontalOptions="Center"
-            WidthRequest="120"
-            HeightRequest="120"
-            Margin="0,100,0,0"
-            IsVisible="{Binding ShowList, Converter={StaticResource inverseBool}}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n ThereAreNoBlockedURIs}" />
-        <controls:CustomLabel
-            StyleClass="box-label-regular"
-            Text="{u:I18n AutoFillWillNotBeOfferedForTheseURIs}"
-            FontWeight="500"
-            HorizontalTextAlignment="Center"
-            Margin="14,10,14,0"/>
-        <controls:ExtendedCollectionView
-            ItemsSource="{Binding BlockedUris}"
-            IsVisible="{Binding ShowList}"
-            VerticalOptions="FillAndExpand"
-            Margin="0,5,0,0"
-            SelectionMode="None"
-            StyleClass="list, list-platform"
-            ExtraDataForLogging="Blocked Autofill Uris"
-            AutomationId="BlockedUrisCellList">
-            <CollectionView.ItemTemplate>
-                <DataTemplate x:DataType="pages:BlockAutofillUriItemViewModel">
-                    <StackLayout
-                        Orientation="Vertical"
-                        AutomationId="BlockedUriCell">
-                        <StackLayout
-                            Orientation="Horizontal">
-                            <controls:CustomLabel
-                                VerticalOptions="Center"
-                                StyleClass="box-label-regular"
-                                Text="{Binding Uri}"
-                                MaxLines="2"
-                                LineBreakMode="TailTruncation"
-                                FontWeight="500"
-                                Margin="15,0,0,0"
-                                HorizontalOptions="StartAndExpand"/>
-                            <controls:IconButton
-                                StyleClass="box-row-button-muted, box-row-button-platform"
-                                Text="{Binding Source={x:Static core:BitwardenIcons.PencilSquare}}"
-                                Command="{Binding EditUriCommand}"
-                                Margin="5,0,15,0"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n EditURI}"
-                                AutomationId="EditUriButton" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                    </StackLayout>
-                </DataTemplate>
-            </CollectionView.ItemTemplate>
-        </controls:ExtendedCollectionView>
-        <Button
-            Text="{u:I18n NewBlockedURI}"
-            Command="{Binding AddUriCommand}"
-            VerticalOptions="End"
-            HeightRequest="40"
-            Opacity="0.8"
-            Margin="14,5,14,10"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n NewBlockedURI}"
-            AutomationId="NewBlockedUriButton" />
-    </StackLayout>
-</pages:BaseContentPage>
--- a/src/App/Pages/Settings/BlockAutofillUrisPage.xaml.cs
+++ b/src/App/Pages/Settings/BlockAutofillUrisPage.xaml.cs
@@ -1,44 +0,0 @@
-using System.Threading.Tasks;
-using Bit.App.Styles;
-using Bit.App.Utilities;
-using Bit.Core.Utilities;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class BlockAutofillUrisPage : BaseContentPage, IThemeDirtablePage
-    {
-        private readonly BlockAutofillUrisPageViewModel _vm;
-
-        public BlockAutofillUrisPage()
-        {
-            InitializeComponent();
-
-            _vm = BindingContext as BlockAutofillUrisPageViewModel;
-            _vm.Page = this;
-        }
-
-        protected override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            _vm.InitAsync().FireAndForget(_ => Navigation.PopAsync());
-
-            UpdatePlaceholder();
-        }
-
-        public override async Task UpdateOnThemeChanged()
-        {
-            await base.UpdateOnThemeChanged();
-
-            UpdatePlaceholder();
-        }
-
-        private void UpdatePlaceholder()
-        {
-            MainThread.BeginInvokeOnMainThread(() =>
-                _emptyUrisPlaceholder.Source = ImageSource.FromFile(ThemeManager.UsingLightTheme ? "empty_uris_placeholder" : "empty_uris_placeholder_dark"));
-        }
-    }
-}
--- a/src/App/Pages/Settings/BlockAutofillUrisPageViewModel.cs
+++ b/src/App/Pages/Settings/BlockAutofillUrisPageViewModel.cs
@@ -1,186 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class BlockAutofillUrisPageViewModel : BaseViewModel
-    {
-        private const char URI_SEPARARTOR = ',';
-        private const string URI_FORMAT = "https://domain.com";
-
-        private readonly IStateService _stateService;
-        private readonly IDeviceActionService _deviceActionService;
-
-        public BlockAutofillUrisPageViewModel()
-        {
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-
-            AddUriCommand = new AsyncCommand(AddUriAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            EditUriCommand = new AsyncCommand<BlockAutofillUriItemViewModel>(EditUriAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-        }
-
-        public ObservableRangeCollection<BlockAutofillUriItemViewModel> BlockedUris { get; set; } = new ObservableRangeCollection<BlockAutofillUriItemViewModel>();
-
-        public bool ShowList => BlockedUris.Any();
-
-        public ICommand AddUriCommand { get; }
-
-        public ICommand EditUriCommand { get; }
-
-        public async Task InitAsync()
-        {
-            var blockedUrisList = await _stateService.GetAutofillBlacklistedUrisAsync();
-            if (blockedUrisList?.Any() != true)
-            {
-                return;
-            }
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                BlockedUris.AddRange(blockedUrisList.OrderBy(uri => uri).Select(u => new BlockAutofillUriItemViewModel(u, EditUriCommand)).ToList());
-                TriggerPropertyChanged(nameof(ShowList));
-            });
-        }
-
-        private async Task AddUriAsync()
-        {
-            var response = await _deviceActionService.DisplayValidatablePromptAsync(new Utilities.Prompts.ValidatablePromptConfig
-            {
-                Title = AppResources.NewUri,
-                Subtitle = AppResources.EnterURI,
-                ValueSubInfo = string.Format(AppResources.FormatXSeparateMultipleURIsWithAComma, URI_FORMAT),
-                OkButtonText = AppResources.Save,
-                ValidateText = text => ValidateUris(text, true)
-            });
-            if (response?.Text is null)
-            {
-                return;
-            }
-
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                foreach (var uri in response.Value.Text.Split(URI_SEPARARTOR).Where(s => !string.IsNullOrEmpty(s)))
-                {
-                    var cleanedUri = uri.Replace(Environment.NewLine, string.Empty).Trim();
-                    BlockedUris.Add(new BlockAutofillUriItemViewModel(cleanedUri, EditUriCommand));
-                }
-
-                BlockedUris = new ObservableRangeCollection<BlockAutofillUriItemViewModel>(BlockedUris.OrderBy(b => b.Uri));
-                TriggerPropertyChanged(nameof(BlockedUris));
-                TriggerPropertyChanged(nameof(ShowList));
-            });
-            await UpdateAutofillBlacklistedUrisAsync();
-            _deviceActionService.Toast(AppResources.URISaved);
-        }
-
-        private async Task EditUriAsync(BlockAutofillUriItemViewModel uriItemViewModel)
-        {
-            var response = await _deviceActionService.DisplayValidatablePromptAsync(new Utilities.Prompts.ValidatablePromptConfig
-            {
-                Title = AppResources.EditURI,
-                Subtitle = AppResources.EnterURI,
-                Text = uriItemViewModel.Uri,
-                ValueSubInfo = string.Format(AppResources.FormatX, URI_FORMAT),
-                OkButtonText = AppResources.Save,
-                ThirdButtonText = AppResources.Remove,
-                ValidateText = text => ValidateUris(text, false)
-            });
-            if (response is null)
-            {
-                return;
-            }
-
-            if (response.Value.ExecuteThirdAction)
-            {
-                await MainThread.InvokeOnMainThreadAsync(() =>
-                {
-                    BlockedUris.Remove(uriItemViewModel);
-                    TriggerPropertyChanged(nameof(ShowList));
-                });
-                await UpdateAutofillBlacklistedUrisAsync();
-                _deviceActionService.Toast(AppResources.URIRemoved);
-                return;
-            }
-
-            var cleanedUri = response.Value.Text.Replace(Environment.NewLine, string.Empty).Trim();
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                BlockedUris.Remove(uriItemViewModel);
-                BlockedUris.Add(new BlockAutofillUriItemViewModel(cleanedUri, EditUriCommand));
-                BlockedUris = new ObservableRangeCollection<BlockAutofillUriItemViewModel>(BlockedUris.OrderBy(b => b.Uri));
-                TriggerPropertyChanged(nameof(BlockedUris));
-                TriggerPropertyChanged(nameof(ShowList));
-            });
-            await UpdateAutofillBlacklistedUrisAsync();
-            _deviceActionService.Toast(AppResources.URISaved);
-        }
-
-        private string ValidateUris(string uris, bool allowMultipleUris)
-        {
-            if (string.IsNullOrWhiteSpace(uris))
-            {
-                return string.Format(AppResources.FormatX, URI_FORMAT);
-            }
-
-            if (!allowMultipleUris && uris.Contains(URI_SEPARARTOR))
-            {
-                return AppResources.CannotEditMultipleURIsAtOnce;
-            }
-
-            foreach (var uri in uris.Split(URI_SEPARARTOR).Where(u => !string.IsNullOrWhiteSpace(u)))
-            {
-                var cleanedUri = uri.Replace(Environment.NewLine, string.Empty).Trim();
-                if (!cleanedUri.StartsWith("http://") && !cleanedUri.StartsWith("https://") &&
-                    !cleanedUri.StartsWith(Constants.AndroidAppProtocol))
-                {
-                    return AppResources.InvalidFormatUseHttpsHttpOrAndroidApp;
-                }
-
-                if (!Uri.TryCreate(cleanedUri, UriKind.Absolute, out var _))
-                {
-                    return AppResources.InvalidURI;
-                }
-
-                if (BlockedUris.Any(uriItem => uriItem.Uri == cleanedUri))
-                {
-                    return string.Format(AppResources.TheURIXIsAlreadyBlocked, cleanedUri);
-                }
-            }
-
-            return null;
-        }
-
-        private async Task UpdateAutofillBlacklistedUrisAsync()
-        {
-            await _stateService.SetAutofillBlacklistedUrisAsync(BlockedUris.Any() ? BlockedUris.Select(bu => bu.Uri).ToList() : null);
-        }
-    }
-
-    public class BlockAutofillUriItemViewModel : ExtendedViewModel
-    {
-        public BlockAutofillUriItemViewModel(string uri, ICommand editUriCommand)
-        {
-            Uri = uri;
-            EditUriCommand = new Command(() => editUriCommand.Execute(this));
-        }
-
-        public string Uri { get; }
-
-        public ICommand EditUriCommand { get; }
-    }
-}
--- a/src/App/Pages/Settings/FolderAddEditPage.xaml
+++ b/src/App/Pages/Settings/FolderAddEditPage.xaml
@@ -13,13 +13,8 @@
    </ContentPage.BindingContext>

    <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Cancel}"
-                     Clicked="Close_Clicked"
-                     Order="Primary"
-                     Priority="-1" />
-        <ToolbarItem Text="{u:I18n Save}"
-                     Clicked="Save_Clicked"
-                     Order="Primary" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" Order="Primary" />
        <ToolbarItem Text="{u:I18n Delete}"
                     Clicked="Delete_Clicked"
                     Order="Secondary"
@@ -48,8 +43,7 @@
                        StyleClass="box-value"
                        x:Name="_nameEntry"
                        ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="FolderNameEntry" />
+                        ReturnCommand="{Binding SubmitCommand}" />
                </StackLayout>
            </StackLayout>
        </StackLayout>
--- a/src/App/Pages/Settings/FoldersPage.xaml
+++ b/src/App/Pages/Settings/FoldersPage.xaml
@@ -31,8 +31,7 @@
                       Margin="20, 0"
                       VerticalOptions="CenterAndExpand"
                       HorizontalOptions="CenterAndExpand"
-                       HorizontalTextAlignment="Center"
-                       AutomationId="NoFoldersLabel"></Label>
+                       HorizontalTextAlignment="Center"></Label>
                <controls:ExtendedCollectionView
                          IsVisible="{Binding ShowNoData, Converter={StaticResource inverseBool}}"
                          ItemsSource="{Binding Folders}"
@@ -45,12 +44,10 @@
                        <DataTemplate x:DataType="views:FolderView">
                            <controls:ExtendedStackLayout
                                StyleClass="list-row, list-row-platform"
-                                Padding="10"
-                                AutomationId="FolderCell">
+                                Padding="10">
                                <Label LineBreakMode="TailTruncation"
                                        StyleClass="list-title, list-title-platform"
-                                        Text="{Binding Name, Mode=OneWay}"
-                                        AutomationId="FolderName" />
+                                        Text="{Binding Name, Mode=OneWay}" />
                            </controls:ExtendedStackLayout>
                        </DataTemplate>
                    </CollectionView.ItemTemplate>
--- a/src/App/Pages/Settings/OptionsPage.xaml
+++ b/src/App/Pages/Settings/OptionsPage.xaml
@@ -27,8 +27,7 @@
                        x:Name="_themePicker"
                        ItemsSource="{Binding ThemeOptions, Mode=OneTime}"
                        SelectedIndex="{Binding ThemeSelectedIndex}"
-                        StyleClass="box-value"
-                        AutomationId="ThemeSelectorPicker" />
+                        StyleClass="box-value" />
                </StackLayout>
                <Label
                    StyleClass="box-footer-label"
@@ -45,8 +44,7 @@
                        x:Name="_autoDarkThemePicker"
                        ItemsSource="{Binding AutoDarkThemeOptions, Mode=OneTime}"
                        SelectedIndex="{Binding AutoDarkThemeSelectedIndex}"
-                        StyleClass="box-value"
-                        AutomationId="DefaultDarkThemePicker" />
+                        StyleClass="box-value" />
                </StackLayout>
                <Label
                    StyleClass="box-footer-label"
@@ -61,8 +59,7 @@
                        x:Name="_uriMatchPicker"
                        ItemsSource="{Binding UriMatchOptions, Mode=OneTime}"
                        SelectedIndex="{Binding UriMatchSelectedIndex}"
-                        StyleClass="box-value"
-                        AutomationId="DefaultUriMatchDetectionPicker" />
+                        StyleClass="box-value" />
                </StackLayout>
                <Label
                    Text="{u:I18n DefaultUriMatchDetectionDescription}"
@@ -77,8 +74,7 @@
                        x:Name="_clearClipboardPicker"
                        ItemsSource="{Binding ClearClipboardOptions, Mode=OneTime}"
                        SelectedIndex="{Binding ClearClipboardSelectedIndex}"
-                        StyleClass="box-value"
-                        AutomationId="ClearClipboardPicker" />
+                        StyleClass="box-value" />
                </StackLayout>
                <Label
                    Text="{u:I18n ClearClipboardDescription}"
@@ -94,8 +90,7 @@
                        ItemsSource="{Binding LocalesOptions, Mode=OneTime}"
                        SelectedItem="{Binding SelectedLocale}"
                        ItemDisplayBinding="{Binding Value}"
-                        StyleClass="box-value"
-                        AutomationId="LanguagePicker" />
+                        StyleClass="box-value" />
                </StackLayout>
                <Label
                    Text="{u:I18n LanguageChangeRequiresAppRestart}"
@@ -110,8 +105,7 @@
                    <Switch
                        IsToggled="{Binding AutoTotpCopy}"
                        StyleClass="box-value"
-                        HorizontalOptions="End"
-                        AutomationId="CopyTotpAutomaticallyToggle" />
+                        HorizontalOptions="End" />
                </StackLayout>
                <Label
                    Text="{u:I18n CopyTotpAutomaticallyDescription}"
@@ -126,8 +120,7 @@
                    <Switch
                        IsToggled="{Binding Favicon}"
                        StyleClass="box-value"
-                        HorizontalOptions="End"
-                        AutomationId="ShowWebsiteIconsToggle" />
+                        HorizontalOptions="End" />
                </StackLayout>
                <Label
                    Text="{u:I18n ShowWebsiteIconsDescription}"
@@ -153,14 +146,22 @@
                    StyleClass="box-footer-label, box-footer-label-switch" />
            </StackLayout>
            <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAutofillSettings}">
-                <StackLayout.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding GoToBlockAutofillUrisCommand}" />
-                </StackLayout.GestureRecognizers>
+                <StackLayout StyleClass="box-row, box-row-input">
+                    <Label
+                        Text="{u:I18n AutofillBlockedUris}"
+                        StyleClass="box-label" />
+                    <Editor
+                        x:Name="_autofillBlockedUrisEditor"
+                        Text="{Binding AutofillBlockedUris}"
+                        StyleClass="box-value"
+                        AutoSize="TextChanges"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        Keyboard="Url"
+                        Unfocused="AutofillBlockedUrisEditor_Unfocused" />
+                </StackLayout>
                <Label
-                    Text="{u:I18n BlockAutoFill}"
-                    StyleClass="box-label-regular" />
-                <Label
-                    Text="{u:I18n AutoFillWillNotBeOfferedForTheseURIs}"
+                    Text="{u:I18n AutofillBlockedUrisDescription}"
                    StyleClass="box-footer-label" />
            </StackLayout>
        </StackLayout>
--- a/src/App/Pages/Settings/OptionsPage.xaml.cs
+++ b/src/App/Pages/Settings/OptionsPage.xaml.cs
@@ -1,4 +1,6 @@
-using Bit.Core.Abstractions;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration;
@@ -42,6 +44,17 @@ namespace Bit.App.Pages
            await _vm.InitAsync();
        }

+        protected async override void OnDisappearing()
+        {
+            base.OnDisappearing();
+            await _vm.UpdateAutofillBlockedUris();
+        }
+
+        private async void AutofillBlockedUrisEditor_Unfocused(object sender, FocusEventArgs e)
+        {
+            await _vm.UpdateAutofillBlockedUris();
+        }
+
        private async void Close_Clicked(object sender, System.EventArgs e)
        {
            if (DoOnce())
--- a/src/App/Pages/Settings/OptionsPageViewModel.cs
+++ b/src/App/Pages/Settings/OptionsPageViewModel.cs
@@ -1,13 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Resources;
 using Bit.App.Utilities;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;

 namespace Bit.App.Pages
@@ -20,6 +19,7 @@ namespace Bit.App.Pages
        private readonly IPlatformUtilsService _platformUtilsService;

        private bool _autofillSavePrompt;
+        private string _autofillBlockedUris;
        private bool _favicon;
        private bool _autoTotpCopy;
        private int _clearClipboardSelectedIndex;
@@ -84,10 +84,6 @@ namespace Bit.App.Pages
                new KeyValuePair<string, string>(null, AppResources.DefaultSystem)
            };
            LocalesOptions.AddRange(_i18nService.LocaleNames.ToList());
-
-            GoToBlockAutofillUrisCommand = new AsyncCommand(() => Page.Navigation.PushAsync(new BlockAutofillUrisPage()),
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
        }

        public List<KeyValuePair<int?, string>> ClearClipboardOptions { get; set; }
@@ -196,18 +192,25 @@ namespace Bit.App.Pages
            }
        }

+        public string AutofillBlockedUris
+        {
+            get => _autofillBlockedUris;
+            set => SetProperty(ref _autofillBlockedUris, value);
+        }
+
        public bool ShowAndroidAutofillSettings
        {
            get => _showAndroidAutofillSettings;
            set => SetProperty(ref _showAndroidAutofillSettings, value);
        }

-        public ICommand GoToBlockAutofillUrisCommand { get; }
-
        public async Task InitAsync()
        {
            AutofillSavePrompt = !(await _stateService.GetAutofillDisableSavePromptAsync()).GetValueOrDefault();

+            var blockedUrisList = await _stateService.GetAutofillBlacklistedUrisAsync();
+            AutofillBlockedUris = blockedUrisList != null ? string.Join(", ", blockedUrisList) : null;
+
            AutoTotpCopy = !(await _stateService.GetDisableAutoTotpCopyAsync() ?? false);

            Favicon = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
@@ -285,6 +288,41 @@ namespace Bit.App.Pages
            }
        }

+        public async Task UpdateAutofillBlockedUris()
+        {
+            if (_inited)
+            {
+                if (string.IsNullOrWhiteSpace(AutofillBlockedUris))
+                {
+                    await _stateService.SetAutofillBlacklistedUrisAsync(null);
+                    AutofillBlockedUris = null;
+                    return;
+                }
+                try
+                {
+                    var csv = AutofillBlockedUris;
+                    var urisList = new List<string>();
+                    foreach (var uri in csv.Split(','))
+                    {
+                        if (string.IsNullOrWhiteSpace(uri))
+                        {
+                            continue;
+                        }
+                        var cleanedUri = uri.Replace(System.Environment.NewLine, string.Empty).Trim();
+                        if (!cleanedUri.StartsWith("http://") && !cleanedUri.StartsWith("https://") &&
+                            !cleanedUri.StartsWith(Constants.AndroidAppProtocol))
+                        {
+                            continue;
+                        }
+                        urisList.Add(cleanedUri);
+                    }
+                    await _stateService.SetAutofillBlacklistedUrisAsync(urisList);
+                    AutofillBlockedUris = string.Join(", ", urisList);
+                }
+                catch { }
+            }
+        }
+
        private async Task UpdateCurrentLocaleAsync()
        {
            if (!_inited)
--- a/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
@@ -32,21 +32,19 @@
                            StyleClass="text-muted, text-sm, text-bold"
                            HorizontalTextAlignment="Center" />
                    </Frame>
-                    <controls:CustomLabel IsVisible="{Binding UseFrame, Converter={StaticResource inverseBool}}"
+                    <Label IsVisible="{Binding UseFrame, Converter={StaticResource inverseBool}}"
                           Text="{Binding Name, Mode=OneWay}"
                           LineBreakMode="{Binding LineBreakMode}"
                           HorizontalOptions="StartAndExpand"
                           VerticalOptions="CenterAndExpand"
-                           StyleClass="list-title"
-                           AutomationId="{Binding AutomationIdSettingName}" />
-                    <controls:CustomLabel  Text="{Binding SubLabel, Mode=OneWay}"
+                           StyleClass="list-title"/>
+                    <Label Text="{Binding SubLabel, Mode=OneWay}"
                           IsVisible="{Binding ShowSubLabel}"
                           HorizontalOptions="End"
                           HorizontalTextAlignment="End"
                           VerticalOptions="CenterAndExpand"
                           TextColor="{Binding SubLabelColor}"
-                           StyleClass="list-sub"
-                           AutomationId="{Binding AutomationIdSettingStatus}" />
+                           StyleClass="list-sub" />
                </controls:ExtendedStackLayout>
            </DataTemplate>
            <DataTemplate
@@ -59,8 +57,7 @@
                        Padding="10"
                        HasShadow="False"
                        BackgroundColor="Transparent"
-                        BorderColor="{DynamicResource PrimaryColor}"
-                        AutomationId="SettingActivePolicyTextLabel">
+                        BorderColor="{DynamicResource PrimaryColor}">
                        <Label
                            Text="{Binding Name, Mode=OneWay}"
                            StyleClass="text-muted, text-sm, text-bold"
@@ -78,8 +75,7 @@
                                VerticalOptions="Center"
                                FontSize="Small"
                                TextColor="{Binding SubLabelColor}"
-                                StyleClass="list-sub" Margin="-5"
-                                AutomationId="SettingCustomVaultTimeoutPicker" />
+                                StyleClass="list-sub" Margin="-5"/>
                    <controls:ExtendedStackLayout.GestureRecognizers>
 			            <TapGestureRecognizer Tapped="ActivateTimePicker"/>
 		            </controls:ExtendedStackLayout.GestureRecognizers>
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageListItem.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageListItem.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Globalization;
 using System.Threading.Tasks;
 using Bit.App.Resources;
 using Bit.App.Utilities;
-using Bit.App.Utilities.Automation;
 using Xamarin.Forms;

 namespace Bit.App.Pages
@@ -24,29 +22,5 @@ namespace Bit.App.Pages
        public Color SubLabelColor => SubLabelTextEnabled ?
            ThemeManager.GetResourceColor("SuccessColor") :
            ThemeManager.GetResourceColor("MutedColor");
-
-        public string AutomationIdSettingName
-        {
-            get
-            {
-                return AutomationIdsHelper.AddSuffixFor(
-                    UseFrame ? "EnabledPolicy"
-                             : AutomationIdsHelper.ToEnglishTitleCase(Name)
-                    , SuffixType.Cell);
-            }
-        }
-
-        public string AutomationIdSettingStatus
-        {
-            get
-            {
-                if (UseFrame)
-                {
-                    return null;
-                }
-
-                return AutomationIdsHelper.AddSuffixFor(AutomationIdsHelper.ToEnglishTitleCase(Name), SuffixType.SettingValue);
-            }
-        }
    }
 }
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
@@ -7,7 +7,10 @@ using Bit.App.Pages.Accounts;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Models;
 using Bit.Core.Models.Domain;
+using Bit.Core.Models.Response;
+using Bit.Core.Models.View;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -48,7 +51,7 @@ namespace Bit.App.Pages
        private bool _reportLoggingEnabled;
        private bool _approvePasswordlessLoginRequests;
        private bool _shouldConnectToWatch;
-        private readonly static List<KeyValuePair<string, int?>> VaultTimeoutOptions =
+        private List<KeyValuePair<string, int?>> _vaultTimeouts =
            new List<KeyValuePair<string, int?>>
            {
                new KeyValuePair<string, int?>(AppResources.Immediately, 0),
@@ -62,7 +65,7 @@ namespace Bit.App.Pages
                new KeyValuePair<string, int?>(AppResources.Never, null),
                new KeyValuePair<string, int?>(AppResources.Custom, CustomVaultTimeoutValue),
            };
-        private readonly static List<KeyValuePair<string, VaultTimeoutAction>> VaultTimeoutActionOptions =
+        private List<KeyValuePair<string, VaultTimeoutAction>> _vaultTimeoutActions =
            new List<KeyValuePair<string, VaultTimeoutAction>>
            {
                new KeyValuePair<string, VaultTimeoutAction>(AppResources.Lock, VaultTimeoutAction.Lock),
@@ -71,8 +74,6 @@ namespace Bit.App.Pages

        private Policy _vaultTimeoutPolicy;
        private int? _vaultTimeout;
-        private List<KeyValuePair<string, int?>> _vaultTimeoutOptions = VaultTimeoutOptions;
-        private List<KeyValuePair<string, VaultTimeoutAction>> _vaultTimeoutActionOptions = VaultTimeoutActionOptions;

        public SettingsPageViewModel()
        {
@@ -116,28 +117,20 @@ namespace Bit.App.Pages
                    _localizeService.GetLocaleShortTime(lastSync.Value));
            }

-            _vaultTimeoutPolicy = null;
-            _vaultTimeoutOptions = VaultTimeoutOptions;
-            _vaultTimeoutActionOptions = VaultTimeoutActionOptions;
-
-            _vaultTimeout = await _vaultTimeoutService.GetVaultTimeout();
-            _vaultTimeoutDisplayValue = _vaultTimeoutOptions.FirstOrDefault(o => o.Value == _vaultTimeout).Key;
-            _vaultTimeoutDisplayValue ??= _vaultTimeoutOptions.Where(o => o.Value == CustomVaultTimeoutValue).First().Key;
-
-            var action = await _vaultTimeoutService.GetVaultTimeoutAction() ?? VaultTimeoutAction.Lock;
-            _vaultTimeoutActionDisplayValue = _vaultTimeoutActionOptions.FirstOrDefault(o => o.Value == action).Key;
-
            if (await _policyService.PolicyAppliesToUser(PolicyType.MaximumVaultTimeout))
            {
-                // if we have a vault timeout policy, we need to filter the timeout options
                _vaultTimeoutPolicy = (await _policyService.GetAll(PolicyType.MaximumVaultTimeout)).First();
-                var policyMinutes = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
-                _vaultTimeoutOptions = _vaultTimeoutOptions.Where(t =>
-                    t.Value <= policyMinutes &&
+                var minutes = _policyService.GetPolicyInt(_vaultTimeoutPolicy, "minutes").GetValueOrDefault();
+                _vaultTimeouts = _vaultTimeouts.Where(t =>
+                    t.Value <= minutes &&
                    (t.Value > 0 || t.Value == CustomVaultTimeoutValue) &&
                    t.Value != null).ToList();
            }

+            _vaultTimeout = await _vaultTimeoutService.GetVaultTimeout();
+            _vaultTimeoutDisplayValue = _vaultTimeouts.FirstOrDefault(o => o.Value == _vaultTimeout).Key;
+            var action = await _stateService.GetVaultTimeoutActionAsync() ?? VaultTimeoutAction.Lock;
+            _vaultTimeoutActionDisplayValue = _vaultTimeoutActions.FirstOrDefault(o => o.Value == action).Key;
            var pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
            _pin = pinSet.Item1 || pinSet.Item2;
            _biometric = await _vaultTimeoutService.IsBiometricLockSetAsync();
@@ -273,7 +266,7 @@ namespace Bit.App.Pages
        {
            var oldTimeout = _vaultTimeout;

-            var options = _vaultTimeoutOptions.Select(
+            var options = _vaultTimeouts.Select(
                o => o.Key == _vaultTimeoutDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
            if (promptOptions)
            {
@@ -284,7 +277,7 @@ namespace Bit.App.Pages
                    return;
                }
                var cleanSelection = selection.Replace("✓ ", string.Empty);
-                var selectionOption = _vaultTimeoutOptions.FirstOrDefault(o => o.Key == cleanSelection);
+                var selectionOption = _vaultTimeouts.FirstOrDefault(o => o.Key == cleanSelection);

                // Check if the selected Timeout action is "Never" and if it's different from the previous selected value
                if (selectionOption.Value == null && selectionOption.Value != oldTimeout)
@@ -302,13 +295,13 @@ namespace Bit.App.Pages

            if (_vaultTimeoutPolicy != null)
            {
-                var maximumTimeout = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
+                var maximumTimeout = _policyService.GetPolicyInt(_vaultTimeoutPolicy, "minutes");

                if (newTimeout > maximumTimeout)
                {
                    await _platformUtilsService.ShowDialogAsync(AppResources.VaultTimeoutToLarge, AppResources.Warning);
                    var timeout = await _vaultTimeoutService.GetVaultTimeout();
-                    _vaultTimeoutDisplayValue = _vaultTimeoutOptions.FirstOrDefault(o => o.Value == timeout).Key ??
+                    _vaultTimeoutDisplayValue = _vaultTimeouts.FirstOrDefault(o => o.Value == timeout).Key ??
                                                AppResources.Custom;
                    return;
                }
@@ -381,13 +374,7 @@ namespace Bit.App.Pages

        public async Task VaultTimeoutActionAsync()
        {
-            if (_vaultTimeoutPolicy != null &&
-                !string.IsNullOrEmpty(_vaultTimeoutPolicy.GetString(Policy.ACTION_KEY)))
-            {
-                // do nothing if we have a policy set
-                return;
-            }
-            var options = _vaultTimeoutActionOptions.Select(o =>
+            var options = _vaultTimeoutActions.Select(o =>
                o.Key == _vaultTimeoutActionDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
            var selection = await Page.DisplayActionSheet(AppResources.VaultTimeoutAction,
                AppResources.Cancel, null, options);
@@ -406,7 +393,7 @@ namespace Bit.App.Pages
                    cleanSelection = AppResources.Lock;
                }
            }
-            var selectionOption = _vaultTimeoutActionOptions.FirstOrDefault(o => o.Key == cleanSelection);
+            var selectionOption = _vaultTimeoutActions.FirstOrDefault(o => o.Key == cleanSelection);
            var changed = _vaultTimeoutActionDisplayValue != selectionOption.Key;
            _vaultTimeoutActionDisplayValue = selectionOption.Key;
            await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(_vaultTimeout,
@@ -610,36 +597,14 @@ namespace Bit.App.Pages
            }
            if (_vaultTimeoutPolicy != null)
            {
-                var policyMinutes = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
-                var policyAction = _vaultTimeoutPolicy.GetString(Policy.ACTION_KEY);
-
-                if (policyMinutes.HasValue || !string.IsNullOrWhiteSpace(policyAction))
+                var maximumTimeout = _policyService.GetPolicyInt(_vaultTimeoutPolicy, "minutes").GetValueOrDefault();
+                securityItems.Insert(0, new SettingsPageListItem
                {
-                    string policyAlert;
-                    if (policyMinutes.HasValue && string.IsNullOrWhiteSpace(policyAction))
-                    {
-                        policyAlert = string.Format(AppResources.VaultTimeoutPolicyInEffect,
-                            Math.Floor((float)policyMinutes / 60),
-                            policyMinutes % 60);
-                    }
-                    else if (!policyMinutes.HasValue && !string.IsNullOrWhiteSpace(policyAction))
-                    {
-                        policyAlert = string.Format(AppResources.VaultTimeoutActionPolicyInEffect,
-                            policyAction == Policy.ACTION_LOCK ? AppResources.Lock : AppResources.LogOut);
-                    }
-                    else
-                    {
-                        policyAlert = string.Format(AppResources.VaultTimeoutPolicyWithActionInEffect,
-                            Math.Floor((float)policyMinutes / 60),
-                            policyMinutes % 60,
-                            policyAction == Policy.ACTION_LOCK ? AppResources.Lock : AppResources.LogOut);
-                    }
-                    securityItems.Insert(0, new SettingsPageListItem
-                    {
-                        Name = policyAlert,
-                        UseFrame = true,
-                    });
-                }
+                    Name = string.Format(AppResources.VaultTimeoutPolicyInEffect,
+                        Math.Floor((float)maximumTimeout / 60),
+                        maximumTimeout % 60),
+                    UseFrame = true,
+                });
            }
            if (Device.RuntimePlatform == Device.Android)
            {
@@ -827,12 +792,12 @@ namespace Bit.App.Pages

        private VaultTimeoutAction GetVaultTimeoutActionFromKey(string key)
        {
-            return _vaultTimeoutActionOptions.FirstOrDefault(o => o.Key == key).Value;
+            return _vaultTimeoutActions.FirstOrDefault(o => o.Key == key).Value;
        }

        private int? GetVaultTimeoutFromKey(string key)
        {
-            return _vaultTimeoutOptions.FirstOrDefault(o => o.Key == key).Value;
+            return _vaultTimeouts.FirstOrDefault(o => o.Key == key).Value;
        }

        private string CreateSelectableOption(string option, bool selected) => selected ? $"✓ {option}" : option;
--- a/src/App/Pages/TabsPage.cs
+++ b/src/App/Pages/TabsPage.cs
@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using Bit.App.Effects;
 using Bit.App.Models;
 using Bit.App.Resources;
-using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
@@ -16,7 +15,6 @@ namespace Bit.App.Pages
        private readonly IBroadcasterService _broadcasterService;
        private readonly IMessagingService _messagingService;
        private readonly IKeyConnectorService _keyConnectorService;
-        private readonly IStateService _stateService;
        private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");

        private NavigationPage _groupingsPage;
@@ -28,7 +26,6 @@ namespace Bit.App.Pages
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
-            _stateService = ServiceContainer.Resolve<IStateService>();

            _groupingsPage = new NavigationPage(new GroupingsPage(true, previousPage: previousPage))
            {
@@ -98,13 +95,6 @@ namespace Bit.App.Pages
            {
                _messagingService.Send("convertAccountToKeyConnector");
            }
-
-            var forcePasswordResetReason = await _stateService.GetForcePasswordResetReasonAsync();
-
-            if (forcePasswordResetReason.HasValue)
-            {
-                _messagingService.Send(Constants.ForceUpdatePassword);
-            }
        }

        protected override void OnDisappearing()
--- a/src/App/Pages/Vault/AttachmentsPage.xaml
+++ b/src/App/Pages/Vault/AttachmentsPage.xaml
@@ -33,25 +33,23 @@
            <StackLayout StyleClass="box">
                <StackLayout StyleClass="box-row" Padding="10, 20"
                             IsVisible="{Binding HasAttachments, Converter={StaticResource inverseBool}}">
-                    <Label Text="{u:I18n NoAttachments}" HorizontalTextAlignment="Center" AutomationId="NoAttachmentsLabel" />
+                    <Label Text="{u:I18n NoAttachments}" HorizontalTextAlignment="Center" />
                </StackLayout>
-                <controls:RepeaterView ItemsSource="{Binding Attachments}" IsVisible="{Binding HasAttachments}" AutomationId="AttachmentsList">
+                <controls:RepeaterView ItemsSource="{Binding Attachments}" IsVisible="{Binding HasAttachments}">
                    <controls:RepeaterView.ItemTemplate>
                        <DataTemplate x:DataType="views:AttachmentView">
                            <StackLayout Spacing="0" Padding="0">
-                                <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10" AutomationId="AttachmentRow">
+                                <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10">
                                    <Label
                                        Text="{Binding FileName, Mode=OneWay}"
                                        StyleClass="box-value"
                                        VerticalTextAlignment="Center"
-                                        HorizontalOptions="StartAndExpand"
-                                        AutomationId="AttachmentFileNameLabel" />
+                                        HorizontalOptions="StartAndExpand" />
                                    <Label
                                        Text="{Binding SizeName, Mode=OneWay}"
                                        StyleClass="box-sub-label"
                                        HorizontalTextAlignment="End"
-                                        VerticalTextAlignment="Center"
-                                        AutomationId="AttachmentFileSizeLabel" />
+                                        VerticalTextAlignment="Center" />
                                    <controls:IconButton 
                                        StyleClass="box-row-button, box-row-button-platform"
                                        Text="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
@@ -59,8 +57,7 @@
                                        CommandParameter="{Binding .}"
                                        VerticalOptions="Center"
                                        AutomationProperties.IsInAccessibleTree="True"
-                                        AutomationProperties.Name="{u:I18n Delete}"
-                                        AutomationId="AttachmentDeleteButton" />
+                                        AutomationProperties.Name="{u:I18n Delete}" />
                                </StackLayout>
                                <BoxView StyleClass="box-row-separator" />
                            </StackLayout>
@@ -80,20 +77,17 @@
                        LineBreakMode="CharacterWrap"
                        StyleClass="text-sm, text-muted"
                        HorizontalOptions="FillAndExpand"
-                        HorizontalTextAlignment="Center"
-                        AutomationId="NoFileChosenLabel" />
+                        HorizontalTextAlignment="Center" />
                    <Label
                        IsVisible="{Binding FileName, Converter={StaticResource notNull}}"
                        Text="{Binding FileName}"
                        LineBreakMode="CharacterWrap"
                        StyleClass="text-sm, text-muted"
                        HorizontalOptions="FillAndExpand"
-                        HorizontalTextAlignment="Center"
-                        AutomationId="NewAttachmentNameLabel" />
+                        HorizontalTextAlignment="Center" />
                </StackLayout>
                <Button Text="{u:I18n ChooseFile}" StyleClass="box-button-row"
-                        Clicked="ChooseFile_Clicked"
-                        AutomationId="ChooseFileButton"></Button>
+                        Clicked="ChooseFile_Clicked"></Button>
                <Label
                    Margin="0, 10, 0, 0"
                    Text="{u:I18n MaxFileSize}"
--- a/src/App/Pages/Vault/BaseCipherViewModel.cs
+++ b/src/App/Pages/Vault/BaseCipherViewModel.cs
@@ -37,8 +37,6 @@ namespace Bit.App.Pages
            set => SetProperty(ref _cipher, value, additionalPropertyNames: AdditionalPropertiesToRaiseOnCipherChanged);
        }

-        public string CreationDate => string.Format(AppResources.CreatedX, Cipher.CreationDate.ToShortDateString());
-
        public AsyncCommand CheckPasswordCommand { get; }

        protected async Task CheckPasswordAsync()
--- a/src/App/Pages/Vault/CipherAddEditPage.xaml
+++ b/src/App/Pages/Vault/CipherAddEditPage.xaml
@@ -57,16 +57,16 @@
                         x:Key="deleteItem" />
            
            <DataTemplate x:Key="TextCustomFieldDataTemplate">
-                <il:TextCustomFieldItemLayout AutomationId="TextCustomFieldItem" />
+                <il:TextCustomFieldItemLayout />
            </DataTemplate>
            <DataTemplate x:Key="BooleanCustomFieldDataTemplate">
-                <il:BooleanCustomFieldItemLayout AutomationId="BooleanCustomFieldItem" />
+                <il:BooleanCustomFieldItemLayout />
            </DataTemplate>
            <DataTemplate x:Key="HiddenCustomFieldDataTemplate">
-                <il:HiddenCustomFieldItemLayout AutomationId="HiddenCustomFieldItem" />
+                <il:HiddenCustomFieldItemLayout />
            </DataTemplate>
            <DataTemplate x:Key="LinkedCustomFieldDataTemplate">
-                <il:LinkedCustomFieldItemLayout AutomationId="LinkedCustomFieldItem" />
+                <il:LinkedCustomFieldItemLayout />
            </DataTemplate>

            <dts:CustomFieldItemTemplateSelector x:Key="CustomFieldItemTemplateSelector"
@@ -100,8 +100,7 @@
                        <Label
                            Text="{u:I18n PersonalOwnershipPolicyInEffect}"
                            StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Center"
-                            AutomationId="PersonalOwnershipPolicyLabel"/>
+                            HorizontalTextAlignment="Center" />
                    </Frame>
                </Grid>
                <StackLayout StyleClass="box-row-header">
@@ -117,8 +116,7 @@
                        x:Name="_typePicker"
                        ItemsSource="{Binding TypeOptions, Mode=OneTime}"
                        SelectedIndex="{Binding TypeSelectedIndex}"
-                        StyleClass="box-value"
-                        AutomationId="ItemTypePicker" />
+                        StyleClass="box-value" />
                </StackLayout>
                <StackLayout StyleClass="box-row, box-row-input">
                    <Label
@@ -127,10 +125,7 @@
                    <Entry
                        x:Name="_nameEntry"
                        Text="{Binding Cipher.Name}"
-                        StyleClass="box-value"
-                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n Name}"
-                        AutomationId="ItemNameEntry" />
+                        StyleClass="box-value" />
                </StackLayout>
                <StackLayout IsVisible="{Binding IsLogin}" Spacing="0" Padding="0">
                    <Grid StyleClass="box-row, box-row-input"
@@ -143,10 +138,7 @@
                            x:Name="_loginUsernameEntry"
                            Text="{Binding Cipher.Login.Username}"
                            StyleClass="box-value" 
-                            Grid.Row="1"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Username}"
-                            AutomationId="LoginUsernameEntry" />
+                            Grid.Row="1"/>
                        <controls:IconButton 
                            StyleClass="box-row-button, box-row-button-platform"
                            Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
@@ -154,8 +146,7 @@
                            Grid.Column="1"
                            Grid.RowSpan="2"
                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n GenerateUsername}"
-                            AutomationId="GenerateUsernameButton" />
+                            AutomationProperties.Name="{u:I18n GenerateUsername}" />
                    </Grid>
                    <Grid StyleClass="box-row, box-row-input">
                        <Grid.RowDefinitions>
@@ -183,10 +174,7 @@
                            IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                            IsSpellCheckEnabled="False"
                            IsTextPredictionEnabled="False"
-                            IsEnabled="{Binding Cipher.ViewPassword}"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Password}"
-                            AutomationId="LoginPasswordEntry" />
+                            IsEnabled="{Binding Cipher.ViewPassword}"/>
                        <controls:IconButton 
                            StyleClass="box-row-button, box-row-button-platform"
                            Text="{Binding Source={x:Static core:BitwardenIcons.CheckCircle}}"
@@ -196,8 +184,7 @@
                            Grid.RowSpan="2"
                            AutomationProperties.IsInAccessibleTree="True"
                            AutomationProperties.Name="{u:I18n CheckPassword}"
-                            IsVisible="{Binding Cipher.ViewPassword}"
-                            AutomationId="CheckPasswordButton" />
+                            IsVisible="{Binding Cipher.ViewPassword}" />
                        <controls:IconButton 
                            StyleClass="box-row-button, box-row-button-platform"
                            Text="{Binding ShowPasswordIcon}"
@@ -208,8 +195,7 @@
                            AutomationProperties.IsInAccessibleTree="True"
                            AutomationProperties.Name="{u:I18n ToggleVisibility}"
                            AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                            IsVisible="{Binding Cipher.ViewPassword}"
-                            AutomationId="ViewPasswordButton" />
+                            IsVisible="{Binding Cipher.ViewPassword}" />
                        <controls:IconButton 
                            StyleClass="box-row-button, box-row-button-platform"
                            Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
@@ -219,21 +205,9 @@
                            Grid.RowSpan="2"
                            AutomationProperties.IsInAccessibleTree="True"
                            AutomationProperties.Name="{u:I18n GeneratePassword}"
-                            IsVisible="{Binding Cipher.ViewPassword}"
-                            AutomationId="RegeneratePasswordButton" />
+                            IsVisible="{Binding Cipher.ViewPassword}" />
                    </Grid>

-                    <Label
-                        Text="{u:I18n Passkey}"
-                        StyleClass="box-label"
-                        Margin="0,10,0,0"
-                        IsVisible="{Binding ShowPasskeyInfo}"/>
-                    <Entry
-                        Text="{u:I18n AvailableForTwoStepLogin}"
-                        IsEnabled="False"
-                        StyleClass="box-value,text-muted"
-                        IsVisible="{Binding ShowPasskeyInfo}" />
-
                    <Grid StyleClass="box-row, box-row-input">
                        <Grid.RowDefinitions>
                            <RowDefinition Height="Auto" />
@@ -267,8 +241,7 @@
                                Padding="0,15"
                                HorizontalOptions="Center"
                                VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center"
-                                AutomationId="SetupTotpButton" />
+                                VerticalTextAlignment="Center" />
                        </Frame>
                        <controls:MonoEntry
                            x:Name="_loginTotpEntry"
@@ -281,10 +254,7 @@
                            StyleClass="box-value"
                            Grid.Row="1"
                            Grid.Column="0"
-                            Grid.ColumnSpan="{Binding TotpColumnSpan}"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n AuthenticatorKey}"
-                            AutomationId="LoginTotpEntry" />
+                            Grid.ColumnSpan="{Binding TotpColumnSpan}" />
                        <controls:IconButton 
                            StyleClass="box-row-button, box-row-button-platform"
                            Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -292,10 +262,7 @@
                            IsVisible="{Binding HasTotpValue}"
                            Grid.Row="0"
                            Grid.Column="1"
-                            Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n CopyTotp}"
-                            AutomationId="CopyTotpValueButton" />
+                            Grid.RowSpan="2" />
                        <controls:IconButton 
                            StyleClass="box-row-button, box-row-button-platform"
                            Text="{Binding Source={x:Static core:BitwardenIcons.Camera}}"
@@ -305,8 +272,7 @@
                            Grid.RowSpan="2"
                            IsVisible="{Binding HasTotpValue}"
                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ScanQrTitle}"
-                            />
+                            AutomationProperties.Name="{u:I18n ScanQrTitle}" />
                    </Grid>
                </StackLayout>
                <StackLayout IsVisible="{Binding IsCard}" Spacing="0" Padding="0">
@@ -317,8 +283,7 @@
                        <Entry
                            x:Name="_cardholderNameEntry"
                            Text="{Binding Cipher.Card.CardholderName}"
-                            StyleClass="box-value"
-                            AutomationId="CardholderNameEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <Grid StyleClass="box-row, box-row-input">
                        <Grid.RowDefinitions>
@@ -342,10 +307,7 @@
                            Grid.Column="0"
                            IsPassword="{Binding ShowCardNumber, Converter={StaticResource inverseBool}}"
                            IsSpellCheckEnabled="False"
-                            IsTextPredictionEnabled="False"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Number}"
-                            AutomationId="CardNumberEntry" />
+                            IsTextPredictionEnabled="False" />
                        <controls:IconButton 
                            StyleClass="box-row-button, box-row-button-platform"
                            Text="{Binding ShowCardNumberIcon}"
@@ -354,8 +316,7 @@
                            Grid.Column="1"
                            Grid.RowSpan="2"
                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                            AutomationId="ShowCardNumberButton" />
+                            AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                    </Grid>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -365,8 +326,7 @@
                            x:Name="_cardBrandPicker"
                            ItemsSource="{Binding CardBrandOptions, Mode=OneTime}"
                            SelectedIndex="{Binding CardBrandSelectedIndex}"
-                            StyleClass="box-value"
-                            AutomationId="CardBrandPicker" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -376,8 +336,7 @@
                            x:Name="_cardExpMonthPicker"
                            ItemsSource="{Binding CardExpMonthOptions, Mode=OneTime}"
                            SelectedIndex="{Binding CardExpMonthSelectedIndex}"
-                            StyleClass="box-value"
-                            AutomationId="CardExpirationMonthPicker" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -387,10 +346,7 @@
                            x:Name="_cardExpYearEntry"
                            Text="{Binding Cipher.Card.ExpYear}"
                            StyleClass="box-value"
-                            Keyboard="Numeric"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ExpirationYear}"
-                            AutomationId="CardExpirationYearEntry" />
+                            Keyboard="Numeric" />
                    </StackLayout>
                    <Grid StyleClass="box-row, box-row-input">
                        <Grid.RowDefinitions>
@@ -415,10 +371,7 @@
                            Keyboard="Numeric"
                            IsPassword="{Binding ShowCardCode, Converter={StaticResource inverseBool}}"
                            IsSpellCheckEnabled="False"
-                            IsTextPredictionEnabled="False"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n SecurityCode}"
-                            AutomationId="CardSecurityCodeEntry" />
+                            IsTextPredictionEnabled="False" />
                        <controls:IconButton 
                            StyleClass="box-row-button, box-row-button-platform"
                            Text="{Binding ShowCardCodeIcon}"
@@ -427,8 +380,7 @@
                            Grid.Column="1"
                            Grid.RowSpan="2"
                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                            AutomationId="CardShowSecurityCodeButton" />
+                            AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                    </Grid>
                </StackLayout>
                <StackLayout IsVisible="{Binding IsIdentity}" Spacing="0" Padding="0">
@@ -440,8 +392,7 @@
                            x:Name="_identityTitlePicker"
                            ItemsSource="{Binding IdentityTitleOptions, Mode=OneTime}"
                            SelectedIndex="{Binding IdentityTitleSelectedIndex}"
-                            StyleClass="box-value"
-                            AutomationId="IdentityTitlePicker" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -450,10 +401,7 @@
                        <Entry
                            x:Name="_identityFirstNameEntry"
                            Text="{Binding Cipher.Identity.FirstName}"
-                            StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n FirstName}"
-                            AutomationId="IdentityFirstNameEntry" />
+                            StyleClass="box-value,capitalize-word-input"/>
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -462,10 +410,7 @@
                        <Entry
                            x:Name="_identityMiddleNameEntry"
                            Text="{Binding Cipher.Identity.MiddleName}"
-                            StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n MiddleName}"
-                            AutomationId="IdentityMiddleNameEntry" />
+                            StyleClass="box-value,capitalize-word-input" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -474,10 +419,7 @@
                        <Entry
                            x:Name="_identityLastNameEntry"
                            Text="{Binding Cipher.Identity.LastName}"
-                            StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n LastName}"
-                            AutomationId="IdentityLastNameEntry" />
+                            StyleClass="box-value,capitalize-word-input" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -486,10 +428,7 @@
                        <Entry
                            x:Name="_identityUsernameEntry"
                            Text="{Binding Cipher.Identity.Username}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Username}"
-                            AutomationId="IdentityUsernameEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -498,10 +437,7 @@
                        <Entry
                            x:Name="_identityCompanyEntry"
                            Text="{Binding Cipher.Identity.Company}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Company}"
-                            AutomationId="IdentityCompanyEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -510,10 +446,7 @@
                        <Entry
                            x:Name="_identitySsnEntry"
                            Text="{Binding Cipher.Identity.SSN}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n SSN}"
-                            AutomationId="IdentitySsnEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -522,10 +455,7 @@
                        <Entry
                            x:Name="_identityPassportNumberEntry"
                            Text="{Binding Cipher.Identity.PassportNumber}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n PassportNumber}"
-                            AutomationId="IdentityPassportNumberEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -534,10 +464,7 @@
                        <Entry
                            x:Name="_identityLicenseNumberEntry"
                            Text="{Binding Cipher.Identity.LicenseNumber}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n LicenseNumber}"
-                            AutomationId="IdentityLicenseNumberEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -547,10 +474,7 @@
                            x:Name="_identityEmailEntry"
                            Keyboard="Email"
                            Text="{Binding Cipher.Identity.Email}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Email}"
-                            AutomationId="IdentityEmailEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -560,10 +484,7 @@
                            x:Name="_identityPhoneEntry"
                            Text="{Binding Cipher.Identity.Phone}"
                            Keyboard="Telephone"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Phone}"
-                            AutomationId="IdentityPhoneEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -572,10 +493,7 @@
                        <Entry
                            x:Name="_identityAddress1Entry"
                            Text="{Binding Cipher.Identity.Address1}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address1}"
-                            AutomationId="IdentityAddressOneEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -584,10 +502,7 @@
                        <Entry
                            x:Name="_identityAddress2Entry"
                            Text="{Binding Cipher.Identity.Address2}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address2}"
-                            AutomationId="IdentityAddressTwoEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -596,10 +511,7 @@
                        <Entry
                            x:Name="_identityAddress3Entry"
                            Text="{Binding Cipher.Identity.Address3}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address3}"
-                            AutomationId="IdentityAddressThreeEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -608,10 +520,7 @@
                        <Entry
                            x:Name="_identityCityEntry"
                            Text="{Binding Cipher.Identity.City}"
-                            StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n CityTown}"
-                            AutomationId="IdentityCityEntry" />
+                            StyleClass="box-value,capitalize-sentence-input" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -620,10 +529,7 @@
                        <Entry
                            x:Name="_identityStateEntry"
                            Text="{Binding Cipher.Identity.State}"
-                            StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n StateProvince}"
-                            AutomationId="IdentityStateEntry" />
+                            StyleClass="box-value,capitalize-sentence-input" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -632,10 +538,7 @@
                        <Entry
                            x:Name="_identityPostalCodeEntry"
                            Text="{Binding Cipher.Identity.PostalCode}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ZipPostalCode}"
-                            AutomationId="IdentityPostalCodeEntry" />
+                            StyleClass="box-value" />
                    </StackLayout>
                    <StackLayout StyleClass="box-row, box-row-input">
                        <Label
@@ -644,44 +547,9 @@
                        <Entry
                            x:Name="_identityCountryEntry"
                            Text="{Binding Cipher.Identity.Country}"
-                            StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Country}"
-                            AutomationId="IdentityCountryEntry" />
+                            StyleClass="box-value,capitalize-sentence-input" />
                    </StackLayout>
                </StackLayout>
-
-                <StackLayout IsVisible="{Binding IsFido2Key}" Spacing="0" Padding="0">
-                    <Label
-                        Text="{u:I18n Username}"
-                        StyleClass="box-label"
-                        Margin="0,10,0,0"/>
-                    <Entry
-                        x:Name="_fido2KeyUsernameEntry"
-                        Text="{Binding Cipher.Fido2Key.UserName}"
-                        StyleClass="box-value" 
-                        Grid.Row="1"/>
-                    <Label
-                        Text="{u:I18n Passkey}"
-                        StyleClass="box-label"
-                        Margin="0,10,0,0"/>
-                    <Entry
-                        Text="{Binding CreationDate}"
-                        IsEnabled="False"
-                        StyleClass="box-value,text-muted" />
-                    <Label
-                        Text="{u:I18n Application}"
-                        StyleClass="box-label"
-                        Margin="0,10,0,0"/>
-                    <Entry
-                        Text="{Binding Cipher.Fido2Key.LaunchUri}"
-                        IsEnabled="False"
-                        StyleClass="box-value,text-muted" />
-                    <Label
-                        Text="{u:I18n YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey}"
-                        StyleClass="box-sub-label" />
-                </StackLayout>
-
            </StackLayout>
            <StackLayout StyleClass="box" IsVisible="{Binding IsLogin}">
                <StackLayout StyleClass="box-row-header">
@@ -691,7 +559,7 @@
                <controls:RepeaterView ItemsSource="{Binding Uris}">
                    <controls:RepeaterView.ItemTemplate>
                        <DataTemplate x:DataType="views:LoginUriView">
-                            <Grid StyleClass="box-row, box-row-input" AutomationId="UriListGrid" >
+                            <Grid StyleClass="box-row, box-row-input">
                                <Grid.RowDefinitions>
                                    <RowDefinition Height="Auto" />
                                    <RowDefinition Height="*" />
@@ -710,10 +578,7 @@
                                    Keyboard="Url"
                                    StyleClass="box-value"
                                    Grid.Row="1"
-                                    Grid.Column="0"
-                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n URI}"
-                                    AutomationId="LoginUriEntry" />
+                                    Grid.Column="0" />
                                <controls:IconButton
                                    StyleClass="box-row-button, box-row-button-platform"
                                    Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
@@ -723,15 +588,13 @@
                                    Grid.Column="1"
                                    Grid.RowSpan="2"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n Options}"
-                                    AutomationId="LoginUriOptionsButton" />
+                                    AutomationProperties.Name="{u:I18n Options}" />
                            </Grid>
                        </DataTemplate>
                    </controls:RepeaterView.ItemTemplate>
                </controls:RepeaterView>
                <Button Text="{u:I18n NewUri}" StyleClass="box-button-row"
-                        Clicked="NewUri_Clicked"
-                        AutomationId="LoginAddNewUriButton"></Button>
+                        Clicked="NewUri_Clicked"></Button>
            </StackLayout>
            <StackLayout StyleClass="box">
                <StackLayout StyleClass="box-row-header">
@@ -746,8 +609,7 @@
                        x:Name="_folderPicker"
                        ItemsSource="{Binding FolderOptions, Mode=OneTime}"
                        SelectedIndex="{Binding FolderSelectedIndex}"
-                        StyleClass="box-value"
-                        AutomationId="FolderPicker" />
+                        StyleClass="box-value" />
                </StackLayout>
                <StackLayout StyleClass="box-row, box-row-switch">
                    <Label
@@ -757,8 +619,7 @@
                    <Switch
                        IsToggled="{Binding Cipher.Favorite}"
                        StyleClass="box-value"
-                        HorizontalOptions="End"
-                        AutomationId="ItemFavoriteToggle" />
+                        HorizontalOptions="End" />
                </StackLayout>
                <StackLayout x:Name="_passwordPrompt" StyleClass="box-row, box-row-switch">
                    <Label
@@ -770,14 +631,13 @@
                        Command="{Binding PasswordPromptHelpCommand}"
                        TextColor="{DynamicResource MutedColor}"
                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n MasterPasswordRePromptHelp}"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
                        HorizontalOptions="StartAndExpand" />
                    <Switch
                        IsToggled="{Binding PasswordPrompt}"
                        Toggled="PasswordPrompt_Toggled"
                        StyleClass="box-value"
-                        HorizontalOptions="End"
-                        AutomationId="MasterPasswordRepromptToggle" />
+                        HorizontalOptions="End" />
                </StackLayout>
                <BoxView StyleClass="box-row-separator" />
            </StackLayout>
@@ -792,10 +652,7 @@
                        AutoSize="TextChanges"
                        StyleClass="box-value"
                        effects:ScrollEnabledEffect.IsScrollEnabled="false"
-                        Text="{Binding Cipher.Notes}"
-                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n Notes}"
-                        AutomationId="ItemNotesEntry">
+                        Text="{Binding Cipher.Notes}">
                        <Editor.Behaviors>
                            <behaviors:EditorPreventAutoBottomScrollingOnFocusedBehavior ParentScrollView="{x:Reference _scrollView}" />
                        </Editor.Behaviors>
@@ -814,11 +671,9 @@
                <StackLayout
                    Spacing="0"
                    BindableLayout.ItemsSource="{Binding Fields}"
-                    BindableLayout.ItemTemplateSelector="{StaticResource CustomFieldItemTemplateSelector}"
-                    AutomationId="CustomFieldsList" />
+                    BindableLayout.ItemTemplateSelector="{StaticResource CustomFieldItemTemplateSelector}" />
                <Button Text="{u:I18n NewCustomField}" StyleClass="box-button-row"
-                        Clicked="NewField_Clicked"
-                        AutomationId="NewCustomFieldButton"></Button>
+                        Clicked="NewField_Clicked"></Button>
            </StackLayout>
            <StackLayout StyleClass="box" IsVisible="{Binding ShowOwnershipOptions}">
                <StackLayout StyleClass="box-row-header">
@@ -833,8 +688,7 @@
                        x:Name="_ownershipPicker"
                        ItemsSource="{Binding OwnershipOptions, Mode=OneTime}"
                        SelectedIndex="{Binding OwnershipSelectedIndex}"
-                        StyleClass="box-value"
-                        AutomationId="ItemOwnershipPicker" />
+                        StyleClass="box-value" />
                </StackLayout>
            </StackLayout>
            <StackLayout StyleClass="box" IsVisible="{Binding ShowCollections}">
@@ -845,8 +699,7 @@
                <StackLayout Spacing="0" Padding="0"
                                IsVisible="{Binding HasCollections, Converter={StaticResource inverseBool}}">
                    <StackLayout StyleClass="box-row, box-row-switch">
-                        <Label Text="{u:I18n NoCollectionsToList}"
-                               AutomationId="NoCollectionsToListLabel" />
+                        <Label Text="{u:I18n NoCollectionsToList}" />
                    </StackLayout>
                    <BoxView StyleClass="box-row-separator" />
                </StackLayout>
@@ -856,17 +709,15 @@
                    <controls:RepeaterView.ItemTemplate>
                        <DataTemplate x:DataType="pages:CollectionViewModel">
                            <StackLayout Spacing="0" Padding="0">
-                                <StackLayout StyleClass="box-row, box-row-switch" AutomationId="CollectionItemCell">
+                                <StackLayout StyleClass="box-row, box-row-switch">
                                    <Label
                                        Text="{Binding Collection.Name}"
                                        StyleClass="box-label-regular"
-                                        HorizontalOptions="StartAndExpand"
-                                        AutomationId="CollectionItemNameLabel" />
+                                        HorizontalOptions="StartAndExpand" />
                                    <Switch
                                        IsToggled="{Binding Checked}"
                                        StyleClass="box-value"
-                                        HorizontalOptions="End"
-                                        AutomationId="CollectionItemSwitch" />
+                                        HorizontalOptions="End" />
                                </StackLayout>
                                <BoxView StyleClass="box-row-separator" />
                            </StackLayout>
@@ -876,4 +727,5 @@
            </StackLayout>
        </StackLayout>
    </ScrollView>
+
 </pages:BaseContentPage>
--- a/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
@@ -88,6 +88,7 @@ namespace Bit.App.Pages
            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
            _accountsManager = ServiceContainer.Resolve<IAccountsManager>();

+
            GeneratePasswordCommand = new Command(GeneratePassword);
            TogglePasswordCommand = new Command(TogglePassword);
            ToggleCardNumberCommand = new Command(ToggleCardNumber);
@@ -296,7 +297,6 @@ namespace Bit.App.Pages
        public bool IsIdentity => Cipher?.Type == CipherType.Identity;
        public bool IsCard => Cipher?.Type == CipherType.Card;
        public bool IsSecureNote => Cipher?.Type == CipherType.SecureNote;
-        public bool IsFido2Key => Cipher?.Type == CipherType.Fido2Key;
        public bool ShowUris => IsLogin && Cipher.Login.HasUris;
        public bool ShowAttachments => Cipher.HasAttachments;
        public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
@@ -309,7 +309,6 @@ namespace Bit.App.Pages
        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
        public bool HasTotpValue => IsLogin && !string.IsNullOrEmpty(Cipher?.Login?.Totp);
        public string SetupTotpText => $"{BitwardenIcons.Camera} {AppResources.SetupTotp}";
-        public bool ShowPasskeyInfo => Cipher?.Login?.Fido2Key != null && !CloneMode;

        public void Init()
        {
@@ -368,11 +367,6 @@ namespace Bit.App.Pages
                        {
                            Cipher.OrganizationId = OrganizationId;
                        }
-                        if (Cipher.Type == CipherType.Login)
-                        {
-                            // passkeys can't be cloned
-                            Cipher.Login.Fido2Key = null;
-                        }
                    }
                    if (appOptions?.OtpData != null && Cipher.Type == CipherType.Login)
                    {
--- a/src/App/Pages/Vault/CipherDetailsPage.xaml
+++ b/src/App/Pages/Vault/CipherDetailsPage.xaml
@@ -45,20 +45,20 @@
                         x:Name="_attachmentsItem" x:Key="attachmentsItem" />
            <ToolbarItem Text="{u:I18n Delete}" Clicked="Delete_Clicked" Order="Secondary" IsDestructive="True"
                         x:Name="_deleteItem" x:Key="deleteItem" />
-            <ToolbarItem Text="{u:I18n Clone}" Command="{Binding CloneCommand}" Order="Secondary"
+            <ToolbarItem Text="{u:I18n Clone}" Clicked="Clone_Clicked" Order="Secondary"
                         x:Name="_cloneItem" x:Key="cloneItem" />

            <DataTemplate x:Key="TextCustomFieldDataTemplate">
-                <il:TextCustomFieldItemLayout AutomationId="TextCustomFieldItem" />
+                <il:TextCustomFieldItemLayout />
            </DataTemplate>
            <DataTemplate x:Key="BooleanCustomFieldDataTemplate">
-                <il:BooleanCustomFieldItemLayout AutomationId="BooleanCustomFieldItem" />
+                <il:BooleanCustomFieldItemLayout />
            </DataTemplate>
            <DataTemplate x:Key="HiddenCustomFieldDataTemplate">
-                <il:HiddenCustomFieldItemLayout AutomationId="HiddenCustomFieldItem" />
+                <il:HiddenCustomFieldItemLayout />
            </DataTemplate>
            <DataTemplate x:Key="LinkedCustomFieldDataTemplate">
-                <il:LinkedCustomFieldItemLayout AutomationId="LinkedCustomFieldItem" />
+                <il:LinkedCustomFieldItemLayout />
            </DataTemplate>

            <dts:CustomFieldItemTemplateSelector x:Key="CustomFieldItemTemplateSelector"
@@ -69,26 +69,23 @@

            <ScrollView x:Key="scrollView" x:Name="_scrollView">
                <StackLayout Spacing="20" x:Name="_mainLayout">
-                    <StackLayout StyleClass="box" AutomationId="ItemInformationSection">
+                    <StackLayout StyleClass="box">
                        <StackLayout StyleClass="box-row-header">
                            <Label Text="{u:I18n ItemInformation, Header=True}"
                                   StyleClass="box-header, box-header-platform" />
                        </StackLayout>
-                        <StackLayout StyleClass="box-row" AutomationId="ItemRow">
+                        <StackLayout StyleClass="box-row">
                            <Label
                                Text="{u:I18n Name}"
-                                StyleClass="box-label"
-                                AutomationId="ItemName" />
+                                StyleClass="box-label" />
                            <Label
                                Text="{Binding Cipher.Name, Mode=OneWay}"
-                                StyleClass="box-value"
-                                AutomationId="ItemValue" />
+                                StyleClass="box-value" />
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                        <StackLayout IsVisible="{Binding IsLogin}" Spacing="0" Padding="0">
                            <Grid StyleClass="box-row"
-                                  IsVisible="{Binding Cipher.Login.Username, Converter={StaticResource stringHasValue}}"
-                                  AutomationId="ItemRow">
+                                  IsVisible="{Binding Cipher.Login.Username, Converter={StaticResource stringHasValue}}">
                                <Grid.RowDefinitions>
                                    <RowDefinition Height="Auto" />
                                    <RowDefinition Height="*" />
@@ -101,14 +98,12 @@
                                    Text="{u:I18n Username}"
                                    StyleClass="box-label"
                                    Grid.Row="0"
-                                    Grid.Column="0"
-                                    AutomationId="ItemName" />
+                                    Grid.Column="0" />
                                <Label
                                    Text="{Binding Cipher.Login.Username, Mode=OneWay}"
                                    StyleClass="box-value"
                                    Grid.Row="1"
-                                    Grid.Column="0"
-                                    AutomationId="ItemValue" />
+                                    Grid.Column="0" />
                                <controls:IconButton
                                    StyleClass="box-row-button, box-row-button-platform"
                                    Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -118,14 +113,12 @@
                                    Grid.Column="1"
                                    Grid.RowSpan="2"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopyUsername}"
-                                    AutomationId="CopyValueButton" />
+                                    AutomationProperties.Name="{u:I18n CopyUsername}" />
                            </Grid>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Login.Username, Converter={StaticResource stringHasValue}}" />
                            <Grid StyleClass="box-row"
-                                  IsVisible="{Binding Cipher.Login.Password, Converter={StaticResource stringHasValue}}"
-                                  AutomationId="ItemRow">
+                                  IsVisible="{Binding Cipher.Login.Password, Converter={StaticResource stringHasValue}}">
                                <Grid.RowDefinitions>
                                    <RowDefinition Height="Auto" />
                                    <RowDefinition Height="*" />
@@ -140,23 +133,20 @@
                                    Text="{u:I18n Password}"
                                    StyleClass="box-label"
                                    Grid.Row="0"
-                                    Grid.Column="0"
-                                    AutomationId="ItemName" />
+                                    Grid.Column="0" />
                                <controls:MonoLabel
                                    Text="{Binding Cipher.Login.MaskedPassword, Mode=OneWay}"
                                    StyleClass="box-value"
                                    Grid.Row="1"
                                    Grid.Column="0"
-                                    IsVisible="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                                    AutomationId="ItemValue" />
+                                    IsVisible="{Binding ShowPassword, Converter={StaticResource inverseBool}}" />
                                <controls:MonoLabel
                                    Text="{Binding ColoredPassword, Mode=OneWay}"
                                    StyleClass="box-value, text-html"
                                    Grid.Row="1"
                                    Grid.Column="0"
                                    LineBreakMode="CharacterWrap"
-                                    IsVisible="{Binding ShowPassword}"
-                                    AutomationId="ItemValue" />
+                                    IsVisible="{Binding ShowPassword}" />
                                <controls:IconButton
                                    StyleClass="box-row-button, box-row-button-platform"
                                    Text="{Binding Source={x:Static core:BitwardenIcons.CheckCircle}}"
@@ -166,8 +156,7 @@
                                    Grid.RowSpan="2"
                                    AutomationProperties.IsInAccessibleTree="True"
                                    AutomationProperties.Name="{u:I18n CheckPassword}"
-                                    IsVisible="{Binding Cipher.ViewPassword}"
-                                    AutomationId="CheckPasswordButton" />
+                                    IsVisible="{Binding Cipher.ViewPassword}" />
                                <controls:IconButton
                                    StyleClass="box-row-button, box-row-button-platform"
                                    Text="{Binding ShowPasswordIcon}"
@@ -178,8 +167,7 @@
                                    AutomationProperties.IsInAccessibleTree="True"
                                    AutomationProperties.Name="{u:I18n ToggleVisibility}"
                                    AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                    IsVisible="{Binding Cipher.ViewPassword}"
-                                    AutomationId="ShowValueButton" />
+                                    IsVisible="{Binding Cipher.ViewPassword}" />
                                <controls:IconButton
                                    StyleClass="box-row-button, box-row-button-platform"
                                    Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -190,24 +178,11 @@
                                    Grid.RowSpan="2"
                                    AutomationProperties.IsInAccessibleTree="True"
                                    AutomationProperties.Name="{u:I18n CopyPassword}"
-                                    IsVisible="{Binding Cipher.ViewPassword}"
-                                    AutomationId="CopyValueButton" />
+                                    IsVisible="{Binding Cipher.ViewPassword}" />
                            </Grid>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Login.Password, Converter={StaticResource stringHasValue}}" />
-                            <Label
-                                Text="{u:I18n Passkey}"
-                                StyleClass="box-label"
-                                Margin="0,10,0,0"
-                                IsVisible="{Binding Cipher.Login.Fido2Key, Converter={StaticResource notNull}}"/>
-                            <Entry
-                                Text="{u:I18n AvailableForTwoStepLogin}"
-                                IsEnabled="False"
-                                StyleClass="box-value,text-muted"
-                                IsVisible="{Binding Cipher.Login.Fido2Key, Converter={StaticResource notNull}}" />
-                            <Grid StyleClass="box-row"
-                                  IsVisible="{Binding ShowTotp}"
-                                  AutomationId="ItemRow">
+                            <Grid StyleClass="box-row" IsVisible="{Binding ShowTotp}">
                                <Grid.RowDefinitions>
                                    <RowDefinition Height="Auto" />
                                    <RowDefinition Height="*" />
@@ -222,8 +197,7 @@
                                    Text="{u:I18n VerificationCodeTotp}"
                                    StyleClass="box-label"
                                    Grid.Row="0"
-                                    Grid.Column="0"
-                                    AutomationId="ItemName" />
+                                    Grid.Column="0" />
                                <controls:MonoLabel
                                    Text="{Binding TotpCodeFormatted, Mode=OneWay}"
                                    IsVisible="{Binding ShowUpgradePremiumTotpText, Converter={StaticResource inverseBool}}"
@@ -231,16 +205,14 @@
                                    Grid.Row="1"
                                    Grid.Column="0"
                                    VerticalTextAlignment="Start"
-                                    VerticalOptions="Start"
-                                    AutomationId="ItemValue" />
+                                    VerticalOptions="Start" />
                                <controls:CircularProgressbarView
                                    Progress="{Binding TotpProgress}"
                                    Grid.Row="0"
                                    Grid.Column="1"
                                    Grid.RowSpan="2"
                                    HorizontalOptions="FillAndExpand"
-                                    VerticalOptions="FillAndExpand"
-                                    AutomationId="LoginTotpProgressBar" />
+                                    VerticalOptions="FillAndExpand" />
                                <Label
                                    Text="{Binding TotpSec, Mode=OneWay}"
                                    Style="{DynamicResource textTotp}"
@@ -262,8 +234,7 @@
                                    Grid.Column="2"
                                    Grid.RowSpan="2"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopyTotp}"
-                                    AutomationId="CopyValueButton" />
+                                    AutomationProperties.Name="{u:I18n CopyTotp}" />
                                <Label
                                    Text="{u:I18n PremiumSubscriptionRequired}"
                                    StyleClass="box-footer-label"
@@ -271,29 +242,24 @@
                                    Margin="0,5,0,2"
                                    Grid.Column="0"
                                    Grid.Row="1"
-                                    HorizontalOptions="FillAndExpand"
-                                    AutomationId="ShowUpgradePremiumTotpLabel" />
+                                    HorizontalOptions="FillAndExpand" />
                            </Grid>
                            <BoxView StyleClass="box-row-separator" IsVisible="{Binding ShowTotp}" />
                        </StackLayout>
                        <StackLayout IsVisible="{Binding IsCard}" Spacing="0" Padding="0">
                            <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Card.CardholderName, Converter={StaticResource stringHasValue}}"
-                                         AutomationId="ItemRow">
+                                         IsVisible="{Binding Cipher.Card.CardholderName, Converter={StaticResource stringHasValue}}">
                                <Label
                                    Text="{u:I18n CardholderName}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Card.CardholderName, Mode=OneWay}"
-                                    StyleClass="box-value"
-                                    AutomationId="ItemValue" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Card.CardholderName, Converter={StaticResource stringHasValue}}" />
                            <Grid StyleClass="box-row"
-                                  IsVisible="{Binding Cipher.Card.Number, Converter={StaticResource stringHasValue}}"
-                                  AutomationId="ItemRow">
+                                  IsVisible="{Binding Cipher.Card.Number, Converter={StaticResource stringHasValue}}">
                                <Grid.RowDefinitions>
                                    <RowDefinition Height="Auto" />
                                    <RowDefinition Height="*" />
@@ -307,22 +273,19 @@
                                    Text="{u:I18n Number}"
                                    StyleClass="box-label"
                                    Grid.Row="0"
-                                    Grid.Column="0"
-                                    AutomationId="ItemName" />
+                                    Grid.Column="0" />
                                <controls:MonoLabel
                                    Text="{Binding Cipher.Card.MaskedNumber, Mode=OneWay}"
                                    StyleClass="box-value"
                                    Grid.Row="1"
                                    Grid.Column="0"
-                                    IsVisible="{Binding ShowCardNumber, Converter={StaticResource inverseBool}}"
-                                    AutomationId="ItemValue" />
+                                    IsVisible="{Binding ShowCardNumber, Converter={StaticResource inverseBool}}" />
                                <controls:MonoLabel
                                    Text="{Binding Cipher.Card.Number, Mode=OneWay}"
                                    StyleClass="box-value"
                                    Grid.Row="1"
                                    Grid.Column="0"
-                                    IsVisible="{Binding ShowCardNumber}"
-                                    AutomationId="ItemValue" />
+                                    IsVisible="{Binding ShowCardNumber}" />
                                <controls:IconButton
                                    StyleClass="box-row-button, box-row-button-platform"
                                    Text="{Binding ShowCardNumberIcon}"
@@ -331,8 +294,7 @@
                                    Grid.Column="1"
                                    Grid.RowSpan="2"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                                    AutomationId="ShowValueButton" />
+                                    AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                                <controls:IconButton
                                    StyleClass="box-row-button, box-row-button-platform"
                                    Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -342,42 +304,34 @@
                                    Grid.Column="2"
                                    Grid.RowSpan="2"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopyNumber}"
-                                    AutomationId="CopyValueButton" />
+                                    AutomationProperties.Name="{u:I18n CopyNumber}" />
                            </Grid>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Card.Number, Converter={StaticResource stringHasValue}}" />
                            <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Card.Brand, Converter={StaticResource stringHasValue}}"
-                                         AutomationId="ItemRow">
+                                         IsVisible="{Binding Cipher.Card.Brand, Converter={StaticResource stringHasValue}}">
                                <Label
                                    Text="{u:I18n Brand}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Card.Brand, Mode=OneWay}"
-                                    StyleClass="box-value"
-                                    AutomationId="ItemValue" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Card.Brand, Converter={StaticResource stringHasValue}}" />
                            <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Card.Expiration, Converter={StaticResource stringHasValue}}"
-                                         AutomationId="ItemRow">
+                                         IsVisible="{Binding Cipher.Card.Expiration, Converter={StaticResource stringHasValue}}">
                                <Label
                                    Text="{u:I18n Expiration}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Card.Expiration, Mode=OneWay}"
-                                    StyleClass="box-value"
-                                    AutomationId="ItemValue" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Card.Expiration, Converter={StaticResource stringHasValue}}" />
                            <Grid StyleClass="box-row"
-                                  IsVisible="{Binding Cipher.Card.Code, Converter={StaticResource stringHasValue}}"
-                                  AutomationId="ItemRow">
+                                  IsVisible="{Binding Cipher.Card.Code, Converter={StaticResource stringHasValue}}">
                                <Grid.RowDefinitions>
                                    <RowDefinition Height="Auto" />
                                    <RowDefinition Height="*" />
@@ -391,22 +345,19 @@
                                    Text="{u:I18n SecurityCode}"
                                    StyleClass="box-label"
                                    Grid.Row="0"
-                                    Grid.Column="0"
-                                    AutomationId="ItemName" />
+                                    Grid.Column="0" />
                                <controls:MonoLabel
                                    Text="{Binding Cipher.Card.MaskedCode, Mode=OneWay}"
                                    StyleClass="box-value"
                                    Grid.Row="1"
                                    Grid.Column="0"
-                                    IsVisible="{Binding ShowCardCode, Converter={StaticResource inverseBool}}"
-                                    AutomationId="ItemValue" />
+                                    IsVisible="{Binding ShowCardCode, Converter={StaticResource inverseBool}}" />
                                <controls:MonoLabel
                                    Text="{Binding Cipher.Card.Code, Mode=OneWay}"
                                    StyleClass="box-value"
                                    Grid.Row="1"
                                    Grid.Column="0"
-                                    IsVisible="{Binding ShowCardCode}"
-                                    AutomationId="ItemValue" />
+                                    IsVisible="{Binding ShowCardCode}" />
                                <controls:IconButton
                                    StyleClass="box-row-button, box-row-button-platform"
                                    Text="{Binding ShowCardCodeIcon}"
@@ -415,8 +366,7 @@
                                    Grid.Column="1"
                                    Grid.RowSpan="2"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                                    AutomationId="ShowValueButton" />
+                                    AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                                <controls:IconButton
                                    StyleClass="box-row-button, box-row-button-platform"
                                    Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -426,228 +376,138 @@
                                    Grid.Column="2"
                                    Grid.RowSpan="2"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopySecurityCode}"
-                                    AutomationId="CopyValueButton" />
+                                    AutomationProperties.Name="{u:I18n CopySecurityCode}" />
                            </Grid>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Card.Code, Converter={StaticResource stringHasValue}}" />
                        </StackLayout>
                        <StackLayout IsVisible="{Binding IsIdentity}" Spacing="0" Padding="0">
                            <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.FullName, Converter={StaticResource stringHasValue}}"
-                                         AutomationId="ItemRow">
+                                         IsVisible="{Binding Cipher.Identity.FullName, Converter={StaticResource stringHasValue}}">
                                <Label
                                    Text="{u:I18n IdentityName}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Identity.FullName, Mode=OneWay}"
-                                    StyleClass="box-value"
-                                    AutomationId="ItemValue" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Identity.FullName, Converter={StaticResource stringHasValue}}" />
                            <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.Username, Converter={StaticResource stringHasValue}}"
-                                         AutomationId="ItemRow">
+                                         IsVisible="{Binding Cipher.Identity.Username, Converter={StaticResource stringHasValue}}">
                                <Label
                                    Text="{u:I18n Username}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Identity.Username, Mode=OneWay}"
-                                    StyleClass="box-value"
-                                    AutomationId="ItemValue" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Identity.Username, Converter={StaticResource stringHasValue}}" />
                            <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.Company, Converter={StaticResource stringHasValue}}"
-                                         AutomationId="ItemRow">
+                                         IsVisible="{Binding Cipher.Identity.Company, Converter={StaticResource stringHasValue}}">
                                <Label
                                    Text="{u:I18n Company}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Identity.Company, Mode=OneWay}"
-                                    StyleClass="box-value"
-                                    AutomationId="ItemValue" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Identity.Company, Converter={StaticResource stringHasValue}}" />
                            <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.SSN, Converter={StaticResource stringHasValue}}"
-                                         AutomationId="ItemRow">
+                                         IsVisible="{Binding Cipher.Identity.SSN, Converter={StaticResource stringHasValue}}">
                                <Label
                                    Text="{u:I18n SSN}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Identity.SSN, Mode=OneWay}"
-                                    StyleClass="box-value"
-                                    AutomationId="ItemValue" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Identity.SSN, Converter={StaticResource stringHasValue}}" />
                            <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.PassportNumber, Converter={StaticResource stringHasValue}}"
-                                         AutomationId="ItemRow">
+                                         IsVisible="{Binding Cipher.Identity.PassportNumber, Converter={StaticResource stringHasValue}}">
                                <Label
                                    Text="{u:I18n PassportNumber}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Identity.PassportNumber, Mode=OneWay}"
-                                    StyleClass="box-value"
-                                    AutomationId="ItemValue" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Identity.PassportNumber, Converter={StaticResource stringHasValue}}" />
                            <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.LicenseNumber, Converter={StaticResource stringHasValue}}"
-                                         AutomationId="ItemRow">
+                                         IsVisible="{Binding Cipher.Identity.LicenseNumber, Converter={StaticResource stringHasValue}}">
                                <Label
                                    Text="{u:I18n LicenseNumber}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Identity.LicenseNumber, Mode=OneWay}"
-                                    StyleClass="box-value"
-                                    AutomationId="ItemValue" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Identity.LicenseNumber, Converter={StaticResource stringHasValue}}" />
                            <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.Email, Converter={StaticResource stringHasValue}}"
-                                         AutomationId="ItemRow">
+                                         IsVisible="{Binding Cipher.Identity.Email, Converter={StaticResource stringHasValue}}">
                                <Label
                                    Text="{u:I18n Email}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Identity.Email, Mode=OneWay}"
-                                    StyleClass="box-value"
-                                    AutomationId="ItemValue" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Identity.Email, Converter={StaticResource stringHasValue}}" />
                            <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.Phone, Converter={StaticResource stringHasValue}}"
-                                         AutomationId="ItemRow" >
+                                         IsVisible="{Binding Cipher.Identity.Phone, Converter={StaticResource stringHasValue}}">
                                <Label
                                    Text="{u:I18n Phone}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Identity.Phone, Mode=OneWay}"
-                                    StyleClass="box-value"
-                                    AutomationId="ItemValue" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator"
                                     IsVisible="{Binding Cipher.Identity.Phone, Converter={StaticResource stringHasValue}}" />
-                            <StackLayout StyleClass="box-row" IsVisible="{Binding ShowIdentityAddress}"
-                                         AutomationId="ItemRow">
+                            <StackLayout StyleClass="box-row" IsVisible="{Binding ShowIdentityAddress}">
                                <Label
                                    Text="{u:I18n Address}"
-                                    StyleClass="box-label"
-                                    AutomationId="ItemName" />
+                                    StyleClass="box-label" />
                                <Label
                                    Text="{Binding Cipher.Identity.Address1, Mode=OneWay}"
                                    IsVisible="{Binding Cipher.Identity.Address1, Converter={StaticResource stringHasValue}}"
-                                    StyleClass="box-value"
-                                    AutomationId="IdentityAddressOneLabel" />
+                                    StyleClass="box-value" />
                                <Label
                                    Text="{Binding Cipher.Identity.Address2, Mode=OneWay}"
                                    IsVisible="{Binding Cipher.Identity.Address2, Converter={StaticResource stringHasValue}}"
-                                    StyleClass="box-value"
-                                    AutomationId="IdentityAddressTwoLabel" />
+                                    StyleClass="box-value" />
                                <Label
                                    Text="{Binding Cipher.Identity.Address3, Mode=OneWay}"
                                    IsVisible="{Binding Cipher.Identity.Address3, Converter={StaticResource stringHasValue}}"
-                                    StyleClass="box-value"
-                                    AutomationId="IdentityAddressThreeLabel" />
+                                    StyleClass="box-value" />
                                <Label
                                    Text="{Binding Cipher.Identity.FullAddressPart2, Mode=OneWay}"
                                    IsVisible="{Binding Cipher.Identity.FullAddressPart2, Converter={StaticResource stringHasValue}}"
-                                    StyleClass="box-value"
-                                    AutomationId="IdentityFullAddressPartTwoLabel" />
+                                    StyleClass="box-value" />
                                <Label
                                    Text="{Binding Cipher.Identity.Country, Mode=OneWay}"
                                    IsVisible="{Binding Cipher.Identity.Country, Converter={StaticResource stringHasValue}}"
-                                    StyleClass="box-value"
-                                    AutomationId="IdentityCountryLabel" />
+                                    StyleClass="box-value" />
                            </StackLayout>
                            <BoxView StyleClass="box-row-separator" IsVisible="{Binding ShowIdentityAddress}" />
                        </StackLayout>
-                        <StackLayout
-                            IsVisible="{Binding IsFido2Key}"
-                            Spacing="0"
-                            Padding="0"
-                            Margin="0,10,0,0">
-                            <Label
-                                Text="{u:I18n Username}"
-                                StyleClass="box-label" />
-                            <Label
-                                Text="{Binding Cipher.Fido2Key.UserName, Mode=OneWay}"
-                                StyleClass="box-value" />
-                            <BoxView StyleClass="box-row-separator" Margin="0,10,0,0" />
-                            <Label
-                                Text="{u:I18n Passkey}"
-                                StyleClass="box-label"
-                                Margin="0,10,0,0" />
-                            <Label
-                                Text="{Binding CreationDate, Mode=OneWay}"
-                                StyleClass="box-value" />
-                            <BoxView StyleClass="box-row-separator" Margin="0,10,0,0" />
-                            <Grid
-                                StyleClass="box-row"
-                                RowDefinitions="Auto,*,Auto"
-                                ColumnDefinitions="*,Auto,Auto">
-                                <Label
-                                    Text="{u:I18n Application}"
-                                    StyleClass="box-label" />
-                                <Label
-                                    Grid.Row="1"
-                                    Text="{Binding Cipher.Fido2Key.LaunchUri, Mode=OneWay}"
-                                    StyleClass="box-value" />
-                                <controls:IconButton
-                                    StyleClass="box-row-button, box-row-button-platform"
-                                    Text="{Binding Source={x:Static core:BitwardenIcons.ShareSquare}}"
-                                    Command="{Binding LaunchUriCommand}"
-                                    CommandParameter="{Binding Cipher.Fido2Key}"
-                                    Grid.Column="1"
-                                    Grid.RowSpan="2"
-                                    VerticalOptions="End"
-                                    IsVisible="{Binding Cipher.Fido2Key.CanLaunch, Mode=OneWay}"
-                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n Launch}" />
-                                <controls:IconButton
-                                    StyleClass="box-row-button, box-row-button-platform"
-                                    Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-                                    Command="{Binding CopyCommand}"
-                                    CommandParameter="Fido2KeyApplication"
-                                    Grid.Column="2"
-                                    Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopyApplication}" />
-                                <BoxView
-                                    StyleClass="box-row-separator"
-                                    Margin="0,3,0,0"
-                                    Grid.Row="2"
-                                    Grid.ColumnSpan="3" />
-                            </Grid>
-                        </StackLayout>
                    </StackLayout>
                    <StackLayout StyleClass="box" IsVisible="{Binding ShowUris}">
                        <StackLayout StyleClass="box-row-header">
                            <Label Text="{u:I18n URIs, Header=True}"
                                   StyleClass="box-header, box-header-platform" />
                        </StackLayout>
-                        <controls:RepeaterView ItemsSource="{Binding Cipher.Login.Uris}" AutomationId="CipherUriContainer">
+                        <controls:RepeaterView ItemsSource="{Binding Cipher.Login.Uris}">
                            <controls:RepeaterView.ItemTemplate>
                                <DataTemplate x:DataType="views:LoginUriView">
                                    <StackLayout Spacing="0" Padding="0">
-                                        <Grid StyleClass="box-row" AutomationId="UriRow">
+                                        <Grid StyleClass="box-row">
                                            <Grid.RowDefinitions>
                                                <RowDefinition Height="Auto" />
                                                <RowDefinition Height="*" />
@@ -673,8 +533,7 @@
                                                Text="{Binding HostOrUri, Mode=OneWay}"
                                                StyleClass="box-value"
                                                Grid.Row="1"
-                                                Grid.Column="0"
-                                                AutomationId="UriValue" />
+                                                Grid.Column="0" />
                                            <controls:IconButton
                                                StyleClass="box-row-button, box-row-button-platform"
                                                Text="{Binding Source={x:Static core:BitwardenIcons.ShareSquare}}"
@@ -685,8 +544,7 @@
                                                Grid.RowSpan="2"
                                                IsVisible="{Binding CanLaunch, Mode=OneWay}"
                                                AutomationProperties.IsInAccessibleTree="True"
-                                                AutomationProperties.Name="{u:I18n Launch}"
-                                                AutomationId="LaunchUriButton" />
+                                                AutomationProperties.Name="{u:I18n Launch}" />
                                            <controls:IconButton
                                                StyleClass="box-row-button, box-row-button-platform"
                                                Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -696,8 +554,7 @@
                                                Grid.Column="2"
                                                Grid.RowSpan="2"
                                                AutomationProperties.IsInAccessibleTree="True"
-                                                AutomationProperties.Name="{u:I18n Copy}"
-                                                AutomationId="CopyUriButton" />
+                                                AutomationProperties.Name="{u:I18n Copy}" />
                                        </Grid>
                                        <BoxView StyleClass="box-row-separator" />
                                    </StackLayout>
@@ -711,15 +568,14 @@
                            <Label Text="{u:I18n Notes, Header=True}"
                                   StyleClass="box-header, box-header-platform" />
                        </StackLayout>
-                        <StackLayout StyleClass="box-row" AutomationId="NotesRow">
+                        <StackLayout StyleClass="box-row">
                            <controls:SelectableLabel
                                Text="{Binding Cipher.Notes, Mode=OneWay}"
-                                StyleClass="box-value"
-                                AutomationId="CipherNotesLabel" />
+                                StyleClass="box-value" />
                        </StackLayout>
                        <BoxView StyleClass="box-row-separator" />
                    </StackLayout>
-                    <StackLayout StyleClass="box" IsVisible="{Binding Cipher.HasFields}" AutomationId="CustomFieldsContainer">
+                    <StackLayout StyleClass="box" IsVisible="{Binding Cipher.HasFields}">
                        <StackLayout StyleClass="box-row-header">
                            <Label Text="{u:I18n CustomFields, Header=True}"
                                   StyleClass="box-header, box-header-platform" />
@@ -734,23 +590,21 @@
                            <Label Text="{u:I18n Attachments, Header=True}"
                                   StyleClass="box-header, box-header-platform" />
                        </StackLayout>
-                        <controls:RepeaterView ItemsSource="{Binding Cipher.Attachments}" AutomationId="CipherAttachmentsContainer">
+                        <controls:RepeaterView ItemsSource="{Binding Cipher.Attachments}">
                            <controls:RepeaterView.ItemTemplate>
                                <DataTemplate x:DataType="views:AttachmentView">
                                    <StackLayout Spacing="0" Padding="0">
-                                        <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10" AutomationId="CipherAttachment">
+                                        <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10">
                                            <Label
                                                Text="{Binding FileName, Mode=OneWay}"
                                                StyleClass="box-value"
                                                VerticalTextAlignment="Center"
-                                                HorizontalOptions="StartAndExpand"
-                                                AutomationId="CipherAttachmentFileNameLabel" />
+                                                HorizontalOptions="StartAndExpand" />
                                            <Label
                                                Text="{Binding SizeName, Mode=OneWay}"
                                                StyleClass="box-sub-label"
                                                HorizontalTextAlignment="End"
-                                                VerticalTextAlignment="Center"
-                                                AutomationId="CipherAttachmentFileSizeLabel" />
+                                                VerticalTextAlignment="Center" />
                                            <controls:IconButton
                                                StyleClass="box-row-button, box-row-button-platform"
                                                Text="{Binding Source={x:Static core:BitwardenIcons.Download}}"
@@ -758,8 +612,7 @@
                                                CommandParameter="{Binding .}"
                                                VerticalOptions="Center"
                                                AutomationProperties.IsInAccessibleTree="True"
-                                                AutomationProperties.Name="{u:I18n Download}"
-                                                AutomationId="CipherAttachmentDownloadButton" />
+                                                AutomationProperties.Name="{u:I18n Download}" />
                                        </StackLayout>
                                        <BoxView StyleClass="box-row-separator" />
                                    </StackLayout>
@@ -769,20 +622,17 @@
                    </StackLayout>
                    <StackLayout StyleClass="box-bottom">
                        <Label FormattedText="{Binding UpdatedText}"
-                               StyleClass="box-footer-label"
-                               AutomationId="CipherUpdatedDateLabel" />
+                               StyleClass="box-footer-label" />
                        <Label FormattedText="{Binding PasswordUpdatedText}"
                               StyleClass="box-footer-label"
-                               IsVisible="{Binding Cipher.PasswordRevisionDisplayDate, Converter={StaticResource notNull}}"
-                               AutomationId="CipherUpdatedPasswordDateLabel">
+                               IsVisible="{Binding Cipher.PasswordRevisionDisplayDate, Converter={StaticResource notNull}}">
                            <Label.GestureRecognizers>
                                <TapGestureRecognizer Tapped="PasswordHistory_Tapped" />
                            </Label.GestureRecognizers>
                        </Label>
                        <Label FormattedText="{Binding PasswordHistoryText}"
                               StyleClass="box-footer-label"
-                               IsVisible="{Binding Cipher.HasPasswordHistory}"
-                               AutomationId="CipherPasswordHistoryLabel">
+                               IsVisible="{Binding Cipher.HasPasswordHistory}">
                            <Label.GestureRecognizers>
                                <TapGestureRecognizer Tapped="PasswordHistory_Tapped" />
                            </Label.GestureRecognizers>
@@ -812,7 +662,6 @@
            AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
            AutomationProperties.IsInAccessibleTree="True"
            AutomationProperties.Name="{u:I18n EditItem}"
-            AutomationId="CipherEditButton"
            IsVisible="{Binding CanEdit}">
            <Button.Effects>
                <effects:FabShadowEffect />
--- a/src/App/Pages/Vault/CipherDetailsPage.xaml.cs
+++ b/src/App/Pages/Vault/CipherDetailsPage.xaml.cs
@@ -204,7 +204,20 @@ namespace Bit.App.Pages
            }
        }

-        private async void More_Clicked(object sender, EventArgs e)
+        private async void Clone_Clicked(object sender, System.EventArgs e)
+        {
+            if (DoOnce())
+            {
+                if (!await _vm.PromptPasswordAsync())
+                {
+                    return;
+                }
+                var page = new CipherAddEditPage(_vm.CipherId, cloneMode: true, cipherDetailsPage: this);
+                await Navigation.PushModalAsync(new NavigationPage(page));
+            }
+        }
+
+        private async void More_Clicked(object sender, System.EventArgs e)
        {
            if (!DoOnce())
            {
@@ -214,11 +227,7 @@ namespace Bit.App.Pages
            var options = new List<string> { AppResources.Attachments };
            if (_vm.Cipher.OrganizationId == null)
            {
-                if (_vm.CanClone)
-                {
-                    options.Add(AppResources.Clone);
-                }
-
+                options.Add(AppResources.Clone);
                options.Add(AppResources.MoveToOrganization);
            }
            else
@@ -258,7 +267,8 @@ namespace Bit.App.Pages
            }
            else if (selection == AppResources.Clone)
            {
-                _vm.CloneCommand.Execute(null);
+                var page = new CipherAddEditPage(_vm.CipherId, cloneMode: true, cipherDetailsPage: this);
+                await Navigation.PushModalAsync(new NavigationPage(page));
            }
        }

@@ -292,13 +302,13 @@ namespace Bit.App.Pages
                {
                    ToolbarItems.Remove(_collectionsItem);
                }
-                if (_vm.CanClone && !ToolbarItems.Contains(_cloneItem))
+                if (!ToolbarItems.Contains(_cloneItem))
                {
                    ToolbarItems.Insert(1, _cloneItem);
                }
                if (!ToolbarItems.Contains(_shareItem))
                {
-                    ToolbarItems.Insert(_vm.CanClone ? 2 : 1, _shareItem);
+                    ToolbarItems.Insert(2, _shareItem);
                }
            }
            else
--- a/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
+++ b/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
@@ -68,8 +68,7 @@ namespace Bit.App.Pages
            CopyCommand = new AsyncCommand<string>((id) => CopyAsync(id, null), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
            CopyUriCommand = new AsyncCommand<LoginUriView>(uriView => CopyAsync("LoginUri", uriView.Uri), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
            CopyFieldCommand = new AsyncCommand<FieldView>(field => CopyAsync(field.Type == FieldType.Hidden ? "H_FieldValue" : "FieldValue", field.Value), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
-            LaunchUriCommand = new Command<ILaunchableView>(LaunchUri);
-            CloneCommand = new AsyncCommand(CloneAsync, onException: ex => HandleException(ex), allowsMultipleExecutions: false);
+            LaunchUriCommand = new Command<LoginUriView>(LaunchUri);
            TogglePasswordCommand = new Command(TogglePassword);
            ToggleCardNumberCommand = new Command(ToggleCardNumber);
            ToggleCardCodeCommand = new Command(ToggleCardCode);
@@ -82,7 +81,6 @@ namespace Bit.App.Pages
        public ICommand CopyUriCommand { get; set; }
        public ICommand CopyFieldCommand { get; set; }
        public Command LaunchUriCommand { get; set; }
-        public ICommand CloneCommand { get; set; }
        public Command TogglePasswordCommand { get; set; }
        public Command ToggleCardNumberCommand { get; set; }
        public Command ToggleCardCodeCommand { get; set; }
@@ -148,7 +146,6 @@ namespace Bit.App.Pages
        public bool IsIdentity => Cipher?.Type == Core.Enums.CipherType.Identity;
        public bool IsCard => Cipher?.Type == Core.Enums.CipherType.Card;
        public bool IsSecureNote => Cipher?.Type == Core.Enums.CipherType.SecureNote;
-        public bool IsFido2Key => Cipher?.Type == Core.Enums.CipherType.Fido2Key;
        public FormattedString ColoredPassword => GeneratedValueFormatter.Format(Cipher.Login.Password);
        public FormattedString UpdatedText
        {
@@ -249,7 +246,6 @@ namespace Bit.App.Pages
        public double TotpProgress => string.IsNullOrEmpty(TotpSec) ? 0 : double.Parse(TotpSec) * 100 / _totpInterval;
        public bool IsDeleted => Cipher.IsDeleted;
        public bool CanEdit => !Cipher.IsDeleted;
-        public bool CanClone => Cipher.IsClonable;

        public async Task<bool> LoadAsync(Action finishedLoadingAction = null)
        {
@@ -649,11 +645,6 @@ namespace Bit.App.Pages
                text = Cipher.Card.Code;
                name = AppResources.SecurityCode;
            }
-            else if (id == "Fido2KeyApplication")
-            {
-                text = Cipher.Fido2Key?.LaunchUri;
-                name = AppResources.Application;
-            }

            if (text != null)
            {
@@ -677,25 +668,14 @@ namespace Bit.App.Pages
            }
        }

-        private void LaunchUri(ILaunchableView launchableView)
+        private void LaunchUri(LoginUriView uri)
        {
-            if (launchableView.CanLaunch && (Page as BaseContentPage).DoOnce())
+            if (uri.CanLaunch && (Page as BaseContentPage).DoOnce())
            {
-                _platformUtilsService.LaunchUri(launchableView.LaunchUri);
+                _platformUtilsService.LaunchUri(uri.LaunchUri);
            }
        }

-        private async Task CloneAsync()
-        {
-            if (!await CanCloneAsync() || !await PromptPasswordAsync())
-            {
-                return;
-            }
-
-            var page = new CipherAddEditPage(CipherId, cloneMode: true, cipherDetailsPage: Page as CipherDetailsPage);
-            await Page.Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
        public async Task<bool> PromptPasswordAsync()
        {
            if (Cipher.Reprompt == CipherRepromptType.None || _passwordReprompted)
@@ -705,21 +685,5 @@ namespace Bit.App.Pages

            return _passwordReprompted = await _passwordRepromptService.ShowPasswordPromptAsync();
        }
-
-        private async Task<bool> CanCloneAsync()
-        {
-            if (Cipher.Type == CipherType.Fido2Key)
-            {
-                await _platformUtilsService.ShowDialogAsync(AppResources.PasskeyWillNotBeCopied);
-                return false;
-            }
-
-            if (Cipher.Type == CipherType.Login && Cipher.Login?.Fido2Key != null)
-            {
-                return await _platformUtilsService.ShowDialogAsync(AppResources.ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem, AppResources.PasskeyWillNotBeCopied, AppResources.Yes, AppResources.No);
-            }
-
-            return true;
-        }
    }
 }
--- a/src/App/Pages/Vault/CipherSelectionPage.xaml
+++ b/src/App/Pages/Vault/CipherSelectionPage.xaml
@@ -16,11 +16,10 @@
            IconImageSource="{Binding AvatarImageSource}"
            Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
            Order="Primary"
-            Priority="-1"
+            Priority="-2"
            UseOriginalImage="True"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}"
-            AutomationId="AccountIconButton" />
+            AutomationProperties.Name="{u:I18n Account}" />
        <ToolbarItem IconImageSource="search.png" Clicked="Search_Clicked"
                     AutomationProperties.IsInAccessibleTree="True"
                     AutomationProperties.Name="{u:I18n Search}" />
--- a/src/App/Pages/Vault/CipherSelectionPage.xaml.cs
+++ b/src/App/Pages/Vault/CipherSelectionPage.xaml.cs
@@ -69,16 +69,14 @@ namespace Bit.App.Pages
                return;
            }

-            try
+            // TODO: There's currently an issue on iOS where the toolbar item is not getting updated
+            // as the others somehow. Removing this so at least we get the circle with ".." instead
+            // of a white circle
+            if (Device.RuntimePlatform != Device.iOS)
            {
-                // don't crash the app if the avatar can't be loaded, just log the ex
                _accountAvatar?.OnAppearing();
                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-            }

            _broadcasterService.Subscribe(nameof(CipherSelectionPage), async (message) =>
            {
--- a/src/App/Pages/Vault/CiphersPage.xaml
+++ b/src/App/Pages/Vault/CiphersPage.xaml
@@ -41,8 +41,7 @@
                    HorizontalOptions="FillAndExpand"
                    TextChanged="SearchBar_TextChanged"
                    SearchButtonPressed="SearchBar_SearchButtonPressed"
-                    Placeholder="{Binding PageTitle}"
-                    AutomationId="SearchBar" />
+                    Placeholder="{Binding PageTitle}" />
            </StackLayout>
            <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform"
                     x:Name="_separator" x:Key="separator" />
@@ -92,8 +91,7 @@
                Source="empty_items_state" />
            <Label
                Text="{u:I18n ThereAreNoItemsThatMatchTheSearch}"
-                HorizontalTextAlignment="Center"
-                AutomationId="NoSearchResultsLabel" />
+                HorizontalTextAlignment="Center" />
            <Button
                Text="{u:I18n AddAnItem}"
                Command="{Binding AddCipherCommand}"
@@ -106,8 +104,7 @@
                SelectionMode="Single"
                SelectionChanged="RowSelected"
                StyleClass="list, list-platform"
-                ExtraDataForLogging="Ciphers Page"
-                AutomationId="CipherList">
+                ExtraDataForLogging="Ciphers Page">
            <CollectionView.ItemTemplate>
                <DataTemplate x:DataType="views:CipherView">
                    <controls:CipherViewCell
--- a/src/App/Pages/Vault/CiphersPageViewModel.cs
+++ b/src/App/Pages/Vault/CiphersPageViewModel.cs
@@ -208,11 +208,6 @@ namespace Bit.App.Pages
            }
            else if (selection == AppResources.Autofill || selection == AppResources.AutofillAndSave)
            {
-                if (cipher.Reprompt != CipherRepromptType.None && !await _passwordRepromptService.ShowPasswordPromptAsync())
-                {
-                    return;
-                }
-
                if (selection == AppResources.AutofillAndSave)
                {
                    var uris = cipher.Login?.Uris?.ToList();
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
@@ -25,8 +25,7 @@
            Priority="-1"
            UseOriginalImage="True"
            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}"
-            AutomationId="AccountIconButton" />
+            AutomationProperties.Name="{u:I18n Account}" />
        <ToolbarItem Icon="search.png" Clicked="Search_Clicked"
                     AutomationProperties.IsInAccessibleTree="True"
                     AutomationProperties.Name="{u:I18n Search}" />
@@ -60,14 +59,13 @@
                <controls:AuthenticatorViewCell 
                    Cipher="{Binding Cipher}"
                    WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}"
-                    TotpSec="{Binding TotpSec}" />
+                    TotpSec="{Binding TotpSec}"/>
            </DataTemplate>

            <DataTemplate x:Key="groupTemplate"
                          x:DataType="pages:GroupingsPageListItem">
                <controls:ExtendedStackLayout Orientation="Horizontal" 
-                                                StyleClass="list-row, list-row-platform"
-                                                AutomationId="{Binding AutomationId}">
+                                                StyleClass="list-row, list-row-platform">
                    <controls:IconLabel Text="{Binding Icon, Mode=OneWay}"
                                        HorizontalOptions="Start"
                                        VerticalOptions="Center"
@@ -81,14 +79,12 @@
                            LineBreakMode="TailTruncation"
                            HorizontalOptions="FillAndExpand"
                            VerticalOptions="CenterAndExpand"
-                            StyleClass="list-title"
-                            AutomationId="ItemNameLabel" />
+                            StyleClass="list-title"/>
                    <Label Text="{Binding ItemCount, Mode=OneWay}"
                            HorizontalOptions="End"
                            VerticalOptions="CenterAndExpand"
                            HorizontalTextAlignment="End"
-                            StyleClass="list-sub"
-                            AutomationId="ItemCountLabel" />
+                            StyleClass="list-sub"/>
                </controls:ExtendedStackLayout>
            </DataTemplate>

@@ -99,8 +95,7 @@
                    Spacing="0"
                    Padding="0"
                    VerticalOptions="FillAndExpand"
-                    StyleClass="list-row-header-container, list-row-header-container-platform"
-                    AutomationId="{Binding AutomationId}">
+                    StyleClass="list-row-header-container, list-row-header-container-platform">
                    <BoxView
                        StyleClass="list-section-separator-top, list-section-separator-top-platform" />
                    <StackLayout StyleClass="list-row-header, list-row-header-platform">
@@ -109,8 +104,7 @@
                            StyleClass="list-header, list-header-platform" />
                        <Label
                            Text="{Binding ItemCount}"
-                            StyleClass="list-header-sub"
-                            AutomationId="SectionItemCount" />
+                            StyleClass="list-header-sub" />
                    </StackLayout>
                    <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
                </StackLayout>
@@ -153,8 +147,7 @@
                    IsVisible="{Binding ShowNoData}">
                    <Label
                        Text="{Binding NoDataText}"
-                        HorizontalTextAlignment="Center"
-                        AutomationId="NoDataDisplayed"></Label>
+                        HorizontalTextAlignment="Center"></Label>
                    <Button
                        Text="{u:I18n AddAnItem}"
                        Clicked="AddButton_Clicked"
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageHeaderListItem.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageHeaderListItem.cs
@@ -1,6 +1,4 @@
-using Bit.App.Utilities.Automation;
-
-namespace Bit.App.Pages
+namespace Bit.App.Pages
 {
    public class GroupingsPageHeaderListItem : IGroupingsPageListItem
    {
@@ -12,12 +10,5 @@ namespace Bit.App.Pages

        public string Title { get; }
        public string ItemCount { get; set; }
-        public string AutomationId
-        {
-            get
-            {
-                return AutomationIdsHelper.AddSuffixFor(AutomationIdsHelper.ToEnglishTitleCase(Title), SuffixType.Header);
-            }
-        }
    }
 }
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListGroup.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListGroup.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Bit.App.Utilities.Automation;

 namespace Bit.App.Pages
 {
@@ -33,6 +32,5 @@ namespace Bit.App.Pages
        public string Name { get; set; }
        public string NameShort => string.IsNullOrWhiteSpace(Name) || Name.Length == 0 ? "-" : Name[0].ToString();
        public string ItemCount { get; set; }
-        public string AutomationId => AutomationIdsHelper.AddSuffixFor(NameShort, SuffixType.ListGroup);
    }
 }
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
@@ -1,5 +1,4 @@
 using Bit.App.Resources;
-using Bit.App.Utilities.Automation;
 using Bit.Core;
 using Bit.Core.Enums;
 using Bit.Core.Models.View;
@@ -60,9 +59,6 @@ namespace Bit.App.Pages
                        case CipherType.Identity:
                            _name = AppResources.TypeIdentity;
                            break;
-                        case CipherType.Fido2Key:
-                            _name = AppResources.Passkey;
-                            break;
                        default:
                            break;
                    }
@@ -111,9 +107,6 @@ namespace Bit.App.Pages
                        case CipherType.Identity:
                            _icon = BitwardenIcons.IdCard;
                            break;
-                        case CipherType.Fido2Key:
-                            _icon = BitwardenIcons.Passkey;
-                            break;
                        default:
                            _icon = BitwardenIcons.Globe;
                            break;
@@ -122,38 +115,5 @@ namespace Bit.App.Pages
                return _icon;
            }
        }
-
-        public string AutomationId
-        {
-            get
-            {
-                if (Type != null)
-                {
-                    return AutomationIdsHelper.AddSuffixFor(System.Enum.GetName(typeof(CipherType), Type.Value), SuffixType.Filter);
-                }
-
-                if (IsTrash)
-                {
-                    return AutomationIdsHelper.AddSuffixFor("Trash", SuffixType.Filter);
-                }
-
-                if (Folder != null)
-                {
-                    return AutomationIdsHelper.AddSuffixFor("Folder", SuffixType.Filter);
-                }
-
-                if (Collection != null)
-                {
-                    return AutomationIdsHelper.AddSuffixFor("Collection", SuffixType.Filter);
-                }
-
-                if (IsTotpCode)
-                {
-                    return AutomationIdsHelper.AddSuffixFor("TOTP", SuffixType.ListItem);
-                }
-
-                return null;
-            }
-        }
    }
 }
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
@@ -235,17 +235,34 @@ namespace Bit.App.Pages
                {
                    AddTotpGroupItem(groupedItems, uppercaseGroupNames);

-                    var types = new CipherType[] { CipherType.Login, CipherType.Card, CipherType.Identity, CipherType.SecureNote };
-                    var typesGroup = new GroupingsPageListGroup(AppResources.Types, types.Length, uppercaseGroupNames, !hasFavorites);
-                    foreach (CipherType t in types)
+                    groupedItems.Add(new GroupingsPageListGroup(
+                        AppResources.Types, 4, uppercaseGroupNames, !hasFavorites)
                    {
-                        typesGroup.Add(new GroupingsPageListItem
+                        new GroupingsPageListItem
                        {
-                            Type = t,
-                            ItemCount = _typeCounts.GetValueOrDefault(t).ToString("N0")
-                        });
-                    }
-                    groupedItems.Add(typesGroup);
+                            Type = CipherType.Login,
+                            ItemCount = (_typeCounts.ContainsKey(CipherType.Login) ?
+                                _typeCounts[CipherType.Login] : 0).ToString("N0")
+                        },
+                        new GroupingsPageListItem
+                        {
+                            Type = CipherType.Card,
+                            ItemCount = (_typeCounts.ContainsKey(CipherType.Card) ?
+                                _typeCounts[CipherType.Card] : 0).ToString("N0")
+                        },
+                        new GroupingsPageListItem
+                        {
+                            Type = CipherType.Identity,
+                            ItemCount = (_typeCounts.ContainsKey(CipherType.Identity) ?
+                                _typeCounts[CipherType.Identity] : 0).ToString("N0")
+                        },
+                        new GroupingsPageListItem
+                        {
+                            Type = CipherType.SecureNote,
+                            ItemCount = (_typeCounts.ContainsKey(CipherType.SecureNote) ?
+                                _typeCounts[CipherType.SecureNote] : 0).ToString("N0")
+                        },
+                    });
                }
                if (NestedFolders?.Any() ?? false)
                {
@@ -313,16 +330,13 @@ namespace Bit.App.Pages
                        items.AddRange(itemGroup);
                    }

-                    Device.BeginInvokeOnMainThread(() =>
+                    if (Device.RuntimePlatform == Device.iOS)
                    {
-                        if (Device.RuntimePlatform == Device.iOS)
-                        {
-                            // HACK: [PS-536] Fix to avoid blank list after back navigation on unlocking with previous page info
-                            // because of update to XF v5.0.0.2401
-                            GroupedItems.Clear();
-                        }
-                        GroupedItems.ReplaceRange(items);
-                    });
+                        // HACK: [PS-536] Fix to avoid blank list after back navigation on unlocking with previous page info
+                        // because of update to XF v5.0.0.2401
+                        GroupedItems.Clear();
+                    }
+                    GroupedItems.ReplaceRange(items);
                }
                else
                {
@@ -342,24 +356,21 @@ namespace Bit.App.Pages
                        items.AddRange(itemGroup);
                    }

-                    Device.BeginInvokeOnMainThread(() =>
+                    if (groupedItems.Any())
                    {
-                        if (groupedItems.Any())
-                        {
-                            if (Device.RuntimePlatform == Device.iOS)
-                            {
-                                // HACK: [PS-536] Fix to avoid blank list after back navigation on unlocking with previous page info
-                                // because of update to XF v5.0.0.2401
-                                GroupedItems.Clear();
-                            }
-                            GroupedItems.ReplaceRange(new List<IGroupingsPageListItem> { new GroupingsPageHeaderListItem(groupedItems[0].Name, groupedItems[0].ItemCount) });
-                            GroupedItems.AddRange(items);
-                        }
-                        else
+                        if (Device.RuntimePlatform == Device.iOS)
                        {
+                            // HACK: [PS-536] Fix to avoid blank list after back navigation on unlocking with previous page info
+                            // because of update to XF v5.0.0.2401
                            GroupedItems.Clear();
                        }
-                    });
+                        GroupedItems.ReplaceRange(new List<IGroupingsPageListItem> { new GroupingsPageHeaderListItem(groupedItems[0].Name, groupedItems[0].ItemCount) });
+                        GroupedItems.AddRange(items);
+                    }
+                    else
+                    {
+                        GroupedItems.Clear();
+                    }
                }
            }
            finally
@@ -367,12 +378,9 @@ namespace Bit.App.Pages
                _doingLoad = false;
                Loaded = true;
                Loading = false;
-                Device.BeginInvokeOnMainThread(() =>
-                {
-                    ShowNoData = (MainPage && !HasCiphers) || !groupedItems.Any();
-                    ShowList = !ShowNoData;
-                    DisableRefreshing();
-                });
+                ShowNoData = (MainPage && !HasCiphers) || !groupedItems.Any();
+                ShowList = !ShowNoData;
+                DisableRefreshing();
            }
        }

@@ -567,9 +575,7 @@ namespace Bit.App.Pages
                }
                else if (Type != null)
                {
-                    Filter = c => !c.IsDeleted
-                                  &&
-                                  Type.Value.IsEqualToOrCanSignIn(c.Type);
+                    Filter = c => c.Type == Type.Value && !c.IsDeleted;
                }
                else if (FolderId != null)
                {
@@ -636,11 +642,14 @@ namespace Bit.App.Pages
                        NoFolderCiphers.Add(c);
                    }

-                    // Fido2Key ciphers should be counted as Login ciphers
-                    var countType = c.Type == CipherType.Fido2Key ? CipherType.Login : c.Type;
-                    _typeCounts[countType] = _typeCounts.TryGetValue(countType, out var currentTypeCount)
-                                                ? currentTypeCount + 1
-                                                : 1;
+                    if (_typeCounts.ContainsKey(c.Type))
+                    {
+                        _typeCounts[c.Type] = _typeCounts[c.Type] + 1;
+                    }
+                    else
+                    {
+                        _typeCounts.Add(c.Type, 1);
+                    }
                }

                if (c.IsDeleted)
--- a/src/App/Pages/Vault/SharePage.xaml
+++ b/src/App/Pages/Vault/SharePage.xaml
@@ -15,7 +15,7 @@

    <ContentPage.ToolbarItems>
        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-        <ToolbarItem Text="{u:I18n Move}" Command="{Binding MoveCommand}" />
+        <ToolbarItem Text="{u:I18n Move}" Clicked="Save_Clicked" />
    </ContentPage.ToolbarItems>

    <ContentPage.Resources>
--- a/src/App/Pages/Vault/SharePage.xaml.cs
+++ b/src/App/Pages/Vault/SharePage.xaml.cs
@@ -32,6 +32,19 @@ namespace Bit.App.Pages
            await LoadOnAppearedAsync(_scrollView, true, () => _vm.LoadAsync());
        }

+        protected override void OnDisappearing()
+        {
+            base.OnDisappearing();
+        }
+
+        private async void Save_Clicked(object sender, System.EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await _vm.SubmitAsync();
+            }
+        }
+
        private async void Close_Clicked(object sender, System.EventArgs e)
        {
            if (DoOnce())
--- a/src/App/Pages/Vault/SharePageViewModel.cs
+++ b/src/App/Pages/Vault/SharePageViewModel.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
@@ -9,7 +8,6 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;

 namespace Bit.App.Pages
 {
@@ -36,8 +34,6 @@ namespace Bit.App.Pages
            Collections = new ExtendedObservableCollection<CollectionViewModel>();
            OrganizationOptions = new List<KeyValuePair<string, string>>();
            PageTitle = AppResources.MoveToOrganization;
-
-            MoveCommand = new AsyncCommand(MoveAsync, onException: ex => HandleException(ex), allowsMultipleExecutions: false);
        }

        public string CipherId { get; set; }
@@ -66,8 +62,6 @@ namespace Bit.App.Pages
            set => SetProperty(ref _hasOrganizations, value);
        }

-        public ICommand MoveCommand { get; }
-
        public async Task LoadAsync()
        {
            var allCollections = await _collectionService.GetAllDecryptedAsync();
@@ -90,7 +84,7 @@ namespace Bit.App.Pages
            FilterCollections();
        }

-        public async Task<bool> MoveAsync()
+        public async Task<bool> SubmitAsync()
        {
            var selectedCollectionIds = Collections?.Where(c => c.Checked).Select(c => c.Collection.Id);
            if (!selectedCollectionIds?.Any() ?? true)
@@ -113,15 +107,8 @@ namespace Bit.App.Pages
            try
            {
                await _deviceActionService.ShowLoadingAsync(AppResources.Saving);
-                var error = await _cipherService.ShareWithServerAsync(cipherView, OrganizationId, checkedCollectionIds);
+                await _cipherService.ShareWithServerAsync(cipherView, OrganizationId, checkedCollectionIds);
                await _deviceActionService.HideLoadingAsync();
-
-                if (error == ICipherService.ShareWithServerError.DuplicatedPasskeyInOrg)
-                {
-                    _platformUtilsService.ShowToast(null, null, AppResources.ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey);
-                    return false;
-                }
-
                var movedItemToOrgText = string.Format(AppResources.MovedItemToOrg, cipherView.Name,
                   (await _organizationService.GetAsync(OrganizationId)).Name);
                _platformUtilsService.ShowToast("success", null, movedItemToOrgText);
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -202,24 +202,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Biometric unlock for this account is disabled pending verification of master password..
-        /// </summary>
-        public static string AccountBiometricInvalidated {
-            get {
-                return ResourceManager.GetString("AccountBiometricInvalidated", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Autofill biometric unlock for this account is disabled pending verification of master password..
-        /// </summary>
-        public static string AccountBiometricInvalidatedExtension {
-            get {
-                return ResourceManager.GetString("AccountBiometricInvalidatedExtension", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Your new account has been created! You may now log in..
        /// </summary>
@@ -553,15 +535,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Application.
-        /// </summary>
-        public static string Application {
-            get {
-                return ResourceManager.GetString("Application", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Approve login requests.
        /// </summary>
@@ -805,6 +778,15 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: &quot;https://twitter.com, androidapp://com.twitter.android&quot;..
+        /// </summary>
+        public static string AutofillBlockedUrisDescription {
+            get {
+                return ResourceManager.GetString("AutofillBlockedUrisDescription", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Do you want to auto-fill or view this item?.
        /// </summary>
@@ -940,15 +922,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Auto-fill will not be offered for these URIs..
-        /// </summary>
-        public static string AutoFillWillNotBeOfferedForTheseURIs {
-            get {
-                return ResourceManager.GetString("AutoFillWillNotBeOfferedForTheseURIs", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Auto-fill with Bitwarden.
        /// </summary>
@@ -958,15 +931,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Available for two-step login.
-        /// </summary>
-        public static string AvailableForTwoStepLogin {
-            get {
-                return ResourceManager.GetString("AvailableForTwoStepLogin", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to A verification code was sent to your email.
        /// </summary>
@@ -1003,6 +967,24 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Biometric unlock disabled pending verification of master password..
+        /// </summary>
+        public static string BiometricInvalidated {
+            get {
+                return ResourceManager.GetString("BiometricInvalidated", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Biometric unlock for autofill disabled pending verification of master password..
+        /// </summary>
+        public static string BiometricInvalidatedExtension {
+            get {
+                return ResourceManager.GetString("BiometricInvalidatedExtension", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Biometrics.
        /// </summary>
@@ -1246,15 +1228,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Block auto-fill.
-        /// </summary>
-        public static string BlockAutoFill {
-            get {
-                return ResourceManager.GetString("BlockAutoFill", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Brand.
        /// </summary>
@@ -1291,15 +1264,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot edit multiple URIs at once.
-        /// </summary>
-        public static string CannotEditMultipleURIsAtOnce {
-            get {
-                return ResourceManager.GetString("CannotEditMultipleURIsAtOnce", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Cannot open the app &quot;{0}&quot;..
        /// </summary>
@@ -1588,15 +1552,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Copy application.
-        /// </summary>
-        public static string CopyApplication {
-            get {
-                return ResourceManager.GetString("CopyApplication", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Copy link.
        /// </summary>
@@ -1705,15 +1660,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Created {0}.
-        /// </summary>
-        public static string CreatedX {
-            get {
-                return ResourceManager.GetString("CreatedX", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Creating account....
        /// </summary>
@@ -1741,15 +1687,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Current master password.
-        /// </summary>
-        public static string CurrentMasterPassword {
-            get {
-                return ResourceManager.GetString("CurrentMasterPassword", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Custom.
        /// </summary>
@@ -1804,15 +1741,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Data region.
-        /// </summary>
-        public static string DataRegion {
-            get {
-                return ResourceManager.GetString("DataRegion", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Password updated.
        /// </summary>
@@ -2200,15 +2128,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Edit URI.
-        /// </summary>
-        public static string EditURI {
-            get {
-                return ResourceManager.GetString("EditURI", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Email.
        /// </summary>
@@ -2362,15 +2281,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Enter URI.
-        /// </summary>
-        public static string EnterURI {
-            get {
-                return ResourceManager.GetString("EnterURI", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Enter the 6 digit verification code from your authenticator app..
        /// </summary>
@@ -2407,15 +2317,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to EU.
-        /// </summary>
-        public static string EU {
-            get {
-                return ResourceManager.GetString("EU", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Exact.
        /// </summary>
@@ -3019,24 +2920,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Format: {0}.
-        /// </summary>
-        public static string FormatX {
-            get {
-                return ResourceManager.GetString("FormatX", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Format: {0}. Separate multiple URIs with a comma..
-        /// </summary>
-        public static string FormatXSeparateMultipleURIsWithAComma {
-            get {
-                return ResourceManager.GetString("FormatXSeparateMultipleURIsWithAComma", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Forwarded email alias.
        /// </summary>
@@ -3352,24 +3235,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid API key.
-        /// </summary>
-        public static string InvalidAPIKey {
-            get {
-                return ResourceManager.GetString("InvalidAPIKey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid API token.
-        /// </summary>
-        public static string InvalidAPIToken {
-            get {
-                return ResourceManager.GetString("InvalidAPIToken", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Invalid email address..
        /// </summary>
@@ -3379,15 +3244,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid format. Use https://, http://, or androidapp://.
-        /// </summary>
-        public static string InvalidFormatUseHttpsHttpOrAndroidApp {
-            get {
-                return ResourceManager.GetString("InvalidFormatUseHttpsHttpOrAndroidApp", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Invalid master password. Try again..
        /// </summary>
@@ -3406,15 +3262,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid URI.
-        /// </summary>
-        public static string InvalidURI {
-            get {
-                return ResourceManager.GetString("InvalidURI", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Invalid verification code.
        /// </summary>
@@ -3713,11 +3560,11 @@ namespace Bit.App.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Logging in as {0} on {1}.
+        ///   Looks up a localized string similar to Logging in as {0}.
        /// </summary>
-        public static string LoggingInAsXOnY {
+        public static string LoggingInAsX {
            get {
-                return ResourceManager.GetString("LoggingInAsXOnY", resourceCulture);
+                return ResourceManager.GetString("LoggingInAsX", resourceCulture);
            }
        }
        
@@ -4020,15 +3867,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Master password re-prompt help.
-        /// </summary>
-        public static string MasterPasswordRePromptHelp {
-            get {
-                return ResourceManager.GetString("MasterPasswordRePromptHelp", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Match detection.
        /// </summary>
@@ -4326,15 +4164,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to New blocked URI.
-        /// </summary>
-        public static string NewBlockedURI {
-            get {
-                return ResourceManager.GetString("NewBlockedURI", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to New custom field.
        /// </summary>
@@ -4822,33 +4651,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Passkey.
-        /// </summary>
-        public static string Passkey {
-            get {
-                return ResourceManager.GetString("Passkey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Passkeys.
-        /// </summary>
-        public static string Passkeys {
-            get {
-                return ResourceManager.GetString("Passkeys", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Passkey will not be copied.
-        /// </summary>
-        public static string PasskeyWillNotBeCopied {
-            get {
-                return ResourceManager.GetString("PasskeyWillNotBeCopied", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Passphrase.
        /// </summary>
@@ -5318,15 +5120,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Region.
-        /// </summary>
-        public static string Region {
-            get {
-                return ResourceManager.GetString("Region", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Remember me.
        /// </summary>
@@ -5660,15 +5453,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Self-hosted.
-        /// </summary>
-        public static string SelfHosted {
-            get {
-                return ResourceManager.GetString("SelfHosted", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Self-hosted environment.
        /// </summary>
@@ -6263,24 +6047,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to The passkey will not be copied to the cloned item. Do you want to continue cloning this item?.
-        /// </summary>
-        public static string ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem {
-            get {
-                return ResourceManager.GetString("ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem", resourceCulture);
-        
-            }
-        }
-        
-        ///   Looks up a localized string similar to There are no blocked URIs.
-        /// </summary>
-        public static string ThereAreNoBlockedURIs {
-            get {
-                return ResourceManager.GetString("ThereAreNoBlockedURIs", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to There are no items in your vault that match &quot;{0}&quot;.
        /// </summary>
@@ -6299,15 +6065,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to The URI {0} is already blocked.
-        /// </summary>
-        public static string TheURIXIsAlreadyBlocked {
-            get {
-                return ResourceManager.GetString("TheURIXIsAlreadyBlocked", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to 30 days.
        /// </summary>
@@ -6335,16 +6092,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to This item cannot be shared with the organization because there is one already with the same passkey..
-        /// </summary>
-        public static string ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey {
-            get {
-                return ResourceManager.GetString("ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePassk" +
-                        "ey", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to This request is no longer valid.
        /// </summary>
@@ -6633,15 +6380,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve..
-        /// </summary>
-        public static string UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve {
-            get {
-                return ResourceManager.GetString("UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Unlock vault.
        /// </summary>
@@ -6714,15 +6452,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour..
-        /// </summary>
-        public static string UpdateWeakMasterPasswordWarning {
-            get {
-                return ResourceManager.GetString("UpdateWeakMasterPasswordWarning", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Updating password.
        /// </summary>
@@ -6768,15 +6497,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to URI removed.
-        /// </summary>
-        public static string URIRemoved {
-            get {
-                return ResourceManager.GetString("URIRemoved", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to URIs.
        /// </summary>
@@ -6786,24 +6506,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to URI saved.
-        /// </summary>
-        public static string URISaved {
-            get {
-                return ResourceManager.GetString("URISaved", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to US.
-        /// </summary>
-        public static string US {
-            get {
-                return ResourceManager.GetString("US", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Use another two-step login method.
        /// </summary>
@@ -6975,15 +6677,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Your organization policies have set your vault timeout action to {0}..
-        /// </summary>
-        public static string VaultTimeoutActionPolicyInEffect {
-            get {
-                return ResourceManager.GetString("VaultTimeoutActionPolicyInEffect", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?.
        /// </summary>
@@ -6994,7 +6687,7 @@ namespace Bit.App.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s)..
+        ///   Looks up a localized string similar to Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s).
        /// </summary>
        public static string VaultTimeoutPolicyInEffect {
            get {
@@ -7002,15 +6695,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}..
-        /// </summary>
-        public static string VaultTimeoutPolicyWithActionInEffect {
-            get {
-                return ResourceManager.GetString("VaultTimeoutPolicyWithActionInEffect", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Your vault timeout exceeds the restrictions set by your organization..
        /// </summary>
@@ -7317,15 +7001,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to You cannot edit passkey application because it would invalidate the passkey.
-        /// </summary>
-        public static string YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey {
-            get {
-                return ResourceManager.GetString("YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Your account has been permanently deleted.
        /// </summary>
--- a/src/App/Resources/AppResources.af.resx
+++ b/src/App/Resources/AppResources.af.resx
@@ -1585,6 +1585,9 @@ Skandering gebeur outomaties.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Versperde URI’s vir outovul</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Outovul sal nie vir versperde URI’s gebied word nie. Skei meerdere URI’s met ’n komma. Byvoorbeeld: “https://twitter.com, androidapp://com.twitter.android”.</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Vra om aantekening toe te voeg</value>
  </data>
@@ -1749,11 +1752,11 @@ Skandering gebeur outomaties.</value>
    <value>Wil u dit regtig na die asblik stuur?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometriese ontgrendeling vir hierdie rekening is gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometriese ontgrendeling gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Outovul-biometriese ontgrendeline vir hierdie rekening is gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometriese ontgrendeling vir outovul gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Aktiveer sinchronisering by verfrissing</value>
@@ -2139,12 +2142,6 @@ Skandering gebeur outomaties.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>U organisasiebeleide beïnvloed u kluisuitelling. Maksimum toegelate kluisuittelling is {0} uur en {1} minuut(e).</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Jou organisasie se beleid affekteer jou kluis-uittel tyd. Maksimum toelaatbare kluis-uittel tyd is {0} uur(ure) en {1} minuut(minute). Jou kluis-uittel aksie is gestel na {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Jou organisasie se beleid het jou kluis-uittel aksie na {0} verander.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>U kluisuittelling oorskry die beperkinge wat deur u organisasie daargestel is.</value>
  </data>
@@ -2492,8 +2489,8 @@ Wil u na die rekening omskakel?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Kry hoofwagwoord wenk</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Teken aan as {0} op {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Teken in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Nie jy nie?</value>
@@ -2595,122 +2592,15 @@ Wil u na die rekening omskakel?</value>
    <value>Organisasie SSO identifiseerder vereis.</value>
  </data>
  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Voeg die sleutel by 'n huidige of nuwe item</value>
+    <value>Add the key to an existing or new item</value>
  </data>
  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>Daar is geen items in jou kluis wat met "{0}" ooreenstem nie</value>
+    <value>There are no items in your vault that match "{0}"</value>
  </data>
  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Soek vir 'n item of voeg 'n nuwe een by</value>
+    <value>Search for an item or add a new item</value>
  </data>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>Daar is geen items wat met die soekterm ooreenstem nie</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>VS</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Selghehuisves</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Datastreek</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Streek</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>U hoofwagwoord voldoen nie aan een of meer van die organisasiebeleide nie. Om toegang tot die kluis te kry, moet u nou u hoofwagwoord bywerk. Deur voort te gaan sal u van u huidige sessie afgeteken word, en u sal weer moet aanteken. Aktiewe sessies op ander toestelle kan vir tot een uur aktief bly.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Huidige hoofwagwoord</value>
-  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Hulpteks vir vra weer vir hoofwagwoord</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Ontgrendeling kan misluk as daar onvoldoende geheue is. Verminder u KDF-geheue-instellings om dit op te los.</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Ongeldige API-sleutel</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Ongeldige API-teken</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
+    <value>There are no items that match the search</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.ar.resx
+++ b/src/App/Resources/AppResources.ar.resx
@@ -1585,6 +1585,9 @@
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>تعبئة العناوين المحجوبة تلقائياً</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>لن يتم عرض التعبئة التلقائية للعناوين المحجوبة. افصل عناوين متعددة بفاصلة. مثال: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>اطلب إضافة تسجيل الدخول</value>
  </data>
@@ -1749,11 +1752,11 @@
    <value>هل تريد حقاً أن ترسل إلى سلة المهملات؟</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>تم تعطيل فتح القفل الحيوي لهذا الحساب في انتظار التحقق من كلمة المرور الرئيسية.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>تم تعطيل فتح القفل الحيوي في انتظار التحقق من كلمة المرور الرئيسية.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>إلغاء القفل الحيوي للملء التلقائي لهذا الحساب معطل في انتظار التحقق من كلمة المرور الرئيسية.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>تم تعطيل إلغاء القفل البيومتري للملء التلقائي في انتظار التحقق من كلمة المرور الرئيسية.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>تمكين المزامنة عند التحديث</value>
@@ -2140,12 +2143,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>سياسات مؤسستك تؤثر على مهلة الخزنة الخاص بك. الحد الأقصى المسموح به لمهلة الخزنة هو {0} ساعة و {1} دقيقة</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>سياسات مؤسستك تؤثر على مهلة خزنتك. الحد الأقصى المسموح به لمهلة الخزنة هو {0} ساعة(ساعات) و {1} دقيقة(دقائق). يتم تعيين إجراء مهلة المخزن الخاص بك إلى {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>سياسات مؤسستك قامت بتعيين إجراء مهلة خزنتك إلى {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>مهلة خزنتك تتجاوز القيود التي تضعها مؤسستك.</value>
  </data>
@@ -2493,8 +2490,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>احصل على تلميح كلمة المرور الرئيسية</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>تسجيل الدخول كـ {0} في {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>تسجيل الدخول كـ {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>ليس أنت؟</value>
@@ -2607,111 +2604,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>لا توجد عناصر تطابق البحث</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>الولايات المتحدة</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>الاتحاد الأوروبي</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>استضافة ذاتية</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>منطقة البيانات</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>المنطقة</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>كلمة المرور الرئيسية الخاصة بك لا تفي بواحدة أو أكثر من سياسات مؤسستك. من أجل الوصول إلى الخزنة، يجب عليك تحديث كلمة المرور الرئيسية الآن. سيتم تسجيل خروجك من الجلسة الحالية، مما يتطلب منك تسجيل الدخول مرة أخرى. وقد تظل الجلسات النشطة على أجهزة أخرى نشطة لمدة تصل إلى ساعة واحدة.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>كلمة المرور الرئيسية الحالية</value>
-  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.az.resx
+++ b/src/App/Resources/AppResources.az.resx
@@ -1585,6 +1585,9 @@ Skan prosesi avtomatik baş tutacaq.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Əngəllənən URI-lərin avto-doldurulması</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Əngəllənən URI-lər üçün avto-doldurma təklif edilmir. Çoxlu URI-ni vergüllə ayırır. Nümunə: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Giriş əlavə etmək üçün soruş</value>
  </data>
@@ -1749,11 +1752,11 @@ Skan prosesi avtomatik baş tutacaq.</value>
    <value>Həqiqətən tullantı qutusuna göndərmək istəyirsiniz?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün bu hesab üzrə biometrik kilid açma sıradan çıxarıldı.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün biometrik kilid açma sıradan çıxarıldı.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün bu hesab üzrə avto-doldurma biometrik kilid açma sıradan çıxarıldı.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün avto-doldurma üzrə biometrik kilid açma sıradan çıxarıldı.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Təzələmə əsnasında eyniləşdirməni fəallaşdır</value>
@@ -2139,12 +2142,6 @@ Skan prosesi avtomatik baş tutacaq.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Təşkilatınızın siyasətləri, anbarınızın vaxt bitişinə təsir edir. Anbar vaxt bitişi üçün icazə verilən maksimum vaxt {0} saat {1} dəqiqədir</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Təşkilatınızın siyasətləri, anbarınızın vaxt bitişinə təsir edir. Anbar vaxt bitişi üçün icazə verilən maksimum vaxt {0} saat {1} dəqiqədir. Anbar vaxt bitişi əməliyyatı {2} olaraq tənzimləndi.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Təşkilatınızın siyasətləri, anbar vaxt bitişi əməliyyatınızı {0} olaraq tənzimlədi.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Anbar vaxt bitişi, təşkilatınız tərəfindən tənzimlənən məhdudiyyətləri aşır.</value>
  </data>
@@ -2491,8 +2488,8 @@ Bu hesaba keçmək istəyirsiniz?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Ana parol üçün məsləhət alın</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>{1} üzərində {0} olaraq giriş edildi</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} olaraq giriş edilir</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Siz deyilsiniz?</value>
@@ -2605,111 +2602,4 @@ Bu hesaba keçmək istəyirsiniz?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Axtarışa uyğun gələn heç bir element yoxdur</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>ABŞ</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>AB</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Öz-özünə sahiblik edən</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data bölgəsi</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Bölgə</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Ana parolunuz təşkilatınızdakı siyasətlərdən birinə və ya bir neçəsinə uyğun gəlmir. Anbara müraciət üçün ana parolunuzu indi güncəlləməlisiniz. Davam etsəniz, hazırkı seansdan çıxış etmiş və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saata qədər aktiv qalmağa davam edə bilər.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Hazırkı ana parol</value>
-  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Ana parolu təkrar soruş köməyi</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Yetərsiz yaddaşa görə kilid açma uğursuz ola bilər. Həll etmək üçün KDF yaddaş tənzimləmələrinizi azaldın</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Yararsız API açarı</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Yararsız API tokeni</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Avto-doldurmanı əngəllə</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Bu URI-lər üçün avto-doldurma təklif olunmayacaq.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Yeni əngəllənən URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saxlanıldı</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Yararsız format. https://, http:// və ya androidapp:// istifadə edin</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>URI-ə düzəliş et</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>URI-ni daxil et</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Bir neçə URI-ı vergüllə ayırın.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Yararsız URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI silindi</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Əngəllənən URI yoxdur</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI {0} artıq əngəllənib</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Bir dəfəyə bir neçə URI-a düzəliş etmək mümkün deyil</value>
-  </data>
 </root>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hinton	4bdbc30873	Dylib	2023-04-27 14:38:32 +02:00
Hinton	39bfda0a24	Add linking instruction everywhere	2023-04-24 15:44:41 +02:00
Hinton	3172b0d571	Use aarch64-apple-ios instead	2023-04-24 15:17:52 +02:00
Hinton	464d1f8a9a	test	2023-04-24 14:57:12 +02:00