Fix Build Workflow (#2613 )

(cherry picked from commit fdc0313d10)
Bumped version to 2023.7.0 (#2612 )
2025-12-05 23:53:33 +00:00 · 2023-07-13 10:07:04 -04:00 · 2023-07-12 13:35:43 -04:00
277 changed files with 2154 additions and 13434 deletions
--- a/.github/workflows/version-auto-bump.yml
+++ b/.github/workflows/version-auto-bump.yml
@@ -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_KV_CI_SERVICE_PRINCIPAL }}
+        with:
+          version_number: ${{ needs.setup.outputs.version_number }}
--- 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/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -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/MainApplication.cs
+++ b/src/Android/MainApplication.cs
@@ -70,8 +70,7 @@ namespace Bit.Droid
                var verificationActionsFlowHelper = new VerificationActionsFlowHelper(
                    ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService"),
                    ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService"),
-                    ServiceContainer.Resolve<ICryptoService>("cryptoService"),
-                    ServiceContainer.Resolve<IUserVerificationService>());
+                    ServiceContainer.Resolve<ICryptoService>("cryptoService"));
                ServiceContainer.Register<IVerificationActionsFlowHelper>("verificationActionsFlowHelper", verificationActionsFlowHelper);

                var accountsManager = new AccountsManager(
@@ -157,9 +156,9 @@ namespace Bit.Droid
                messagingService, broadcasterService);
            var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService,
                platformUtilsService, new LazyResolve<IEventService>());
+            var biometricService = new BiometricService(stateService);
            var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
            var cryptoService = new CryptoService(stateService, cryptoFunctionService);
-            var biometricService = new BiometricService(stateService, cryptoService);
            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);

            ServiceContainer.Register<ISynchronousStorageService>(preferencesStorage);
--- 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.7.0" 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,10 +1,10 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.OS;
+using System;
 using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
+using System.ComponentModel;
 using Xamarin.Forms.Platform.Android;
+using Android.Content;
+using Xamarin.Forms;
+using Bit.Droid.Renderers;

 [assembly: ExportRenderer(typeof(CustomLabel), typeof(CustomLabelRenderer))]
 namespace Bit.Droid.Renderers
@@ -15,19 +15,6 @@ namespace Bit.Droid.Renderers
            : 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;
@@ -41,3 +28,4 @@ namespace Bit.Droid.Renderers
        }
    }
 }
+
--- 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
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Android.OS;
 using Android.Security.Keystore;
-using Bit.App.Services;
 using Bit.Core.Abstractions;
 using Bit.Core.Services;
 using Java.Security;
@@ -10,8 +9,10 @@ using Javax.Crypto;

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

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

        private readonly KeyStore _keystore;

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

-        public override async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
+        public async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
        {
            if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
            {
@@ -40,7 +41,7 @@ namespace Bit.Droid.Services
            return true;
        }

-        public override async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
+        public async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
        {
            if (Build.VERSION.SdkInt < BuildVersionCodes.M)
            {
--- 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/Abstractions/IPasswordRepromptService.cs
+++ b/src/App/Abstractions/IPasswordRepromptService.cs
@@ -9,5 +9,7 @@ namespace Bit.App.Abstractions
        Task<bool> ShowPasswordPromptAsync();

        Task<(string password, bool valid)> ShowPasswordPromptAndGetItAsync();
+
+        Task<bool> Enabled();
    }
 }
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -146,7 +146,6 @@
    <Folder Include="Controls\IconLabelButton\" />
    <Folder Include="Controls\PasswordStrengthProgressBar\" />
    <Folder Include="Utilities\Automation\" />
-    <Folder Include="Utilities\Prompts\" />
  </ItemGroup>

  <ItemGroup>
@@ -443,6 +442,5 @@
    <None Remove="MessagePack.MSBuild.Tasks" />
    <None Remove="Controls\PasswordStrengthProgressBar\" />
    <None Remove="Utilities\Automation\" />
-    <None Remove="Utilities\Prompts\" />
  </ItemGroup>
 </Project>
--- 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,4 +1,5 @@
-using Xamarin.Forms;
+using System;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -7,7 +8,6 @@ namespace Bit.App.Controls
        public CustomLabel()
        {
        }
-
-        public int? FontWeight { get; set; }
    }
 }
+
--- a/src/App/Pages/Accounts/HomePageViewModel.cs
+++ b/src/App/Pages/Accounts/HomePageViewModel.cs
@@ -7,17 +7,17 @@ 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;
+using Xamarin.Essentials;
 using Xamarin.Forms;

 namespace Bit.App.Pages
 {
    public class HomeViewModel : BaseViewModel
    {
-        private const string LOGGING_IN_ON_US = "bitwarden.com";
-        private const string LOGGING_IN_ON_EU = "bitwarden.eu";
-
        private readonly IStateService _stateService;
        private readonly IMessagingService _messagingService;
        private readonly IPlatformUtilsService _platformUtilsService;
@@ -30,6 +30,8 @@ namespace Bit.App.Pages
        private bool _rememberEmail;
        private string _email;
        private string _selectedEnvironmentName;
+        private bool _isEmailEnabled;
+        private bool _canLogin;
        private bool _displayEuEnvironment;

        public HomeViewModel()
@@ -84,7 +86,7 @@ namespace Bit.App.Pages
            set => SetProperty(ref _selectedEnvironmentName, value);
        }

-        public string RegionText => $"{AppResources.LoggingInOn}:";
+        public string RegionText => $"{AppResources.Region}:";
        public bool CanContinue => !string.IsNullOrEmpty(Email);

        public FormattedString CreateAccountText
@@ -165,12 +167,12 @@ namespace Bit.App.Pages
        {
            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag);
            var options = _displayEuEnvironment
-                    ? new string[] { LOGGING_IN_ON_US, LOGGING_IN_ON_EU, AppResources.SelfHosted }
-                    : new string[] { LOGGING_IN_ON_US, AppResources.SelfHosted };
+                    ? new string[] { AppResources.US, AppResources.EU, AppResources.SelfHosted }
+                    : new string[] { AppResources.US, AppResources.SelfHosted };

            await Device.InvokeOnMainThreadAsync(async () =>
            {
-                var result = await Page.DisplayActionSheet(AppResources.LoggingInOn, AppResources.Cancel, null, options);
+                var result = await Page.DisplayActionSheet(AppResources.DataRegion, AppResources.Cancel, null, options);

                if (result is null || result == AppResources.Cancel)
                {
@@ -183,7 +185,7 @@ namespace Bit.App.Pages
                    return;
                }

-                await _environmentService.SetUrlsAsync(result == LOGGING_IN_ON_EU ? EnvironmentUrlData.DefaultEU : EnvironmentUrlData.DefaultUS);
+                await _environmentService.SetUrlsAsync(result == AppResources.EU ? EnvironmentUrlData.DefaultEU : EnvironmentUrlData.DefaultUS);
                await _configService.GetAsync(true);
                SelectedEnvironmentName = result;
            });
@@ -196,17 +198,17 @@ namespace Bit.App.Pages
            {
                await _environmentService.SetUrlsAsync(EnvironmentUrlData.DefaultUS);
                environmentsSaved = EnvironmentUrlData.DefaultUS;
-                SelectedEnvironmentName = LOGGING_IN_ON_US;
+                SelectedEnvironmentName = AppResources.US;
                return;
            }

            if (environmentsSaved.Base == EnvironmentUrlData.DefaultUS.Base)
            {
-                SelectedEnvironmentName = LOGGING_IN_ON_US;
+                SelectedEnvironmentName = AppResources.US;
            }
            else if (environmentsSaved.Base == EnvironmentUrlData.DefaultEU.Base)
            {
-                SelectedEnvironmentName = LOGGING_IN_ON_EU;
+                SelectedEnvironmentName = AppResources.EU;
            }
            else
            {
--- a/src/App/Pages/Accounts/LockPage.xaml
+++ b/src/App/Pages/Accounts/LockPage.xaml
@@ -46,7 +46,7 @@
                    <StackLayout StyleClass="box">
                        <Grid
                            StyleClass="box-row"
-                            IsVisible="{Binding PinEnabled}"
+                            IsVisible="{Binding PinLock}"
                            Padding="0, 10, 0, 0">
                            <Grid.RowDefinitions>
                                <RowDefinition Height="Auto" />
@@ -89,7 +89,7 @@
                        <Grid
                            x:Name="_passwordGrid"
                            StyleClass="box-row"
-                            IsVisible="{Binding PinEnabled, Converter={StaticResource inverseBool}}"
+                            IsVisible="{Binding PinLock, Converter={StaticResource inverseBool}}"
                            Padding="0, 10, 0, 0">
                            <Grid.RowDefinitions>
                                <RowDefinition Height="Auto" />
--- a/src/App/Pages/Accounts/LockPage.xaml.cs
+++ b/src/App/Pages/Accounts/LockPage.xaml.cs
@@ -20,14 +20,13 @@ namespace Bit.App.Pages
        private bool _promptedAfterResume;
        private bool _appeared;

-        public LockPage(AppOptions appOptions = null, bool autoPromptBiometric = true, bool checkPendingAuthRequests = true)
+        public LockPage(AppOptions appOptions = null, bool autoPromptBiometric = true)
        {
            _appOptions = appOptions;
            _autoPromptBiometric = autoPromptBiometric;
            InitializeComponent();
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>();
            _vm = BindingContext as LockPageViewModel;
-            _vm.CheckPendingAuthRequests = checkPendingAuthRequests;
            _vm.Page = this;
            _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(async () => await UnlockedAsync());

@@ -45,7 +44,7 @@ namespace Bit.App.Pages
        {
            get
            {
-                if (_vm?.PinEnabled ?? false)
+                if (_vm?.PinLock ?? false)
                {
                    return _pin;
                }
@@ -55,7 +54,7 @@ namespace Bit.App.Pages

        public async Task PromptBiometricAfterResumeAsync()
        {
-            if (_vm.BiometricEnabled)
+            if (_vm.BiometricLock)
            {
                await Task.Delay(500);
                if (!_promptedAfterResume)
@@ -92,13 +91,13 @@ namespace Bit.App.Pages

            _vm.FocusSecretEntry += PerformFocusSecretEntry;

-            if (!_vm.BiometricEnabled)
+            if (!_vm.BiometricLock)
            {
                RequestFocus(SecretEntry);
            }
            else
            {
-                if (!_vm.HasMasterPassword && !_vm.PinEnabled)
+                if (_vm.UsingKeyConnector && !_vm.PinLock)
                {
                    _passwordGrid.IsVisible = false;
                    _unlockButton.IsVisible = false;
--- a/src/App/Pages/Accounts/LockPageViewModel.cs
+++ b/src/App/Pages/Accounts/LockPageViewModel.cs
@@ -27,27 +27,27 @@ namespace Bit.App.Pages
        private readonly IEnvironmentService _environmentService;
        private readonly IStateService _stateService;
        private readonly IBiometricService _biometricService;
-        private readonly IUserVerificationService _userVerificationService;
+        private readonly IKeyConnectorService _keyConnectorService;
        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 IDeviceTrustCryptoService _deviceTrustCryptoService;
-        private readonly ISyncService _syncService;
+
        private string _email;
        private string _masterPassword;
        private string _pin;
        private bool _showPassword;
-        private PinLockType _pinStatus;
-        private bool _pinEnabled;
-        private bool _biometricEnabled;
+        private bool _pinLock;
+        private bool _biometricLock;
        private bool _biometricIntegrityValid = true;
        private bool _biometricButtonVisible;
-        private bool _hasMasterPassword;
+        private bool _usingKeyConnector;
        private string _biometricButtonText;
        private string _loggedInAsText;
        private string _lockedVerifyText;
+        private bool _isPinProtected;
+        private bool _isPinProtectedWithKey;

        public LockPageViewModel()
        {
@@ -60,13 +60,11 @@ namespace Bit.App.Pages
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
+            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
            _logger = ServiceContainer.Resolve<ILogger>("logger");
            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
            _policyService = ServiceContainer.Resolve<IPolicyService>();
            _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>();
-            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
-            _syncService = ServiceContainer.Resolve<ISyncService>();

            PageTitle = AppResources.VerifyMasterPassword;
            TogglePasswordCommand = new Command(TogglePassword);
@@ -102,21 +100,21 @@ namespace Bit.App.Pages
                });
        }

-        public bool PinEnabled
+        public bool PinLock
        {
-            get => _pinEnabled;
-            set => SetProperty(ref _pinEnabled, value);
+            get => _pinLock;
+            set => SetProperty(ref _pinLock, value);
        }

-        public bool HasMasterPassword
+        public bool UsingKeyConnector
        {
-            get => _hasMasterPassword;
+            get => _usingKeyConnector;
        }

-        public bool BiometricEnabled
+        public bool BiometricLock
        {
-            get => _biometricEnabled;
-            set => SetProperty(ref _biometricEnabled, value);
+            get => _biometricLock;
+            set => SetProperty(ref _biometricLock, value);
        }

        public bool BiometricIntegrityValid
@@ -149,8 +147,6 @@ namespace Bit.App.Pages
            set => SetProperty(ref _lockedVerifyText, value);
        }

-        public bool CheckPendingAuthRequests { get; set; }
-
        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }

        public Command SubmitCommand { get; }
@@ -166,32 +162,18 @@ namespace Bit.App.Pages

        public async Task InitAsync()
        {
-            var pendingRequest = await _stateService.GetPendingAdminAuthRequestAsync();
-            if (pendingRequest != null && CheckPendingAuthRequests)
+            (_isPinProtected, _isPinProtectedWithKey) = await _vaultTimeoutService.IsPinLockSetAsync();
+            PinLock = (_isPinProtected && await _stateService.GetPinProtectedKeyAsync() != null) ||
+                      _isPinProtectedWithKey;
+            BiometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _cryptoService.HasKeyAsync();
+
+            // Users with key connector and without biometric or pin has no MP to unlock with
+            _usingKeyConnector = await _keyConnectorService.GetUsesKeyConnector();
+            if (_usingKeyConnector && !(BiometricLock || PinLock))
            {
                await _vaultTimeoutService.LogOutAsync();
                return;
            }
-
-            _pinStatus = await _vaultTimeoutService.GetPinLockTypeAsync();
-
-            var ephemeralPinSet = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync()
-                ?? await _stateService.GetPinProtectedKeyAsync();
-            PinEnabled = (_pinStatus == PinLockType.Transient && ephemeralPinSet != null) ||
-                      _pinStatus == PinLockType.Persistent;
-            BiometricEnabled = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _biometricService.CanUseBiometricsUnlockAsync();
-
-            // Users without MP and without biometric or pin has no MP to unlock with
-            _hasMasterPassword = await _userVerificationService.HasMasterPasswordAsync();
-            if (await _stateService.IsAuthenticatedAsync()
-                 && !_hasMasterPassword
-                 && !BiometricEnabled
-                 && !PinEnabled)
-            {
-                await _vaultTimeoutService.LogOutAsync();
-                return;
-            }
-
            _email = await _stateService.GetEmailAsync();
            if (string.IsNullOrWhiteSpace(_email))
            {
@@ -206,18 +188,26 @@ namespace Bit.App.Pages
            }
            var webVaultHostname = CoreHelpers.GetHostname(webVault);
            LoggedInAsText = string.Format(AppResources.LoggedInAsOn, _email, webVaultHostname);
-            if (PinEnabled)
+            if (PinLock)
            {
                PageTitle = AppResources.VerifyPIN;
                LockedVerifyText = AppResources.VaultLockedPIN;
            }
            else
            {
-                PageTitle = _hasMasterPassword ? AppResources.VerifyMasterPassword : AppResources.UnlockVault;
-                LockedVerifyText = _hasMasterPassword ? AppResources.VaultLockedMasterPassword : AppResources.VaultLockedIdentity;
+                if (_usingKeyConnector)
+                {
+                    PageTitle = AppResources.UnlockVault;
+                    LockedVerifyText = AppResources.VaultLockedIdentity;
+                }
+                else
+                {
+                    PageTitle = AppResources.VerifyMasterPassword;
+                    LockedVerifyText = AppResources.VaultLockedMasterPassword;
+                }
            }

-            if (BiometricEnabled)
+            if (BiometricLock)
            {
                BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
                if (!_biometricIntegrityValid)
@@ -239,14 +229,14 @@ namespace Bit.App.Pages

        public async Task SubmitAsync()
        {
-            if (PinEnabled && string.IsNullOrWhiteSpace(Pin))
+            if (PinLock && string.IsNullOrWhiteSpace(Pin))
            {
                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
                    string.Format(AppResources.ValidationFieldRequired, AppResources.PIN),
                    AppResources.Ok);
                return;
            }
-            if (!PinEnabled && string.IsNullOrWhiteSpace(MasterPassword))
+            if (!PinLock && string.IsNullOrWhiteSpace(MasterPassword))
            {
                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
                    string.Format(AppResources.ValidationFieldRequired, AppResources.MasterPassword),
@@ -257,54 +247,34 @@ namespace Bit.App.Pages
            ShowPassword = false;
            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));

-            if (PinEnabled)
+            if (PinLock)
            {
                var failed = true;
                try
                {
-                    EncString userKeyPin = null;
-                    EncString oldPinProtected = null;
-                    if (_pinStatus == PinLockType.Persistent)
+                    if (_isPinProtected)
                    {
-                        userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyAsync();
-                        var oldEncryptedKey = await _stateService.GetPinProtectedAsync();
-                        oldPinProtected = oldEncryptedKey != null ? new EncString(oldEncryptedKey) : null;
-                    }
-                    else if (_pinStatus == PinLockType.Transient)
-                    {
-                        userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync();
-                        oldPinProtected = await _stateService.GetPinProtectedKeyAsync();
-                    }
-
-                    UserKey userKey;
-                    if (oldPinProtected != null)
-                    {
-                        userKey = await _cryptoService.DecryptAndMigrateOldPinKeyAsync(
-                            _pinStatus == PinLockType.Transient,
-                            Pin,
-                            _email,
+                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email,
                            kdfConfig,
-                            oldPinProtected
-                        );
+                            await _stateService.GetPinProtectedKeyAsync());
+                        var encKey = await _cryptoService.GetEncKeyAsync(key);
+                        var protectedPin = await _stateService.GetProtectedPinAsync();
+                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
+                        failed = decPin != Pin;
+                        if (!failed)
+                        {
+                            Pin = string.Empty;
+                            await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+                            await SetKeyAndContinueAsync(key);
+                        }
                    }
                    else
                    {
-                        userKey = await _cryptoService.DecryptUserKeyWithPinAsync(
-                            Pin,
-                            _email,
-                            kdfConfig,
-                            userKeyPin
-                        );
-                    }
-
-                    var protectedPin = await _stateService.GetProtectedPinAsync();
-                    var decryptedPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), userKey);
-                    failed = decryptedPin != Pin;
-                    if (!failed)
-                    {
+                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email, kdfConfig);
+                        failed = false;
                        Pin = string.Empty;
                        await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                        await SetUserKeyAndContinueAsync(userKey);
+                        await SetKeyAndContinueAsync(key);
                    }
                }
                catch
@@ -325,21 +295,19 @@ namespace Bit.App.Pages
            }
            else
            {
-                var masterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, _email, kdfConfig);
-                var storedKeyHash = await _cryptoService.GetMasterKeyHashAsync();
+                var key = await _cryptoService.MakeKeyAsync(MasterPassword, _email, kdfConfig);
+                var storedKeyHash = await _cryptoService.GetKeyHashAsync();
                var passwordValid = false;
                MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;

                if (storedKeyHash != null)
                {
-                    // Offline unlock possible
-                    passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, masterKey);
+                    passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, key);
                }
                else
                {
-                    // Online unlock required
                    await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-                    var keyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey, HashPurpose.ServerAuthorization);
+                    var keyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
                    var request = new PasswordVerificationRequest();
                    request.MasterPasswordHash = keyHash;

@@ -348,8 +316,8 @@ namespace Bit.App.Pages
                        var response = await _apiService.PostAccountVerifyPasswordAsync(request);
                        enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
                        passwordValid = true;
-                        var localKeyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey, HashPurpose.LocalAuthorization);
-                        await _cryptoService.SetMasterKeyHashAsync(localKeyHash);
+                        var localKeyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
+                        await _cryptoService.SetKeyHashAsync(localKeyHash);
                    }
                    catch (Exception e)
                    {
@@ -359,6 +327,15 @@ namespace Bit.App.Pages
                }
                if (passwordValid)
                {
+                    if (_isPinProtected)
+                    {
+                        var protectedPin = await _stateService.GetProtectedPinAsync();
+                        var encKey = await _cryptoService.GetEncKeyAsync(key);
+                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
+                        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
@@ -368,13 +345,10 @@ namespace Bit.App.Pages

                    MasterPassword = string.Empty;
                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-
-                    var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
-                    await _cryptoService.SetMasterKeyAsync(masterKey);
-                    await SetUserKeyAndContinueAsync(userKey);
+                    await SetKeyAndContinueAsync(key);

                    // Re-enable biometrics
-                    if (BiometricEnabled & !BiometricIntegrityValid)
+                    if (BiometricLock & !BiometricIntegrityValid)
                    {
                        await _biometricService.SetupBiometricAsync();
                    }
@@ -451,7 +425,7 @@ namespace Bit.App.Pages
        public void TogglePassword()
        {
            ShowPassword = !ShowPassword;
-            var secret = PinEnabled ? Pin : MasterPassword;
+            var secret = PinLock ? Pin : MasterPassword;
            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length, nameof(FocusSecretEntry));
        }

@@ -459,35 +433,32 @@ namespace Bit.App.Pages
        {
            BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
            BiometricButtonVisible = BiometricIntegrityValid;
-            if (!BiometricEnabled || !BiometricIntegrityValid)
+            if (!BiometricLock || !BiometricIntegrityValid)
            {
                return;
            }
            var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
-                PinEnabled ? AppResources.PIN : AppResources.MasterPassword,
+                PinLock ? AppResources.PIN : AppResources.MasterPassword,
                () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)));
            await _stateService.SetBiometricLockedAsync(!success);
            if (success)
            {
-                var userKey = await _cryptoService.GetBiometricUnlockKeyAsync();
-                await SetUserKeyAndContinueAsync(userKey);
+                await DoContinueAsync();
            }
        }

-        private async Task SetUserKeyAndContinueAsync(UserKey key)
+        private async Task SetKeyAndContinueAsync(SymmetricCryptoKey key)
        {
-            var hasKey = await _cryptoService.HasUserKeyAsync();
+            var hasKey = await _cryptoService.HasKeyAsync();
            if (!hasKey)
            {
-                await _cryptoService.SetUserKeyAsync(key);
+                await _cryptoService.SetKeyAsync(key);
            }
-            await _deviceTrustCryptoService.TrustDeviceIfNeededAsync();
            await DoContinueAsync();
        }

        private async Task DoContinueAsync()
        {
-            _syncService.FullSyncAsync(false).FireAndForget();
            await _stateService.SetBiometricLockedAsync(false);
            _watchDeviceService.SyncDataToWatchAsync().FireAndForget();
            _messagingService.Send("unlocked");
--- a/src/App/Pages/Accounts/LoginApproveDevicePage.xaml
+++ b/src/App/Pages/Accounts/LoginApproveDevicePage.xaml
@@ -1,76 +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.LoginApproveDevicePage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:DataType="pages:LoginApproveDeviceViewModel"
-    x:Name="_page"
-    Title="{Binding PageTitle}">
-    
-    <ContentPage.BindingContext>
-        <pages:LoginApproveDeviceViewModel />
-    </ContentPage.BindingContext>
-
-    <StackLayout Padding="10, 10">
-        <StackLayout Padding="5, 10" Orientation="Horizontal">
-            <StackLayout HorizontalOptions="FillAndExpand">
-                <Label
-                    StyleClass="text-md"
-                    Text="{u:I18n RememberThisDevice}"/>
-                <Label
-                    StyleClass="box-sub-label"
-                    Text="{u:I18n TurnOffUsingPublicDevice}"/>
-            </StackLayout>
-            <Switch
-                Scale="0.8"
-                IsToggled="{Binding RememberThisDevice}"
-                VerticalOptions="Center"/>
-        </StackLayout>
-        <StackLayout Margin="0, 20, 0, 0">
-            <Button
-                x:Name="_continue"
-                Text="{u:I18n Continue}" 
-                StyleClass="btn-primary"
-                Command="{Binding ContinueCommand}"
-                IsVisible="{Binding IsNewUser}"/>
-            <Button
-                x:Name="_approveWithMyOtherDevice"
-                Text="{u:I18n ApproveWithMyOtherDevice}" 
-                StyleClass="btn-primary"
-                Command="{Binding ApproveWithMyOtherDeviceCommand}"
-                IsVisible="{Binding ApproveWithMyOtherDeviceEnabled}"/>
-            <Button
-                x:Name="_requestAdminApproval"
-                Text="{u:I18n RequestAdminApproval}" 
-                StyleClass="box-button-row"
-                Command="{Binding RequestAdminApprovalCommand}"
-                IsVisible="{Binding RequestAdminApprovalEnabled}"/>
-            <Button
-                x:Name="_approveWithMasterPassword"
-                Text="{u:I18n ApproveWithMasterPassword}" 
-                StyleClass="box-button-row"
-                Command="{Binding ApproveWithMasterPasswordCommand}"
-                IsVisible="{Binding ApproveWithMasterPasswordEnabled}"/>
-            <Label
-                Text="{Binding LoggingInAsText}"
-                StyleClass="text-sm"
-                Margin="0,40,0,0"
-                AutomationId="LoggingInAsLabel"
-                />
-            <Label
-                Text="{u:I18n NotYou}"
-                StyleClass="text-md"
-                HorizontalOptions="Start"
-                TextColor="{DynamicResource HyperlinkColor}"
-                AutomationId="NotYouLabel">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding LogoutCommand}" />
-                </Label.GestureRecognizers>
-            </Label>
-        </StackLayout>
-    </StackLayout>
-</pages:BaseContentPage>
-
-
--- a/src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs
@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.App.Models;
-using Bit.App.Utilities;
-using Bit.Core.Enums;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class LoginApproveDevicePage : BaseContentPage
-    {
-
-        private readonly LoginApproveDeviceViewModel _vm;
-        private readonly AppOptions _appOptions;
-
-        public LoginApproveDevicePage(AppOptions appOptions = null)
-        {
-            InitializeComponent();
-            _vm = BindingContext as LoginApproveDeviceViewModel;
-            _vm.LogInWithMasterPasswordAction = () => StartLogInWithMasterPasswordAsync().FireAndForget();
-            _vm.LogInWithDeviceAction = () => StartLoginWithDeviceAsync().FireAndForget();
-            _vm.RequestAdminApprovalAction = () => RequestAdminApprovalAsync().FireAndForget();
-            _vm.ContinueToVaultAction = () => ContinueToVaultAsync().FireAndForget();
-            _vm.Page = this;
-            _appOptions = appOptions;
-        }
-
-        protected override void OnAppearing()
-        {
-            _vm.InitAsync();
-        }
-
-        private async Task ContinueToVaultAsync()
-        {
-            if (AppHelpers.SetAlternateMainPage(_appOptions))
-            {
-                return;
-            }
-            var previousPage = await AppHelpers.ClearPreviousPage();
-            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
-        }
-
-        private async Task StartLogInWithMasterPasswordAsync()
-        {
-            var page = new LockPage(_appOptions, checkPendingAuthRequests: false);
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
-        private async Task StartLoginWithDeviceAsync()
-        {
-            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AuthenticateAndUnlock, _appOptions);
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
-        private async Task RequestAdminApprovalAsync()
-        {
-            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AdminApproval, _appOptions);
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-    }
-}
-
--- a/src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs
+++ b/src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs
@@ -1,150 +0,0 @@
-using System;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.App.Utilities.AccountManagement;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Models.Domain;
-using Bit.Core.Models.Request;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class LoginApproveDeviceViewModel : BaseViewModel
-    {
-        private bool _rememberThisDevice;
-        private bool _approveWithMyOtherDeviceEnabled;
-        private bool _requestAdminApprovalEnabled;
-        private bool _approveWithMasterPasswordEnabled;
-        private string _email;
-        private readonly IStateService _stateService;
-        private readonly IApiService _apiService;
-        private IDeviceTrustCryptoService _deviceTrustCryptoService;
-        private readonly IAuthService _authService;
-        private readonly ISyncService _syncService;
-        private readonly IMessagingService _messagingService;
-
-        public ICommand ApproveWithMyOtherDeviceCommand { get; }
-        public ICommand RequestAdminApprovalCommand { get; }
-        public ICommand ApproveWithMasterPasswordCommand { get; }
-        public ICommand ContinueCommand { get; }
-        public ICommand LogoutCommand { get; }
-
-        public Action LogInWithMasterPasswordAction { get; set; }
-        public Action LogInWithDeviceAction { get; set; }
-        public Action RequestAdminApprovalAction { get; set; }
-        public Action ContinueToVaultAction { get; set; }
-
-        public LoginApproveDeviceViewModel()
-        {
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _apiService = ServiceContainer.Resolve<IApiService>();
-            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
-            _authService = ServiceContainer.Resolve<IAuthService>();
-            _syncService = ServiceContainer.Resolve<ISyncService>();
-            _messagingService = ServiceContainer.Resolve<IMessagingService>();
-
-            PageTitle = AppResources.LogInInitiated;
-            RememberThisDevice = true;
-
-            ApproveWithMyOtherDeviceCommand = new AsyncCommand(() => SetDeviceTrustAndInvokeAsync(LogInWithDeviceAction),
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            RequestAdminApprovalCommand = new AsyncCommand(() => SetDeviceTrustAndInvokeAsync(RequestAdminApprovalAction),
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            ApproveWithMasterPasswordCommand = new AsyncCommand(() => SetDeviceTrustAndInvokeAsync(LogInWithMasterPasswordAction),
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            ContinueCommand = new AsyncCommand(CreateNewSsoUserAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            LogoutCommand = new Command(() => _messagingService.Send(AccountsManagerMessageCommands.LOGOUT));
-        }
-
-        public string LoggingInAsText => string.Format(AppResources.LoggingInAsX, Email);
-
-        public bool RememberThisDevice
-        {
-            get => _rememberThisDevice;
-            set => SetProperty(ref _rememberThisDevice, value);
-        }
-
-        public bool ApproveWithMyOtherDeviceEnabled
-        {
-            get => _approveWithMyOtherDeviceEnabled;
-            set => SetProperty(ref _approveWithMyOtherDeviceEnabled, value);
-        }
-
-        public bool RequestAdminApprovalEnabled
-        {
-            get => _requestAdminApprovalEnabled;
-            set => SetProperty(ref _requestAdminApprovalEnabled, value,
-                additionalPropertyNames: new[] { nameof(IsNewUser) });
-        }
-
-        public bool ApproveWithMasterPasswordEnabled
-        {
-            get => _approveWithMasterPasswordEnabled;
-            set => SetProperty(ref _approveWithMasterPasswordEnabled, value,
-                additionalPropertyNames: new[] { nameof(IsNewUser) });
-        }
-
-        public bool IsNewUser => !RequestAdminApprovalEnabled && !ApproveWithMasterPasswordEnabled;
-
-        public string Email
-        {
-            get => _email;
-            set => SetProperty(ref _email, value, additionalPropertyNames:
-                new string[] {
-                    nameof(LoggingInAsText)
-                });
-        }
-
-        public async Task InitAsync()
-        {
-            try
-            {
-                Email = await _stateService.GetActiveUserEmailAsync();
-                var decryptOptions = await _stateService.GetAccountDecryptionOptions();
-                RequestAdminApprovalEnabled = decryptOptions?.TrustedDeviceOption?.HasAdminApproval ?? false;
-                ApproveWithMasterPasswordEnabled = decryptOptions?.HasMasterPassword ?? false;
-                ApproveWithMyOtherDeviceEnabled = decryptOptions?.TrustedDeviceOption?.HasLoginApprovingDevice ?? false;
-            }
-            catch (Exception ex)
-            {
-                HandleException(ex);
-            }
-        }
-
-        public async Task CreateNewSsoUserAsync()
-        {
-            await _authService.CreateNewSsoUserAsync(await _stateService.GetRememberedOrgIdentifierAsync());
-            if (RememberThisDevice)
-            {
-                await _deviceTrustCryptoService.TrustDeviceAsync();
-            }
-
-            _syncService.FullSyncAsync(true).FireAndForget();
-            await Device.InvokeOnMainThreadAsync(ContinueToVaultAction);
-        }
-
-        private async Task SetDeviceTrustAndInvokeAsync(Action action)
-        {
-            await _deviceTrustCryptoService.SetShouldTrustDeviceAsync(RememberThisDevice);
-            await Device.InvokeOnMainThreadAsync(action);
-        }
-    }
-}
-
--- a/src/App/Pages/Accounts/LoginPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginPage.xaml.cs
@@ -4,7 +4,6 @@ using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
-using Bit.Core.Enums;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -136,7 +135,7 @@ namespace Bit.App.Pages

        private async Task StartLoginWithDeviceAsync()
        {
-            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AuthenticateAndUnlock, _appOptions);
+            var page = new LoginPasswordlessRequestPage(_vm.Email, _appOptions);
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

--- a/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
@@ -21,17 +21,17 @@
        <StackLayout
            Padding="7, 0, 7, 20">
            <Label
-                Text="{Binding Title}"
+                Text="{u:I18n LogInInitiated}"
                FontSize="Title"
                FontAttributes="Bold"
                Margin="0,14,0,21"
                AutomationId="LogInInitiatedLabel" />
            <Label
-                Text="{Binding SubTitle}"
+                Text="{u:I18n ANotificationHasBeenSentToYourDevice}"
                FontSize="Small"
                Margin="0,0,0,10"/>
            <Label
-                Text="{Binding Description}"
+                Text="{u:I18n PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice}"
                FontSize="Small"
                Margin="0,0,0,24"/>
            <Label
@@ -40,39 +40,41 @@
                FontAttributes="Bold"/>
            <controls:MonoLabel
                FormattedText="{Binding FingerprintPhrase}"
-                FontSize="Small"
+                FontSize="Medium"
                TextColor="{DynamicResource FingerprintPhrase}"
                AutomationId="FingerprintPhraseValue" />
            <Label
                Text="{u:I18n ResendNotification}"
-                IsVisible="{Binding ResendNotificationVisible}"
-                StyleClass="text-sm"
-                FontAttributes="Bold"
+                StyleClass="text-md"
                HorizontalOptions="Start"
-                Margin="0,24,0,0"
+                Margin="0,40,0,0"
                TextColor="{DynamicResource HyperlinkColor}"
                AutomationId="ResendNotificationButton">
                <Label.GestureRecognizers>
                    <TapGestureRecognizer Command="{Binding CreatePasswordlessLoginCommand}" />
                </Label.GestureRecognizers>
            </Label>
-            <BoxView
-                HeightRequest="1"
-                Margin="0,24,0,24"
-                Color="{DynamicResource DisabledIconColor}" />
-            <Label
-                Text="{Binding OtherOptions}"
-                FontSize="Small"/>
-            <Label
-                Text="{u:I18n ViewAllLoginOptions}"
-                StyleClass="text-sm"
-                FontAttributes="Bold"
-                TextColor="{DynamicResource HyperlinkColor}"
-                AutomationId="ViewAllLoginOptionsButton">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding CloseCommand}" />
-                </Label.GestureRecognizers>
-            </Label>
+            <StackLayout
+                Orientation="Horizontal"
+                Margin="0,30,0,0">
+                <Label
+                    Text="{u:I18n NeedAnotherOption}"
+                    FontSize="Small"
+                    VerticalTextAlignment="End"/>
+                <Label
+                    Text="{u:I18n ViewAllLoginOptions}"
+                    StyleClass="text-md"
+                    VerticalTextAlignment="End"
+                    VerticalOptions="CenterAndExpand"
+                    Margin="5, 0"
+                    TextColor="{DynamicResource HyperlinkColor}"
+                    AutomationId="ViewAllLoginOptionsButton">
+                    <Label.GestureRecognizers>
+                        <TapGestureRecognizer Command="{Binding CloseCommand}" />
+                    </Label.GestureRecognizers>
+                </Label>
+            </StackLayout>
+               
        </StackLayout>
    </ScrollView>
 </pages:BaseContentPage>
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Utilities;
-using Bit.Core.Enums;
 using Xamarin.Forms;

 namespace Bit.App.Pages
@@ -13,14 +12,13 @@ namespace Bit.App.Pages
        private LoginPasswordlessRequestViewModel _vm;
        private readonly AppOptions _appOptions;

-        public LoginPasswordlessRequestPage(string email, AuthRequestType authRequestType, AppOptions appOptions = null)
+        public LoginPasswordlessRequestPage(string email, AppOptions appOptions = null)
        {
            InitializeComponent();
            _appOptions = appOptions;
            _vm = BindingContext as LoginPasswordlessRequestViewModel;
            _vm.Page = this;
            _vm.Email = email;
-            _vm.AuthRequestType = authRequestType;
            _vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
            _vm.LogInSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await LogInSuccessAsync());
            _vm.UpdateTempPasswordAction = () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -13,7 +12,6 @@ using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
-using Bit.Core.Models.Response;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -34,9 +32,6 @@ namespace Bit.App.Pages
        private IPlatformUtilsService _platformUtilsService;
        private IEnvironmentService _environmentService;
        private ILogger _logger;
-        private IDeviceTrustCryptoService _deviceTrustCryptoService;
-        private readonly ICryptoFunctionService _cryptoFunctionService;
-        private readonly ICryptoService _cryptoService;

        protected override II18nService i18nService => _i18nService;
        protected override IEnvironmentService environmentService => _environmentService;
@@ -49,7 +44,6 @@ namespace Bit.App.Pages
        private string _email;
        private string _requestId;
        private string _requestAccessCode;
-        private AuthRequestType _authRequestType;
        // Item1 publicKey, Item2 privateKey
        private Tuple<byte[], byte[]> _requestKeyPair;

@@ -63,9 +57,8 @@ namespace Bit.App.Pages
            _i18nService = ServiceContainer.Resolve<II18nService>();
            _stateService = ServiceContainer.Resolve<IStateService>();
            _logger = ServiceContainer.Resolve<ILogger>();
-            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
-            _cryptoFunctionService = ServiceContainer.Resolve<ICryptoFunctionService>();
-            _cryptoService = ServiceContainer.Resolve<ICryptoService>();
+
+            PageTitle = AppResources.LogInWithAnotherDevice;

            CreatePasswordlessLoginCommand = new AsyncCommand(CreatePasswordlessLoginAsync,
                onException: ex => HandleException(ex),
@@ -84,86 +77,6 @@ namespace Bit.App.Pages
        public ICommand CreatePasswordlessLoginCommand { get; }
        public ICommand CloseCommand { get; }

-        public string HeaderTitle
-        {
-            get
-            {
-                switch (_authRequestType)
-                {
-                    case AuthRequestType.AuthenticateAndUnlock:
-                        return AppResources.LogInWithDevice;
-                    case AuthRequestType.AdminApproval:
-                        return AppResources.LogInInitiated;
-                    default:
-                        return string.Empty;
-                };
-            }
-        }
-
-        public string Title
-        {
-            get
-            {
-                switch (_authRequestType)
-                {
-                    case AuthRequestType.AuthenticateAndUnlock:
-                        return AppResources.LogInInitiated;
-                    case AuthRequestType.AdminApproval:
-                        return AppResources.AdminApprovalRequested;
-                    default:
-                        return string.Empty;
-                };
-            }
-        }
-
-        public string SubTitle
-        {
-            get
-            {
-                switch (_authRequestType)
-                {
-                    case AuthRequestType.AuthenticateAndUnlock:
-                        return AppResources.ANotificationHasBeenSentToYourDevice;
-                    case AuthRequestType.AdminApproval:
-                        return AppResources.YourRequestHasBeenSentToYourAdmin;
-                    default:
-                        return string.Empty;
-                };
-            }
-        }
-
-        public string Description
-        {
-            get
-            {
-                switch (_authRequestType)
-                {
-                    case AuthRequestType.AuthenticateAndUnlock:
-                        return AppResources.PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice;
-                    case AuthRequestType.AdminApproval:
-                        return AppResources.YouWillBeNotifiedOnceApproved;
-                    default:
-                        return string.Empty;
-                };
-            }
-        }
-
-        public string OtherOptions
-        {
-            get
-            {
-                switch (_authRequestType)
-                {
-                    case AuthRequestType.AuthenticateAndUnlock:
-                        return AppResources.LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption;
-                    case AuthRequestType.AdminApproval:
-                        return AppResources.TroubleLoggingIn;
-                    default:
-                        return string.Empty;
-                };
-            }
-        }
-
        public string FingerprintPhrase
        {
            get => _fingerprintPhrase;
@@ -176,25 +89,6 @@ namespace Bit.App.Pages
            set => SetProperty(ref _email, value);
        }

-        public AuthRequestType AuthRequestType
-        {
-            get => _authRequestType;
-            set
-            {
-                SetProperty(ref _authRequestType, value, additionalPropertyNames: new string[]
-                {
-                    nameof(Title),
-                    nameof(SubTitle),
-                    nameof(Description),
-                    nameof(OtherOptions),
-                    nameof(ResendNotificationVisible)
-                });
-                PageTitle = HeaderTitle;
-            }
-        }
-
-        public bool ResendNotificationVisible => AuthRequestType == AuthRequestType.AuthenticateAndUnlock;
-
        public void StartCheckLoginRequestStatus()
        {
            try
@@ -225,22 +119,14 @@ namespace Bit.App.Pages

        private async Task CheckLoginRequestStatus()
        {
-            if (string.IsNullOrEmpty(_requestId))
+            if (string.IsNullOrEmpty(_requestId) || string.IsNullOrEmpty(_requestAccessCode))
            {
                return;
            }

            try
            {
-                PasswordlessLoginResponse response = null;
-                if (await _stateService.IsAuthenticatedAsync())
-                {
-                    response = await _authService.GetPasswordlessLoginRequestByIdAsync(_requestId);
-                }
-                else
-                {
-                    response = await _authService.GetPasswordlessLoginResquestAsync(_requestId, _requestAccessCode);
-                }
+                var response = await _authService.GetPasswordlessLoginResponseAsync(_requestId, _requestAccessCode);

                if (response.RequestApproved == null || !response.RequestApproved.Value)
                {
@@ -252,12 +138,6 @@ namespace Bit.App.Pages
                var authResult = await _authService.LogInPasswordlessAsync(Email, _requestAccessCode, _requestId, _requestKeyPair.Item2, response.Key, response.MasterPasswordHash);
                await AppHelpers.ResetInvalidUnlockAttemptsAsync();

-                if (authResult == null && await _stateService.IsAuthenticatedAsync())
-                {
-                    await HandleLoginCompleteAsync();
-                    return;
-                }
-
                if (await HandleCaptchaAsync(authResult.CaptchaSiteKey, authResult.CaptchaNeeded, CheckLoginRequestStatus))
                {
                    return;
@@ -273,7 +153,8 @@ namespace Bit.App.Pages
                }
                else
                {
-                    await HandleLoginCompleteAsync();
+                    _syncService.FullSyncAsync(true).FireAndForget();
+                    LogInSuccessAction?.Invoke();
                }
            }
            catch (Exception ex)
@@ -283,67 +164,22 @@ namespace Bit.App.Pages
            }
        }

-        private async Task HandleLoginCompleteAsync()
-        {
-            await _stateService.SetPendingAdminAuthRequestAsync(null);
-            _syncService.FullSyncAsync(true).FireAndForget();
-            LogInSuccessAction?.Invoke();
-        }
-
        private async Task CreatePasswordlessLoginAsync()
        {
            await Device.InvokeOnMainThreadAsync(() => _deviceActionService.ShowLoadingAsync(AppResources.Loading));

-            PasswordlessLoginResponse response = null;
-            var pendingRequest = await _stateService.GetPendingAdminAuthRequestAsync();
-            if (pendingRequest != null && _authRequestType == AuthRequestType.AdminApproval)
+            var response = await _authService.PasswordlessCreateLoginRequestAsync(_email);
+            if (response != null)
            {
-                response = await _authService.GetPasswordlessLoginRequestByIdAsync(pendingRequest.Id);
-                if (response == null || (response.IsAnswered && !response.RequestApproved.Value))
-                {
-                    // handle pending auth request not valid remove it from state
-                    await _stateService.SetPendingAdminAuthRequestAsync(null);
-                    pendingRequest = null;
-                    response = null;
-                }
-                else
-                {
-                    // Derive pubKey from privKey in state to avoid MITM attacks
-                    // Also generate FingerprintPhrase locally for the same reason
-                    var derivedPublicKey = await _cryptoFunctionService.RsaExtractPublicKeyAsync(pendingRequest.PrivateKey);
-                    response.FingerprintPhrase = string.Join("-", await _cryptoService.GetFingerprintAsync(Email, derivedPublicKey));
-                    response.RequestKeyPair = new Tuple<byte[], byte[]>(derivedPublicKey, pendingRequest.PrivateKey);
-                }
+                FingerprintPhrase = response.FingerprintPhrase;
+                _requestId = response.Id;
+                _requestAccessCode = response.RequestAccessCode;
+                _requestKeyPair = response.RequestKeyPair;
            }

-            if (response == null)
-            {
-                response = await _authService.PasswordlessCreateLoginRequestAsync(_email, AuthRequestType);
-            }
-
-            await HandlePasswordlessLoginAsync(response, pendingRequest == null && _authRequestType == AuthRequestType.AdminApproval);
            await _deviceActionService.HideLoadingAsync();
        }

-        private async Task HandlePasswordlessLoginAsync(PasswordlessLoginResponse response, bool createPendingAdminRequest)
-        {
-            if (response == null)
-            {
-                throw new ArgumentNullException(nameof(response));
-            }
-
-            if (createPendingAdminRequest)
-            {
-                var pendingAuthRequest = new PendingAdminAuthRequest { Id = response.Id, PrivateKey = response.RequestKeyPair.Item2 };
-                await _stateService.SetPendingAdminAuthRequestAsync(pendingAuthRequest);
-            }
-
-            FingerprintPhrase = response.FingerprintPhrase;
-            _requestId = response.Id;
-            _requestAccessCode = response.RequestAccessCode;
-            _requestKeyPair = response.RequestKeyPair;
-        }
-
        private void HandleException(Exception ex)
        {
            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
--- a/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
@@ -29,8 +29,6 @@ namespace Bit.App.Pages
            _vm.SsoAuthSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await SsoAuthSuccessAsync());
            _vm.UpdateTempPasswordAction =
                () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
-            _vm.StartDeviceApprovalOptionsAction =
-                () => Device.BeginInvokeOnMainThread(async () => await StartDeviceApprovalOptionsAsync());
            _vm.CloseAction = async () =>
            {
                await Navigation.PopModalAsync();
@@ -108,17 +106,10 @@ namespace Bit.App.Pages
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

-        private async Task StartDeviceApprovalOptionsAsync()
-        {
-            var page = new LoginApproveDevicePage();
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
        private async Task SsoAuthSuccessAsync()
        {
            RestoreAppOptionsFromCopy();
            await AppHelpers.ClearPreviousPage();
-
            if (await _vaultTimeoutService.IsLockedAsync())
            {
                Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
--- a/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
@@ -9,7 +9,6 @@ using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Essentials;
@@ -30,8 +29,6 @@ namespace Bit.App.Pages
        private readonly IStateService _stateService;
        private readonly ILogger _logger;
        private readonly IOrganizationService _organizationService;
-        private readonly IDeviceTrustCryptoService _deviceTrustCryptoService;
-        private readonly ICryptoService _cryptoService;

        private string _orgIdentifier;

@@ -48,8 +45,7 @@ namespace Bit.App.Pages
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _logger = ServiceContainer.Resolve<ILogger>("logger");
            _organizationService = ServiceContainer.Resolve<IOrganizationService>();
-            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
-            _cryptoService = ServiceContainer.Resolve<ICryptoService>();
+

            PageTitle = AppResources.Bitwarden;
            LogInCommand = new AsyncCommand(LogInAsync, allowsMultipleExecutions: false);
@@ -65,7 +61,6 @@ namespace Bit.App.Pages
        public Action StartTwoFactorAction { get; set; }
        public Action StartSetPasswordAction { get; set; }
        public Action SsoAuthSuccessAction { get; set; }
-        public Action StartDeviceApprovalOptionsAction { get; set; }
        public Action CloseAction { get; set; }
        public Action UpdateTempPasswordAction { get; set; }

@@ -149,6 +144,7 @@ namespace Bit.App.Pages
                authResult = await WebAuthenticator.AuthenticateAsync(new Uri(url),
                    new Uri(REDIRECT_URI));

+
                var code = GetResultCode(authResult, state);
                if (!string.IsNullOrEmpty(code))
                {
@@ -201,89 +197,28 @@ namespace Bit.App.Pages
            try
            {
                var response = await _authService.LogInSsoAsync(code, codeVerifier, REDIRECT_URI, orgId);
-                var decryptOptions = await _stateService.GetAccountDecryptionOptions();
                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                await _stateService.SetRememberedOrgIdentifierAsync(OrgIdentifier);
                await _deviceActionService.HideLoadingAsync();
                if (response.TwoFactor)
                {
                    StartTwoFactorAction?.Invoke();
-                    return;
                }
-
-                if (decryptOptions?.TrustedDeviceOption != null)
-                {
-                    var pendingRequest = await _stateService.GetPendingAdminAuthRequestAsync();
-                    // If user doesn't have a MP, but has reset password permission, they must set a MP
-                    if (!decryptOptions.HasMasterPassword &&
-                        decryptOptions.TrustedDeviceOption.HasManageResetPasswordPermission)
-                    {
-                        StartSetPasswordAction?.Invoke();
-                    }
-                    else if (response.ForcePasswordReset)
-                    {
-                        UpdateTempPasswordAction?.Invoke();
-                    }
-                    else if (await _deviceTrustCryptoService.IsDeviceTrustedAsync())
-                    {
-                        if (decryptOptions.TrustedDeviceOption.EncryptedPrivateKey == null && decryptOptions.TrustedDeviceOption.EncryptedUserKey == null)
-                        {
-                            await _deviceTrustCryptoService.RemoveTrustedDeviceAsync();
-                            StartDeviceApprovalOptionsAction?.Invoke();
-                        }
-                        else
-                        {
-                            _syncService.FullSyncAsync(true).FireAndForget();
-                            SsoAuthSuccessAction?.Invoke();
-                        }
-                    }
-                    else if (pendingRequest != null)
-                    {
-                        var authRequest = await _authService.GetPasswordlessLoginRequestByIdAsync(pendingRequest.Id);
-                        if (authRequest != null && authRequest.RequestApproved != null && authRequest.RequestApproved.Value)
-                        {
-                            var authResult = await _authService.LogInPasswordlessAsync(await _stateService.GetActiveUserEmailAsync(), authRequest.RequestAccessCode, pendingRequest.Id, pendingRequest.PrivateKey, authRequest.Key, authRequest.MasterPasswordHash);
-                            if (authResult == null && await _stateService.IsAuthenticatedAsync())
-                            {
-                                await Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(
-                                 () => _platformUtilsService.ShowToast("info", null, AppResources.LoginApproved));
-                                await _stateService.SetPendingAdminAuthRequestAsync(null);
-                                _syncService.FullSyncAsync(true).FireAndForget();
-                                SsoAuthSuccessAction?.Invoke();
-                            }
-                        }
-                        else
-                        {
-                            await _stateService.SetPendingAdminAuthRequestAsync(null);
-                            StartDeviceApprovalOptionsAction?.Invoke();
-                        }
-                    }
-                    else
-                    {
-                        StartDeviceApprovalOptionsAction?.Invoke();
-                    }
-                    return;
-                }
-
-                // In the standard, non TDE case, a user must set password if they don't
-                // have one and they aren't using key connector.
-                // Note: TDE & Key connector are mutually exclusive org config options.
-                if (response.ResetMasterPassword || (decryptOptions?.RequireSetPassword ?? false))
+                else if (response.ResetMasterPassword)
                {
                    StartSetPasswordAction?.Invoke();
-                    return;
                }
-
-                if (response.ForcePasswordReset)
+                else if (response.ForcePasswordReset)
                {
                    UpdateTempPasswordAction?.Invoke();
-                    return;
                }
-
-                _syncService.FullSyncAsync(true).FireAndForget();
-                SsoAuthSuccessAction?.Invoke();
+                else
+                {
+                    var task = Task.Run(async () => await _syncService.FullSyncAsync(true));
+                    SsoAuthSuccessAction?.Invoke();
+                }
            }
-            catch (Exception)
+            catch (Exception e)
            {
                await _deviceActionService.HideLoadingAsync();
                await _platformUtilsService.ShowDialogAsync(AppResources.LoginSsoError,
--- a/src/App/Pages/Accounts/RegisterPageViewModel.cs
+++ b/src/App/Pages/Accounts/RegisterPageViewModel.cs
@@ -177,25 +177,25 @@ namespace Bit.App.Pages
            Name = string.IsNullOrWhiteSpace(Name) ? null : Name;
            Email = Email.Trim().ToLower();
            var kdfConfig = new KdfConfig(KdfType.PBKDF2_SHA256, Constants.Pbkdf2Iterations, null, null);
-            var newMasterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, Email, kdfConfig);
-            var (newUserKey, newProtectedUserKey) = await _cryptoService.EncryptUserKeyWithMasterKeyAsync(newMasterKey);
-            var hashedPassword = await _cryptoService.HashMasterKeyAsync(MasterPassword, newMasterKey);
-            var (newPublicKey, newProtectedPrivateKey) = await _cryptoService.MakeKeyPairAsync(newUserKey);
+            var key = await _cryptoService.MakeKeyAsync(MasterPassword, Email, kdfConfig);
+            var encKey = await _cryptoService.MakeEncKeyAsync(key);
+            var hashedPassword = await _cryptoService.HashPasswordAsync(MasterPassword, key);
+            var keys = await _cryptoService.MakeKeyPairAsync(encKey.Item1);
            var request = new RegisterRequest
            {
                Email = Email,
                Name = Name,
                MasterPasswordHash = hashedPassword,
                MasterPasswordHint = Hint,
-                Key = newProtectedUserKey.EncryptedString,
+                Key = encKey.Item2.EncryptedString,
                Kdf = kdfConfig.Type,
                KdfIterations = kdfConfig.Iterations,
                KdfMemory = kdfConfig.Memory,
                KdfParallelism = kdfConfig.Parallelism,
                Keys = new KeysRequest
                {
-                    PublicKey = newPublicKey,
-                    EncryptedPrivateKey = newProtectedPrivateKey.EncryptedString
+                    PublicKey = keys.Item1,
+                    EncryptedPrivateKey = keys.Item2.EncryptedString
                },
                CaptchaResponse = _captchaToken,
            };
--- a/src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs
@@ -30,14 +30,14 @@ namespace Bit.App.Pages

        public async Task Init()
        {
-            Organization = await _keyConnectorService.GetManagingOrganizationAsync();
+            Organization = await _keyConnectorService.GetManagingOrganization();
        }

        public async Task MigrateAccount()
        {
            await _deviceActionService.ShowLoadingAsync(AppResources.Loading);

-            await _keyConnectorService.MigrateUserAsync();
+            await _keyConnectorService.MigrateUser();
            await _syncService.FullSyncAsync(true);

            await _deviceActionService.HideLoadingAsync();
--- a/src/App/Pages/Accounts/SetPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/SetPasswordPageViewModel.cs
@@ -165,17 +165,26 @@ namespace Bit.App.Pages

            var kdfConfig = new KdfConfig(KdfType.PBKDF2_SHA256, Constants.Pbkdf2Iterations, null, null);
            var email = await _stateService.GetEmailAsync();
-            var newMasterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, email, kdfConfig);
-            var masterPasswordHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, newMasterKey, HashPurpose.ServerAuthorization);
-            var localMasterPasswordHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, newMasterKey, HashPurpose.LocalAuthorization);
+            var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdfConfig);
+            var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
+            var localMasterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);

-            var (newUserKey, newProtectedUserKey) = await _cryptoService.EncryptUserKeyWithMasterKeyAsync(newMasterKey);
+            Tuple<SymmetricCryptoKey, EncString> encKey;
+            var existingEncKey = await _cryptoService.GetEncKeyAsync();
+            if (existingEncKey == null)
+            {
+                encKey = await _cryptoService.MakeEncKeyAsync(key);
+            }
+            else
+            {
+                encKey = await _cryptoService.RemakeEncKeyAsync(key);
+            }

-            var (newPublicKey, newProtectedPrivateKey) = await _cryptoService.MakeKeyPairAsync(newUserKey);
+            var keys = await _cryptoService.MakeKeyPairAsync(encKey.Item1);
            var request = new SetPasswordRequest
            {
                MasterPasswordHash = masterPasswordHash,
-                Key = newProtectedUserKey.EncryptedString,
+                Key = encKey.Item2.EncryptedString,
                MasterPasswordHint = Hint,
                Kdf = kdfConfig.Type.GetValueOrDefault(KdfType.PBKDF2_SHA256),
                KdfIterations = kdfConfig.Iterations.GetValueOrDefault(Constants.Pbkdf2Iterations),
@@ -184,8 +193,8 @@ namespace Bit.App.Pages
                OrgIdentifier = OrgIdentifier,
                Keys = new KeysRequest
                {
-                    PublicKey = newPublicKey,
-                    EncryptedPrivateKey = newProtectedPrivateKey.EncryptedString
+                    PublicKey = keys.Item1,
+                    EncryptedPrivateKey = keys.Item2.EncryptedString
                }
            };

@@ -195,20 +204,19 @@ namespace Bit.App.Pages
                // Set Password and relevant information
                await _apiService.SetPasswordAsync(request);
                await _stateService.SetKdfConfigurationAsync(kdfConfig);
-                await _cryptoService.SetUserKeyAsync(newUserKey);
-                await _cryptoService.SetMasterKeyAsync(newMasterKey);
-                await _cryptoService.SetMasterKeyHashAsync(localMasterPasswordHash);
-                await _cryptoService.SetMasterKeyEncryptedUserKeyAsync(newProtectedUserKey.EncryptedString);
-                await _cryptoService.SetUserPrivateKeyAsync(newProtectedPrivateKey.EncryptedString);
+                await _cryptoService.SetKeyAsync(key);
+                await _cryptoService.SetKeyHashAsync(localMasterPasswordHash);
+                await _cryptoService.SetEncKeyAsync(encKey.Item2.EncryptedString);
+                await _cryptoService.SetEncPrivateKeyAsync(keys.Item2.EncryptedString);

                if (ResetPasswordAutoEnroll)
                {
                    // Grab Organization Keys
                    var response = await _apiService.GetOrganizationKeysAsync(OrgId);
                    var publicKey = CoreHelpers.Base64UrlDecode(response.PublicKey);
-                    // Grab User Key and encrypt with Org Public Key
-                    var userKey = await _cryptoService.GetUserKeyAsync();
-                    var encryptedKey = await _cryptoService.RsaEncryptAsync(userKey.Key, publicKey);
+                    // Grab user's Encryption Key and encrypt with Org Public Key
+                    var userEncKey = await _cryptoService.GetEncKeyAsync();
+                    var encryptedKey = await _cryptoService.RsaEncryptAsync(userEncKey.Key, publicKey);
                    // Request
                    var resetRequest = new OrganizationUserResetPasswordEnrollmentRequest
                    {
--- a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
+++ b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
@@ -4,7 +4,6 @@ using Bit.App.Controls;
 using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.Forms;

@@ -25,23 +24,19 @@ namespace Bit.App.Pages
        {
            InitializeComponent();
            SetActivityIndicator();
+            _authingWithSso = authingWithSso ?? false;
            _appOptions = appOptions;
            _orgIdentifier = orgIdentifier;
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _vm = BindingContext as TwoFactorPageViewModel;
            _vm.Page = this;
-            _vm.AuthingWithSso = authingWithSso ?? false;
            _vm.StartSetPasswordAction = () =>
                Device.BeginInvokeOnMainThread(async () => await StartSetPasswordAsync());
            _vm.TwoFactorAuthSuccessAction = () =>
-                Device.BeginInvokeOnMainThread(async () => await TwoFactorAuthSuccessToMainAsync());
-            _vm.LockAction = () =>
-                Device.BeginInvokeOnMainThread(TwoFactorAuthSuccessWithSSOLocked);
+                Device.BeginInvokeOnMainThread(async () => await TwoFactorAuthSuccessAsync());
            _vm.UpdateTempPasswordAction =
                () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
-            _vm.StartDeviceApprovalOptionsAction =
-                () => Device.BeginInvokeOnMainThread(async () => await StartDeviceApprovalOptionsAsync());
            _vm.CloseAction = async () => await Navigation.PopModalAsync();
            DuoWebView = _duoWebView;
            if (Device.RuntimePlatform == Device.Android)
@@ -185,25 +180,21 @@ namespace Bit.App.Pages
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

-        private async Task StartDeviceApprovalOptionsAsync()
+        private async Task TwoFactorAuthSuccessAsync()
        {
-            var page = new LoginApproveDevicePage();
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
-        private void TwoFactorAuthSuccessWithSSOLocked()
-        {
-            Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
-        }
-
-        private async Task TwoFactorAuthSuccessToMainAsync()
-        {
-            if (AppHelpers.SetAlternateMainPage(_appOptions))
+            if (_authingWithSso)
            {
-                return;
+                Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
+            }
+            else
+            {
+                if (AppHelpers.SetAlternateMainPage(_appOptions))
+                {
+                    return;
+                }
+                var previousPage = await AppHelpers.ClearPreviousPage();
+                Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
            }
-            var previousPage = await AppHelpers.ClearPreviousPage();
-            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
        }

        private void Token_TextChanged(object sender, TextChangedEventArgs e)
--- a/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
+++ b/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
@@ -11,7 +11,6 @@ using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Request;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -33,9 +32,8 @@ namespace Bit.App.Pages
        private readonly IStateService _stateService;
        private readonly II18nService _i18nService;
        private readonly IAppIdService _appIdService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
        private readonly ILogger _logger;
-        private readonly IDeviceTrustCryptoService _deviceTrustCryptoService;
+
        private TwoFactorProviderType? _selectedProviderType;
        private string _totpInstruction;
        private string _webVaultUrl = "https://vault.bitwarden.com";
@@ -56,9 +54,7 @@ namespace Bit.App.Pages
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
            _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
-            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>();
            _logger = ServiceContainer.Resolve<ILogger>();
-            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();

            PageTitle = AppResources.TwoStepLogin;
            SubmitCommand = new Command(async () => await SubmitAsync());
@@ -73,8 +69,6 @@ namespace Bit.App.Pages

        public bool Remember { get; set; }

-        public bool AuthingWithSso { get; set; }
-
        public string Token { get; set; }

        public bool DuoMethod => SelectedProviderType == TwoFactorProviderType.Duo ||
@@ -124,8 +118,6 @@ namespace Bit.App.Pages
        public Command SubmitCommand { get; }
        public ICommand MoreCommand { get; }
        public Action TwoFactorAuthSuccessAction { get; set; }
-        public Action LockAction { get; set; }
-        public Action StartDeviceApprovalOptionsAction { get; set; }
        public Action StartSetPasswordAction { get; set; }
        public Action CloseAction { get; set; }
        public Action UpdateTempPasswordAction { get; set; }
@@ -323,7 +315,6 @@ namespace Bit.App.Pages

                var task = Task.Run(() => _syncService.FullSyncAsync(true));
                await _deviceActionService.HideLoadingAsync();
-                var decryptOptions = await _stateService.GetAccountDecryptionOptions();
                _messagingService.Send("listenYubiKeyOTP", false);
                _broadcasterService.Unsubscribe(nameof(TwoFactorPage));

@@ -335,38 +326,9 @@ namespace Bit.App.Pages
                {
                    UpdateTempPasswordAction?.Invoke();
                }
-                else if (decryptOptions?.TrustedDeviceOption != null)
-                {
-                    // If user doesn't have a MP, but has reset password permission, they must set a MP
-                    if (!decryptOptions.HasMasterPassword &&
-                        decryptOptions.TrustedDeviceOption.HasManageResetPasswordPermission)
-                    {
-                        StartSetPasswordAction?.Invoke();
-                    }
-                    else if (result.ForcePasswordReset)
-                    {
-                        UpdateTempPasswordAction?.Invoke();
-                    }
-                    else if (await _deviceTrustCryptoService.IsDeviceTrustedAsync())
-                    {
-                        if (decryptOptions.TrustedDeviceOption.EncryptedPrivateKey == null && decryptOptions.TrustedDeviceOption.EncryptedUserKey == null)
-                        {
-                            await _deviceTrustCryptoService.RemoveTrustedDeviceAsync();
-                            StartDeviceApprovalOptionsAction?.Invoke();
-                        }
-                        else
-                        {
-                            await TwoFactorAuthSuccessAsync();
-                        }
-                    }
-                    else
-                    {
-                        StartDeviceApprovalOptionsAction?.Invoke();
-                    }
-                }
                else
                {
-                    await TwoFactorAuthSuccessAsync();
+                    TwoFactorAuthSuccessAction?.Invoke();
                }
            }
            catch (ApiException e)
@@ -460,17 +422,5 @@ namespace Bit.App.Pages
                return false;
            }
        }
-
-        public async Task TwoFactorAuthSuccessAsync()
-        {
-            if (AuthingWithSso && await _vaultTimeoutService.IsLockedAsync())
-            {
-                LockAction?.Invoke();
-            }
-            else
-            {
-                TwoFactorAuthSuccessAction?.Invoke();
-            }
-        }
    }
 }
--- a/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
@@ -93,12 +93,12 @@ namespace Bit.App.Pages
            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
            var email = await _stateService.GetEmailAsync();

-            // Create new master key and hash new password
-            var masterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, email, kdfConfig);
-            var masterPasswordHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey);
+            // Create new key and hash new password
+            var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdfConfig);
+            var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key);

-            // Encrypt user key with new master key
-            var (userKey, newProtectedUserKey) = await _cryptoService.EncryptUserKeyWithMasterKeyAsync(masterKey);
+            // Create new encKey for the User
+            var newEncKey = await _cryptoService.RemakeEncKeyAsync(key);

            // Initiate API action
            try
@@ -108,10 +108,10 @@ namespace Bit.App.Pages
                switch (_reason)
                {
                    case ForcePasswordResetReason.AdminForcePasswordReset:
-                        await UpdateTempPasswordAsync(masterPasswordHash, newProtectedUserKey.EncryptedString);
+                        await UpdateTempPasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
                        break;
                    case ForcePasswordResetReason.WeakMasterPasswordOnLogin:
-                        await UpdatePasswordAsync(masterPasswordHash, newProtectedUserKey.EncryptedString);
+                        await UpdatePasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
                        break;
                    default:
                        throw new ArgumentOutOfRangeException();
@@ -155,7 +155,7 @@ namespace Bit.App.Pages

        private async Task UpdatePasswordAsync(string newMasterPasswordHash, string newEncKey)
        {
-            var currentPasswordHash = await _cryptoService.HashMasterKeyAsync(CurrentMasterPassword, null);
+            var currentPasswordHash = await _cryptoService.HashPasswordAsync(CurrentMasterPassword, null);

            var request = new PasswordRequest
            {
--- 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/ExportVaultPageViewModel.cs
+++ b/src/App/Pages/Settings/ExportVaultPageViewModel.cs
@@ -21,6 +21,7 @@ namespace Bit.App.Pages
        private readonly II18nService _i18nService;
        private readonly IExportService _exportService;
        private readonly IPolicyService _policyService;
+        private readonly IKeyConnectorService _keyConnectorService;
        private readonly IUserVerificationService _userVerificationService;
        private readonly IApiService _apiService;
        private readonly ILogger _logger;
@@ -44,7 +45,8 @@ namespace Bit.App.Pages
            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
            _exportService = ServiceContainer.Resolve<IExportService>("exportService");
            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
+            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
+            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>("userVerificationService");
            _apiService = ServiceContainer.Resolve<IApiService>("apiService");
            _logger = ServiceContainer.Resolve<ILogger>("logger");

@@ -65,7 +67,7 @@ namespace Bit.App.Pages
            _initialized = true;
            FileFormatSelectedIndex = FileFormatOptions.FindIndex(k => k.Key == "json");
            DisablePrivateVaultPolicyEnabled = await _policyService.PolicyAppliesToUser(PolicyType.DisablePersonalVaultExport);
-            UseOTPVerification = !await _userVerificationService.HasMasterPasswordAsync();
+            UseOTPVerification = await _keyConnectorService.GetUsesKeyConnector();

            if (UseOTPVerification)
            {
@@ -163,9 +165,9 @@ namespace Bit.App.Pages
                return;
            }

-            var verificationType = await _userVerificationService.HasMasterPasswordAsync()
-                ? VerificationType.MasterPassword
-                : VerificationType.OTP;
+            var verificationType = await _keyConnectorService.GetUsesKeyConnector()
+                ? VerificationType.OTP
+                : VerificationType.MasterPassword;
            if (!await _userVerificationService.VerifyUser(Secret, verificationType))
            {
                return;
--- a/src/App/Pages/Settings/OptionsPage.xaml
+++ b/src/App/Pages/Settings/OptionsPage.xaml
@@ -153,14 +153,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/SettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
@@ -29,7 +29,7 @@ namespace Bit.App.Pages
        private readonly IBiometricService _biometricService;
        private readonly IPolicyService _policyService;
        private readonly ILocalizeService _localizeService;
-        private readonly IUserVerificationService _userVerificationService;
+        private readonly IKeyConnectorService _keyConnectorService;
        private readonly IClipboardService _clipboardService;
        private readonly ILogger _loggerService;
        private readonly IPushNotificationService _pushNotificationService;
@@ -48,7 +48,6 @@ namespace Bit.App.Pages
        private bool _reportLoggingEnabled;
        private bool _approvePasswordlessLoginRequests;
        private bool _shouldConnectToWatch;
-        private bool _hasMasterPassword;
        private readonly static List<KeyValuePair<string, int?>> VaultTimeoutOptions =
            new List<KeyValuePair<string, int?>>
            {
@@ -89,7 +88,7 @@ namespace Bit.App.Pages
            _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
            _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
+            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
            _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
            _loggerService = ServiceContainer.Resolve<ILogger>("logger");
            _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>();
@@ -101,17 +100,12 @@ namespace Bit.App.Pages
            ExecuteSettingItemCommand = new AsyncCommand<SettingsPageListItem>(item => item.ExecuteAsync(), onException: _loggerService.Exception, allowsMultipleExecutions: false);
        }

-        private bool IsVaultTimeoutActionLockAllowed => _hasMasterPassword || _biometric || _pin;
-
        public ObservableRangeCollection<ISettingsPageListItem> GroupedItems { get; set; }

        public IAsyncCommand<SettingsPageListItem> ExecuteSettingItemCommand { get; }

        public async Task InitAsync()
        {
-            var decryptionOptions = await _stateService.GetAccountDecryptionOptions();
-            // set has true for backwards compatibility
-            _hasMasterPassword = decryptionOptions?.HasMasterPassword ?? true;
            _supportsBiometric = await _platformUtilsService.SupportsBiometricAsync();
            var lastSync = await _syncService.GetLastSyncAsync();
            if (lastSync != null)
@@ -130,17 +124,8 @@ namespace Bit.App.Pages
            _vaultTimeoutDisplayValue = _vaultTimeoutOptions.FirstOrDefault(o => o.Value == _vaultTimeout).Key;
            _vaultTimeoutDisplayValue ??= _vaultTimeoutOptions.Where(o => o.Value == CustomVaultTimeoutValue).First().Key;

-
-            var pinSet = await _vaultTimeoutService.GetPinLockTypeAsync();
-            _pin = pinSet != PinLockType.Disabled;
-            _biometric = await _vaultTimeoutService.IsBiometricLockSetAsync();
-            var timeoutAction = await _vaultTimeoutService.GetVaultTimeoutAction() ?? VaultTimeoutAction.Lock;
-            if (!IsVaultTimeoutActionLockAllowed && timeoutAction == VaultTimeoutAction.Lock)
-            {
-                timeoutAction = VaultTimeoutAction.Logout;
-                await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(_vaultTimeout, VaultTimeoutAction.Logout);
-            }
-            _vaultTimeoutActionDisplayValue = _vaultTimeoutActionOptions.FirstOrDefault(o => o.Value == timeoutAction).Key;
+            var action = await _vaultTimeoutService.GetVaultTimeoutAction() ?? VaultTimeoutAction.Lock;
+            _vaultTimeoutActionDisplayValue = _vaultTimeoutActionOptions.FirstOrDefault(o => o.Value == action).Key;

            if (await _policyService.PolicyAppliesToUser(PolicyType.MaximumVaultTimeout))
            {
@@ -152,6 +137,10 @@ namespace Bit.App.Pages
                    (t.Value > 0 || t.Value == CustomVaultTimeoutValue) &&
                    t.Value != null).ToList();
            }
+
+            var pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
+            _pin = pinSet.Item1 || pinSet.Item2;
+            _biometric = await _vaultTimeoutService.IsBiometricLockSetAsync();
            _screenCaptureAllowed = await _stateService.GetScreenCaptureAllowedAsync();

            if (_vaultTimeoutDisplayValue == null)
@@ -159,7 +148,8 @@ namespace Bit.App.Pages
                _vaultTimeoutDisplayValue = AppResources.Custom;
            }

-            _showChangeMasterPassword = IncludeLinksWithSubscriptionInfo() && await _userVerificationService.HasMasterPasswordAsync();
+            _showChangeMasterPassword = IncludeLinksWithSubscriptionInfo() &&
+                !await _keyConnectorService.GetUsesKeyConnector();
            _reportLoggingEnabled = await _loggerService.IsEnabled();
            _approvePasswordlessLoginRequests = await _stateService.GetApprovePasswordlessLoginsAsync();
            _shouldConnectToWatch = await _stateService.GetShouldConnectToWatchAsync();
@@ -333,7 +323,6 @@ namespace Bit.App.Pages
            }
            if (oldTimeout != newTimeout)
            {
-                await _cryptoService.RefreshKeysAsync();
                await Device.InvokeOnMainThreadAsync(BuildList);
            }
        }
@@ -398,11 +387,8 @@ namespace Bit.App.Pages
                // do nothing if we have a policy set
                return;
            }
-
-            var options = IsVaultTimeoutActionLockAllowed
-                ? _vaultTimeoutActionOptions.Select(o => CreateSelectableOption(o.Key, _vaultTimeoutActionDisplayValue == o.Key)).ToArray()
-                : _vaultTimeoutActionOptions.Where(o => o.Value == VaultTimeoutAction.Logout).Select(v => ToSelectedOption(v.Key)).ToArray();
-
+            var options = _vaultTimeoutActionOptions.Select(o =>
+                o.Key == _vaultTimeoutActionDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
            var selection = await Page.DisplayActionSheet(AppResources.VaultTimeoutAction,
                AppResources.Cancel, null, options);
            if (selection == null || selection == AppResources.Cancel)
@@ -442,7 +428,7 @@ namespace Bit.App.Pages
                if (!string.IsNullOrWhiteSpace(pin))
                {
                    var masterPassOnRestart = false;
-                    if (await _userVerificationService.HasMasterPasswordAsync())
+                    if (!await _keyConnectorService.GetUsesKeyConnector())
                    {
                        masterPassOnRestart = await _platformUtilsService.ShowDialogAsync(
                            AppResources.PINRequireMasterPasswordRestart, AppResources.UnlockWithPIN,
@@ -451,20 +437,19 @@ namespace Bit.App.Pages

                    var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
                    var email = await _stateService.GetEmailAsync();
-                    var pinKey = await _cryptoService.MakePinKeyAsync(pin, email, kdfConfig);
-                    var userKey = await _cryptoService.GetUserKeyAsync();
-                    var protectedPinKey = await _cryptoService.EncryptAsync(userKey.Key, pinKey);
-
-                    var encPin = await _cryptoService.EncryptAsync(pin);
-                    await _stateService.SetProtectedPinAsync(encPin.EncryptedString);
+                    var pinKey = await _cryptoService.MakePinKeyAysnc(pin, email, kdfConfig);
+                    var key = await _cryptoService.GetKeyAsync();
+                    var pinProtectedKey = await _cryptoService.EncryptAsync(key.Key, pinKey);

                    if (masterPassOnRestart)
                    {
-                        await _stateService.SetPinKeyEncryptedUserKeyEphemeralAsync(protectedPinKey);
+                        var encPin = await _cryptoService.EncryptAsync(pin);
+                        await _stateService.SetProtectedPinAsync(encPin.EncryptedString);
+                        await _stateService.SetPinProtectedKeyAsync(pinProtectedKey);
                    }
                    else
                    {
-                        await _stateService.SetPinKeyEncryptedUserKeyAsync(protectedPinKey);
+                        await _stateService.SetPinProtectedAsync(pinProtectedKey.EncryptedString);
                    }
                }
                else
@@ -474,8 +459,8 @@ namespace Bit.App.Pages
            }
            if (!_pin)
            {
+                await _cryptoService.ClearPinProtectedKeyAsync();
                await _vaultTimeoutService.ClearAsync();
-                await UpdateVaultTimeoutActionIfNeededAsync();
            }
            BuildList();
        }
@@ -504,10 +489,9 @@ namespace Bit.App.Pages
            else
            {
                await _stateService.SetBiometricUnlockAsync(null);
-                await UpdateVaultTimeoutActionIfNeededAsync();
            }
            await _stateService.SetBiometricLockedAsync(false);
-            await _cryptoService.RefreshKeysAsync();
+            await _cryptoService.ToggleKeyAsync();
            BuildList();
        }

@@ -851,11 +835,9 @@ namespace Bit.App.Pages
            return _vaultTimeoutOptions.FirstOrDefault(o => o.Key == key).Value;
        }

-        private string CreateSelectableOption(string option, bool selected) => selected ? ToSelectedOption(option) : option;
+        private string CreateSelectableOption(string option, bool selected) => selected ? $"✓ {option}" : option;

-        private bool CompareSelection(string selection, string compareTo) => selection == compareTo || selection == ToSelectedOption(compareTo);
-
-        private string ToSelectedOption(string option) => $"✓ {option}";
+        private bool CompareSelection(string selection, string compareTo) => selection == compareTo || selection == $"✓ {compareTo}";

        public async Task SetScreenCaptureAllowedAsync()
        {
@@ -887,17 +869,5 @@ namespace Bit.App.Pages
            await _watchDeviceService.SetShouldConnectToWatchAsync(_shouldConnectToWatch);
            BuildList();
        }
-
-        private async Task UpdateVaultTimeoutActionIfNeededAsync()
-        {
-            if (IsVaultTimeoutActionLockAllowed)
-            {
-                return;
-            }
-
-            _vaultTimeoutActionDisplayValue = _vaultTimeoutActionOptions.First(o => o.Value == VaultTimeoutAction.Logout).Key;
-            await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(_vaultTimeout, VaultTimeoutAction.Logout);
-            _deviceActionService.Toast(AppResources.VaultTimeoutActionChangedToLogOut);
-        }
    }
 }
--- a/src/App/Pages/TabsPage.cs
+++ b/src/App/Pages/TabsPage.cs
@@ -94,7 +94,7 @@ namespace Bit.App.Pages
                }
            });
            await UpdateVaultButtonTitleAsync();
-            if (await _keyConnectorService.UserNeedsMigrationAsync())
+            if (await _keyConnectorService.UserNeedsMigration())
            {
                _messagingService.Send("convertAccountToKeyConnector");
            }
--- a/src/App/Pages/Vault/AttachmentsPageViewModel.cs
+++ b/src/App/Pages/Vault/AttachmentsPageViewModel.cs
@@ -74,7 +74,7 @@ namespace Bit.App.Pages
            _cipherDomain = await _cipherService.GetAsync(CipherId);
            Cipher = await _cipherDomain.DecryptAsync();
            LoadAttachments();
-            _hasUpdatedKey = await _cryptoService.HasUserKeyAsync();
+            _hasUpdatedKey = await _cryptoService.HasEncKeyAsync();
            var canAccessPremium = await _stateService.CanAccessPremiumAsync();
            _canAccessAttachments = canAccessPremium || Cipher.OrganizationId != null;
            if (!_canAccessAttachments)
--- 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
@@ -223,17 +223,6 @@
                            AutomationId="RegeneratePasswordButton" />
                    </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" />
@@ -650,38 +639,6 @@
                            AutomationId="IdentityCountryEntry" />
                    </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">
--- a/src/App/Pages/Vault/CipherAddEditPage.xaml.cs
+++ b/src/App/Pages/Vault/CipherAddEditPage.xaml.cs
@@ -21,7 +21,7 @@ namespace Bit.App.Pages
        private readonly IDeviceActionService _deviceActionService;
        private readonly IAutofillHandler _autofillHandler;
        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly IUserVerificationService _userVerificationService;
+        private readonly IKeyConnectorService _keyConnectorService;

        private CipherAddEditPageViewModel _vm;
        private bool _fromAutofill;
@@ -43,7 +43,7 @@ namespace Bit.App.Pages
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
+            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");

            _appOptions = appOptions;
            _fromAutofill = fromAutofill;
@@ -175,8 +175,8 @@ namespace Bit.App.Pages
                    RequestFocus(_nameEntry);
                }
            });
-
-            _passwordPrompt.IsVisible = await _userVerificationService.HasMasterPasswordAsync();
+            // Hide password reprompt option if using key connector
+            _passwordPrompt.IsVisible = !await _keyConnectorService.GetUsesKeyConnector();
        }

        protected override void OnDisappearing()
--- 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,7 +45,7 @@
                         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">
@@ -179,7 +179,7 @@
                                    AutomationProperties.Name="{u:I18n ToggleVisibility}"
                                    AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
                                    IsVisible="{Binding Cipher.ViewPassword}"
-                                    AutomationId="ShowValueButton" />
+                                    AutomationId="ViewValueButton" />
                                <controls:IconButton
                                    StyleClass="box-row-button, box-row-button-platform"
                                    Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -195,16 +195,6 @@
                            </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">
@@ -579,64 +569,6 @@
                            </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">
--- 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/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/GroupingsPageListItem.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
@@ -60,9 +60,6 @@ namespace Bit.App.Pages
                        case CipherType.Identity:
                            _name = AppResources.TypeIdentity;
                            break;
-                        case CipherType.Fido2Key:
-                            _name = AppResources.Passkey;
-                            break;
                        default:
                            break;
                    }
@@ -111,9 +108,6 @@ namespace Bit.App.Pages
                        case CipherType.Identity:
                            _icon = BitwardenIcons.IdCard;
                            break;
-                        case CipherType.Fido2Key:
-                            _icon = BitwardenIcons.Passkey;
-                            break;
                        default:
                            _icon = BitwardenIcons.Globe;
                            break;
--- 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
@@ -418,15 +418,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Admin approval requested.
-        /// </summary>
-        public static string AdminApprovalRequested {
-            get {
-                return ResourceManager.GetString("AdminApprovalRequested", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to All.
        /// </summary>
@@ -562,15 +553,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>
@@ -580,24 +562,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Approve with master password.
-        /// </summary>
-        public static string ApproveWithMasterPassword {
-            get {
-                return ResourceManager.GetString("ApproveWithMasterPassword", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Approve with my other device.
-        /// </summary>
-        public static string ApproveWithMyOtherDevice {
-            get {
-                return ResourceManager.GetString("ApproveWithMyOtherDevice", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to April.
        /// </summary>
@@ -832,6 +796,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>
@@ -967,15 +940,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>
@@ -985,15 +949,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>
@@ -1273,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>
@@ -1318,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>
@@ -1615,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>
@@ -1732,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>
@@ -2227,15 +2146,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>
@@ -2389,15 +2299,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>
@@ -3046,24 +2947,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>
@@ -3406,15 +3289,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>
@@ -3433,15 +3307,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>
@@ -3721,15 +3586,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Logged in!.
-        /// </summary>
-        public static string LoggedIn {
-            get {
-                return ResourceManager.GetString("LoggedIn", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Logged in as {0} on {1}..
        /// </summary>
@@ -3748,15 +3604,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Logging in as {0}.
-        /// </summary>
-        public static string LoggingInAsX {
-            get {
-                return ResourceManager.GetString("LoggingInAsX", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Logging in as {0} on {1}.
        /// </summary>
@@ -3766,15 +3613,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Logging in on.
-        /// </summary>
-        public static string LoggingInOn {
-            get {
-                return ResourceManager.GetString("LoggingInOn", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Log In.
        /// </summary>
@@ -3793,15 +3631,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Login approved.
-        /// </summary>
-        public static string LoginApproved {
-            get {
-                return ResourceManager.GetString("LoginApproved", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Login attempt by {0} on {1}.
        /// </summary>
@@ -3841,7 +3670,7 @@ namespace Bit.App.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Login initiated.
+        ///   Looks up a localized string similar to Log in initiated.
        /// </summary>
        public static string LogInInitiated {
            get {
@@ -3939,24 +3768,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Log in with device.
-        /// </summary>
-        public static string LogInWithDevice {
-            get {
-                return ResourceManager.GetString("LogInWithDevice", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Log in with device must be set up in the settings of the Bitwarden app. Need another option?.
-        /// </summary>
-        public static string LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption {
-            get {
-                return ResourceManager.GetString("LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Log in with master password.
        /// </summary>
@@ -4407,15 +4218,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>
@@ -4903,33 +4705,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>
@@ -5417,15 +5192,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Remember this device.
-        /// </summary>
-        public static string RememberThisDevice {
-            get {
-                return ResourceManager.GetString("RememberThisDevice", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Remove.
        /// </summary>
@@ -5498,15 +5264,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Request admin approval.
-        /// </summary>
-        public static string RequestAdminApproval {
-            get {
-                return ResourceManager.GetString("RequestAdminApproval", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Request one-time password.
        /// </summary>
@@ -6362,24 +6119,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);
-            }
-        }
-        
-        /// <summary>
-        ///   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>
@@ -6398,15 +6137,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>
@@ -6434,16 +6164,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>
@@ -6534,15 +6254,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Trouble logging in?.
-        /// </summary>
-        public static string TroubleLoggingIn {
-            get {
-                return ResourceManager.GetString("TroubleLoggingIn", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Try again.
        /// </summary>
@@ -6552,15 +6263,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Turn off using a public device.
-        /// </summary>
-        public static string TurnOffUsingPublicDevice {
-            get {
-                return ResourceManager.GetString("TurnOffUsingPublicDevice", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to 20 seconds.
        /// </summary>
@@ -6885,15 +6587,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>
@@ -6903,15 +6596,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>
@@ -7092,15 +6776,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Vault timeout action changed to log out.
-        /// </summary>
-        public static string VaultTimeoutActionChangedToLogOut {
-            get {
-                return ResourceManager.GetString("VaultTimeoutActionChangedToLogOut", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Your organization policies have set your vault timeout action to {0}..
        /// </summary>
@@ -7443,15 +7118,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>
@@ -7479,24 +7145,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Your request has been sent to your admin..
-        /// </summary>
-        public static string YourRequestHasBeenSentToYourAdmin {
-            get {
-                return ResourceManager.GetString("YourRequestHasBeenSentToYourAdmin", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to You will be notified once approved. .
-        /// </summary>
-        public static string YouWillBeNotifiedOnceApproved {
-            get {
-                return ResourceManager.GetString("YouWillBeNotifiedOnceApproved", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to To continue, hold your YubiKey NEO against the back of the device or insert your YubiKey into your device&apos;s USB port, then touch its button..
        /// </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>
@@ -2627,90 +2630,16 @@ Wil u na die rekening omskakel?</value>
  <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>
+    <value>Master password re-prompt help</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>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Ongeldige API-sleutel</value>
+    <value>Invalid API key</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>Invalid API token</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>
@@ -2628,34 +2631,6 @@
  <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>
@@ -2668,50 +2643,4 @@
  <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>
@@ -2626,34 +2629,6 @@ Bu hesaba keçmək istəyirsiniz?</value>
  <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>
@@ -2666,50 +2641,4 @@ Bu hesaba keçmək istəyirsiniz?</value>
  <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/src/App/Resources/AppResources.be.resx
+++ b/src/App/Resources/AppResources.be.resx
@@ -1584,6 +1584,9 @@
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Аўтазапаўненне заблакіраваных URI</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Аўтазапаўненне не будзе прапаноўвацца для заблакіраваных URI. Раздзяляйце некалькі URI з дапамогай коскі. Напрыклад: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Пытацца пры дадаванні лагіна</value>
  </data>
@@ -2627,34 +2630,6 @@
  <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>Праграма</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>Дапамога з паўторным запытам асноўнага пароля</value>
  </data>
@@ -2667,50 +2642,4 @@
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Памылковы токен API</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>Блакіраваць аўтазапаўненне</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Аўтазапаўненне для гэтых URI прапаноўвацца не будзе.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Новы заблакіраваны URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI захаваны</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Памылковы фармат. Выкарыстоўвайце https://, http:// або androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Рэдагаваць URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Увесці URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Фармат: {0}. Раздзяліце некалькі значэнняў URI коскай.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Фармат: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Памылковы URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI выдалены</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Заблакіраваных URI пакуль няма</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>Гэты URI {0} ужо заблакіраваны</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Немагчыма рэдагаваць некалькі URI адначасова</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.bg.resx
+++ b/src/App/Resources/AppResources.bg.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>
@@ -2627,34 +2630,6 @@ select Add TOTP to store the key safely</value>
  <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>Създадено на {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>Приложение</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>Копиране на приложението</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Налично за двустепенно удостоверяване</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Помощ за повторното запитване за главната парола</value>
  </data>
@@ -2667,50 +2642,4 @@ select Add TOTP to store the key safely</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Неправилен идентификатор за ППИ</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>Блокиране на авт. попълване</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Автоматичното попълване няма да бъде предлагано за тези адреси.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Нов блокиран адрес</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>Адресът е запазен</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Неправилен формат. Използвайте https://, http:// или androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Редактиране на адреса</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Въведете адрес</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Формат: {0}. Ако въвеждате повече адреси, разделяйте ги със запетая.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Формат: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Неправилен адрес</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>Адресът е премахнат</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Няма блокирани адреси</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>Адресът {0} вече е блокиран</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Не може да редактирате повече от един адрес едновременно</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.bn.resx
+++ b/src/App/Resources/AppResources.bn.resx
@@ -1585,6 +1585,9 @@ Scanning will happen automatically.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-fill blocked URIs</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ask to add login</value>
  </data>
@@ -2628,34 +2631,6 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2668,50 +2643,4 @@ Do you want to switch to this account?</value>
  <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.bs.resx
+++ b/src/App/Resources/AppResources.bs.resx
@@ -1585,6 +1585,9 @@ Skeniranje će biti izvršeno automatski.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-popunjavanje blokiranih URI-ja</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-popunjavanje neće biti ponuđeno za blokirane URI-je. Odvoji višestruke URI-je zarezom. Npr. „https://twitter.com, androidapp://com.twitter.android”.</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Upitaj za dodavanje prijave</value>
  </data>
@@ -2626,34 +2629,6 @@ Skeniranje će biti izvršeno automatski.</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2666,50 +2641,4 @@ Skeniranje će biti izvršeno automatski.</value>
  <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.ca.resx
+++ b/src/App/Resources/AppResources.ca.resx
@@ -1585,6 +1585,9 @@ L'escaneig es farà automàticament.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Emplena automàticament els URI bloquejats</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>L'emplenament automàtic no s'oferirà per als URI bloquejats. Separeu diversos URI amb una coma. Per exemple: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Sol·licita afegir els inicis de sessió</value>
  </data>
@@ -2627,34 +2630,6 @@ Voleu canviar a aquest compte?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Contrasenya mestra actual</value>
  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Clau de pas</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Claus de pas</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Creats {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>Aplicació</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>No podeu editar l'aplicació de clau de pas perquè invalidaria la clau de pas</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>La clau de pas no es copiarà</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>La clau de pas no es copiarà a l'element clonat. Voleu continuar clonant aquest element?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copia la aplicació</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Disponible per iniciar sessió en dos passos</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Ajuda per tornar a demanar la contrasenya mestra</value>
  </data>
@@ -2667,50 +2642,4 @@ Voleu canviar a aquest compte?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Token API no vàlid</value>
  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Aquest element no es pot compartir amb l'organització perquè ja n'hi ha un amb la mateixa clau de pas.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Bloqueja l'emplenament automàtic</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>L'emplenament automàtic no s'oferirà per a aquests URI.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Nou URI bloquejat</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI guardat</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Format no vàlid. Utilitzeu https://, http:// o androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edita URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Introduex URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separa diversos URI amb una coma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>URI no vàlid</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI suprimit</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>No hi ha cap URI bloquejat</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>L'URI {0} ja està bloquejat</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>No es poden editar diversos URI alhora</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.cs.resx
+++ b/src/App/Resources/AppResources.cs.resx
@@ -1585,6 +1585,9 @@ Načtení proběhne automaticky.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Automatické vyplňování blokovaných URI</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Automatické vyplňování nebude pro blokované URI nabídnuto. Více URI oddělte čárkou. Například: "https://twitter.com,androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ptát se na přidání přihlášení</value>
  </data>
@@ -2626,34 +2629,6 @@ Chcete se přepnout na tento účet?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Aktuální hlavní heslo</value>
  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Přístupový klíč</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Přístupové klíče</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Vytvořeno {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>Aplikace</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>Nemůžete upravovat aplikaci pro přístupové klíče, protože by to zneplatnilo přístupový klíč</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Přístupový klíč nebude zkopírován</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>Přístupový klíč nebude zkopírován do duplikované položky. Chete pokračovat v duplikování této položky?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Kopírovat aplikaci</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Dostupné pro dvoufázové přihlášení</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Nápověda pro znovuzeptání se na hlavní heslo</value>
  </data>
@@ -2666,50 +2641,4 @@ Chcete se přepnout na tento účet?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Neplatný token API</value>
  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Tuto položku nelze sdílet s organizací, protože již existuje jedna se stejným přístupovým klíčem.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Blokovat automatické vyplňování</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Pro tento URI nebude nabízeno automatické vyplňování.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Nový blokovaný URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI byl uložen</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Neplatný formát. Použijte https://, http:// nebo androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Upravit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Zadat URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Formát: {0}. Oddělte více URI čárkou.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Formát: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Neplatný URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI byl odebrán</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Nejsou žádné blokované URI</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI {0} je již blokován</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Najednou nelze upravovat více URI</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.cy.resx
+++ b/src/App/Resources/AppResources.cy.resx
--- a/src/App/Resources/AppResources.da.resx
+++ b/src/App/Resources/AppResources.da.resx
@@ -1585,6 +1585,9 @@ Skanning vil ske automatisk.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Autoudfyld blokerede URI'er</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Autoudfyldning tilbydes ikke for blokerede URI'er. Adskil flere URI'er med komma. F.eks.: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Spørg om at tilføje login</value>
  </data>
@@ -2627,34 +2630,6 @@ Vil du skifte til denne konto?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Aktuel hovedadgangskode</value>
  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Adgangsnøgle</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Adgangsnøgler</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Oprettet {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>Applikation</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>Adgangsnøgleapplikationen kan ikke redigeres, da det ville ugyldiggøre adgangsnøglen</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Adgangsnøglen kopieres ikke</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>Adgangsnøglen kopieres ikke til det klonede emne. Fortsæt med at klone dette emne alligevel?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Kopiér applikation</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Tilgængelig for totrins-login</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Hjælp til genanmodning om hovedadgangskode</value>
  </data>
@@ -2667,50 +2642,4 @@ Vil du skifte til denne konto?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Ugyldigt API-token</value>
  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Dette emne kan ikke deles med organisationen, da der allerede er et med den samme adgangsnøgle.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Blokér autoudfyldning</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Autoudfyldning vil ikke blive tilbudt for disse URI'er.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Ny blokeret URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI gemt</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Ugyldigt format. Brug https://, http:// eller androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Redigér URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Angiv URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separér flere URI'er med komma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Ugyldig URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI fjernet</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Der er ingen blokerede URI'er</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI'en {0} er allerede blokeret</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Kan ikke redigere flere URI'er på én gang</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.de.resx
+++ b/src/App/Resources/AppResources.de.resx
@@ -1083,7 +1083,7 @@ Das Scannen erfolgt automatisch.</value>
    <value>Vollständiger Name</value>
  </data>
  <data name="LicenseNumber" xml:space="preserve">
-    <value>Lizenznummer</value>
+    <value>Führerscheinnummer</value>
  </data>
  <data name="March" xml:space="preserve">
    <value>März</value>
@@ -1585,6 +1585,9 @@ Das Scannen erfolgt automatisch.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Blockierte URIs automatisch ausfüllen</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-Ausfüllen wird für blockierte URIs nicht angeboten. Trenne mehrere URIs mit einem Komma. Beispiel: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Nach dem Hinzufügen von Zugangsdaten fragen</value>
  </data>
@@ -2626,34 +2629,6 @@ Möchtest du zu diesem Konto wechseln?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Aktuelles Master-Passwort</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>Erstellt am {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>Anwendung</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>Du kannst die Passkey-Anwendung nicht bearbeiten, da dies den Passkey ungültig machen würde.</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey wird nicht kopiert</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>Der Passkey wird nicht in den duplizierten Eintrag kopiert. Möchtest du mit dem Duplizieren dieses Eintrags fortfahren?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Anwendung kopieren</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Verfügbar für Zwei-Faktor Authentifizierung</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Hilfe zum erneuten Abfragen des Master-Passworts</value>
  </data>
@@ -2666,50 +2641,4 @@ Möchtest du zu diesem Konto wechseln?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Ungültiger API-Token</value>
  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Dieser Eintrag kann nicht mit der Organisation geteilt werden, da bereits einer mit dem gleichen Passkey existiert.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Auto-Ausfüllen blockieren</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-Ausfüllen wird für diese URIs nicht angeboten.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Neue gesperrte URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI gespeichert</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Ungültiges Format. Verwende https://, http://, oder androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>URI bearbeiten</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>URI eingeben</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Trenne mehrere URIs mit einem Komma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Ungültige URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI entfernt</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Es gibt keine gesperrten URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>Die URI {0} ist bereits gesperrt</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Es können nicht mehrere URIs auf einmal bearbeitet werden</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.el.resx
+++ b/src/App/Resources/AppResources.el.resx
@@ -1585,6 +1585,9 @@
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Αυτόματη συμπλήρωση μπλοκαρισμένων URIs</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Η αυτόματη συμπλήρωση δεν θα προσφερθεί για μπλοκαρισμένα URI. Ξεχωρίστε πολλαπλά URI με κόμμα. Για παράδειγμα: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ζητήστε να προσθέστε σύνδεση</value>
  </data>
@@ -2627,34 +2630,6 @@
  <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>Δημιουργήθηκε {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>
@@ -2662,55 +2637,9 @@
    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Μη έγκυρο κλειδί API</value>
+    <value>Invalid API key</value>
  </data>
  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Μη έγκυρο 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>
+    <value>Invalid API token</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.en-GB.resx
+++ b/src/App/Resources/AppResources.en-GB.resx
@@ -1585,6 +1585,9 @@ Scanning will happen automatically.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-fill blocked URIs</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ask to add login</value>
  </data>
@@ -2627,34 +2630,6 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2667,50 +2642,4 @@ Do you want to switch to this account?</value>
  <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.en-IN.resx
+++ b/src/App/Resources/AppResources.en-IN.resx
@@ -1585,6 +1585,9 @@ Scanning will happen automatically.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-fill blocked URIs</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ask to add login</value>
  </data>
@@ -2641,34 +2644,6 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2681,50 +2656,4 @@ Do you want to switch to this account?</value>
  <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.es.resx
+++ b/src/App/Resources/AppResources.es.resx
@@ -1585,6 +1585,9 @@ El escaneo se realizará automáticamente.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Autorellenar URIs bloqueadas</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>El autorrelleno no se ofrecerá para URIs bloqueadas. Separe múltiples URIs con una coma. Por ejemplo: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Pedir que se añada el inicio de sesión</value>
  </data>
@@ -2628,34 +2631,6 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Contraseña maestra actual</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>Ayuda de volver a pedir contraseña maestra</value>
  </data>
@@ -2668,50 +2643,4 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Token de API no válido</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.et.resx
+++ b/src/App/Resources/AppResources.et.resx
@@ -1585,6 +1585,9 @@ Skaneerimine toimub automaatselt.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Täida blokeeritud URId automaatselt</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Blokeeritud URIdele ei pakuta automaattäidet. Eralda erinevad URId komaga. Nt nagu: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Küsi "Lisa konto andmed"</value>
  </data>
@@ -2627,39 +2630,11 @@ Soovid selle konto peale lülituda?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Praegune ülemparool</value>
  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Pääsukood</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Pääsukoodid</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Loodud {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>Rakendus</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>Pääsukoodi rakenduse muutmine ei ole võimalik, sest see muudaks pääsukoodi mitte-töötavaks</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Pääsukoodi ei kopeerita</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>Pääsukoodi ei kopeerita kloonitud kirjele. Oled kindel, et soovid jätkata?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Kopeeri rakendus</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Saadaval kaheastmelise kinnitamise jaoks</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Avamine võib ebapiisava mälu tõttu nurjuda. Probleemi lahendamiseks vähenda KDF mälu seadeid.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Vigane API võti</value>
@@ -2667,50 +2642,4 @@ Soovid selle konto peale lülituda?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Vigane API token</value>
  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Seda kirjet ei saa organisatsiooniga jagada, sest sama pääsukoodiga kirje juba eksisteerib.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Automaatse täitmise keelamine</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Automaattäitmist ei pakuta nende URId-e puhul.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Uus blokeeritud URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI salvestatud</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Vale vorming. Kasuta https://, http://, või androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Muuda URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Sisesta URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Vorming: {0}. Eralda mitu URI-t komadega.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Vorming: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Vale URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI eemaldatud</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Puuduvad keelatud URI-d</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI {0} on juba keelatud</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Mitme URI korraga muutmine ei toiminud</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.eu.resx
+++ b/src/App/Resources/AppResources.eu.resx
@@ -1584,6 +1584,9 @@
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-bete blokeatutako URI-ak</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Blokeatutako URI-ei ez zaie berez auto-betetzea eskainiko. Koma batekin URI-ak bereizi. Adibidez: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Galdetu saio-hasiera gehitzeko</value>
  </data>
@@ -2612,10 +2615,10 @@ Kontu honetara aldatu nahi duzu?</value>
    <value>EU</value>
  </data>
  <data name="SelfHosted" xml:space="preserve">
-    <value>Norberak ostatatua</value>
+    <value>Self-hosted</value>
  </data>
  <data name="DataRegion" xml:space="preserve">
-    <value>Data eskualdea</value>
+    <value>Data region</value>
  </data>
  <data name="Region" xml:space="preserve">
    <value>Eskualdea</value>
@@ -2626,34 +2629,6 @@ Kontu honetara aldatu nahi duzu?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Uneko pasahitz nagusia</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>
@@ -2661,55 +2636,9 @@ Kontu honetara aldatu nahi duzu?</value>
    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>API giltza baliogabea</value>
+    <value>Invalid API key</value>
  </data>
  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>API kode baliogabia</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>Invalid API token</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.fa.resx
+++ b/src/App/Resources/AppResources.fa.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>
@@ -2628,34 +2631,6 @@
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>کلمه عبور اصلی فعلی</value>
  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>کلید عبور</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>کلیدهای عبور</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>{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>درخواست</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>شما نمی‌توانید برنامه کلید عبور را ویرایش کنید زیرا باعث بی اعتباری کلید عبور می‌شود</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>کلید عبور کپی نمی‌شود</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>کلید عبور در مورد شبیه سازی شده کپی نمی‌شود. آیا می‌خواهید به شبیه سازی این مورد ادامه دهید؟</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>درخواست را کپی کنید</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>برای ورود دو مرحله ای موجود است</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>راهنمای درخواست مجدد کلمه عبور اصلی</value>
  </data>
@@ -2663,55 +2638,9 @@
    <value>باز کردن قفل ممکن است به دلیل حافظه ناکافی انجام شود. تنظیمات حافظه KDF خود را کاهش دهید تا حل شود.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>کلید API نامعتبر</value>
+    <value>Invalid API key</value>
  </data>
  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>توکن API نامعتبر</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>این مورد را نمی‌توان با سازمان به اشتراک گذاشت زیرا قبلاً موردی با کلید عبور یکسان وجود دارد.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>پر کردن خودکار را مسدود کنید</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>پر کردن خودکار برای این نشانی‌های اینترنتی ارائه نمی‌شود.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>نشانی اینترنتی مسدود شده جدید</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>نشانی اینترنتی ذخیره شد</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>قالب نامعتبر است. از https://، http://، یا androidapp:// استفاده کنید</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>ویرایش نشانی اینترنتی</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>ورود نشانی اینترنتی</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>قالب: {0}. چندین نشانی اینترنتی را با کاما جدا کنید.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>قالب: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>نشانی اینترنتی نامعتبر</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>نشانی اینترنتی حذف شد</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>هیچ نشانی اینترنتی مسدود شده ای وجود ندارد</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>{0} نشانی اینترنتی قبلاً مسدود شده است</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>نمی‌توان چندین نشانی اینترنتی را همزمان ویرایش کرد</value>
+    <value>Invalid API token</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.fi.resx
+++ b/src/App/Resources/AppResources.fi.resx
@@ -727,7 +727,7 @@
    <value>Näytä kohde</value>
  </data>
  <data name="WebVault" xml:space="preserve">
-    <value>Bitwarden Verkkoholvi</value>
+    <value>Bitwardenin verkkoholvi</value>
  </data>
  <data name="Lost2FAApp" xml:space="preserve">
    <value>Etkö pysty käyttämään todennussovellustasi?</value>
@@ -1489,7 +1489,7 @@ Koodi luetaan automaattisesti.</value>
    <value>30 minuuttia</value>
  </data>
  <data name="SetPINDescription" xml:space="preserve">
-    <value>Aseta PIN-koodi Bitwardenin avaukselle. PIN-asetus tyhjentyy, jos kirjaudut kokonaan ulos sovelluksesta.</value>
+    <value>Aseta PIN-koodi Bitwardenin avaukselle. PIN-asetukset tyhjentyvät, jos kirjaudut kokonaan ulos sovelluksesta.</value>
  </data>
  <data name="LoggedInAsOn" xml:space="preserve">
    <value>Kirjautui palvelimelle {1} tunnuksella {0}.</value>
@@ -1585,8 +1585,11 @@ Koodi luetaan automaattisesti.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Täytä estetyt URI:t automaattisesti</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Automaattista täyttöä ei tarjota estetyille URI-osoitteille. Erota useat osoitteet pilkuilla. Esimerkiksi: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
-    <value>Kysy lisätäänkö kirjautumistieto</value>
+    <value>Kysy lisätäänkö kirjautimistieto</value>
  </data>
  <data name="AskToAddLoginDescription" xml:space="preserve">
    <value>Kysy lisätäänkö uusi kohde, jos holvissa ei vielä ole sopivaa kohdetta.</value>
@@ -2364,7 +2367,7 @@ turvallisesti valitsemalla "Lisää TOTP"</value>
    <value>Hyväksy kirjautumispyyntöjä</value>
  </data>
  <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>Hyväksy kirjautumispyyntöjä tällä laitteella</value>
+    <value>Hyväksy laitteiden kirjautumispyyntöjä tältä laitteelta</value>
  </data>
  <data name="AllowNotifications" xml:space="preserve">
    <value>Salli ilmoitukset</value>
@@ -2628,34 +2631,6 @@ Haluatko vaihtaa tähän tiliin?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Nykyinen pääsalasana</value>
  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Suojausavain</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Suojausavaimet</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Luotu {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>Sovellus</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>Et voi muokata suojausavainsovellusta, koska se mitätöisi avaimen.</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Suojausavainta ei kopioida</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>Suojausavainta ei kopioida kloonattuun kohteeseen. Haluatko jatkaa kloonausta?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Kopioi sovellus</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Käytettävissä kaksivaiheiseen kirjautumiseen</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Pääsalasanan uudelleenkyselyn ohje</value>
  </data>
@@ -2668,50 +2643,4 @@ Haluatko vaihtaa tähän tiliin?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Virheellinen API-tunniste</value>
  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Kohdetta ei voida jakaa organisaatiolle, koska siellä on jo samaa suojausavainta käyttävä kohde.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Estä automaattinen täyttö</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Automaattista täyttöä ei tarjota näille URI-osoitteille.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Uusi estetty URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI tallennettiin</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Virheellinen muoto. Käytä muotoa https://, http:// tai androidapp://.</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Muokkaa URI:a</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Syötä URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Muoto: {0}. Erota useita URI-osoitteita pilkuilla.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Muoto: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Virheellinen URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI poistettiin</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Estettyjä URI-osoitteita ei ole</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI {0} on jo estetty</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Useita URI-osoitteita ei ole mahdollista muokata samanaikaisesti</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.fil.resx
+++ b/src/App/Resources/AppResources.fil.resx
@@ -1585,6 +1585,9 @@ Awtomatikong itong magsa-scan.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Mga URI na hindi io-autofill-an</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Hindi iaalok ang autofill sa mga naharang na URI. Paghiwalayin ang mga URI gamit ang kuwit. Halimbawa: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Magpaalam para magdagdag ng login</value>
  </data>
@@ -2628,34 +2631,6 @@ Gusto mo bang pumunta sa account na ito?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2668,50 +2643,4 @@ Gusto mo bang pumunta sa account na ito?</value>
  <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.fr.resx
+++ b/src/App/Resources/AppResources.fr.resx
@@ -1585,6 +1585,9 @@ La numérisation se fera automatiquement.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Saisie automatique des URIs bloqués</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>La saisie automatique ne sera pas proposée pour les URI bloqués. Séparez plusieurs URI par une virgule. Par exemple : "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Demander pour ajouter un identifiant</value>
  </data>
@@ -2628,34 +2631,6 @@ Voulez-vous basculer vers ce compte ?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Mot de passe principal actuel</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>Copier l'application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Aide sur la ressaisie du mot de passe principal</value>
  </data>
@@ -2668,50 +2643,4 @@ Voulez-vous basculer vers ce compte ?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Jeton API invalide</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>Bloquer la saisie automatique</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>La saisie automatique ne sera pas proposée pour ces URI.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Nouveau URI bloqué</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI enregistré</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Format invalide. Utilisez https://, http://, ou androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Modifier l'URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Saisir l'URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format : {0}. Séparez les URI multiples par une virgule.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format : {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>URI incorrect</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI supprimé</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Il n'y a pas d'URI bloqués</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>L'URI {0} est déjà bloqué</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Impossible de modifier des URI multiples à la fois</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.gl.resx
+++ b/src/App/Resources/AppResources.gl.resx
@@ -1585,6 +1585,9 @@ Scanning will happen automatically.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-fill blocked URIs</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ask to add login</value>
  </data>
@@ -2628,34 +2631,6 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2668,50 +2643,4 @@ Do you want to switch to this account?</value>
  <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.he.resx
+++ b/src/App/Resources/AppResources.he.resx
@@ -1587,6 +1587,9 @@ Scanning will happen automatically.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-fill blocked URIs</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ask to add login</value>
  </data>
@@ -2630,34 +2633,6 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2670,50 +2645,4 @@ Do you want to switch to this account?</value>
  <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.hi.resx
+++ b/src/App/Resources/AppResources.hi.resx
@@ -1585,6 +1585,9 @@ Scanning will happen automatically.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-fill blocked URIs</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ask to add login</value>
  </data>
@@ -2628,34 +2631,6 @@ Do you want to switch to this account?</value>
  <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>
@@ -2668,50 +2643,4 @@ Do you want to switch to this account?</value>
  <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.hr.resx
+++ b/src/App/Resources/AppResources.hr.resx
@@ -1584,6 +1584,9 @@
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-ispuna blokiranih URI-ja</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-ispuna neće biti ponuđena za blokirane URI-je. Odvoji višestruke URI-je zarezom. Npr. „https://twitter.com, androidapp://com.twitter.android”</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Upitaj za dodavanje prijave</value>
  </data>
@@ -2625,34 +2628,6 @@
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2665,50 +2640,4 @@
  <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.hu.resx
+++ b/src/App/Resources/AppResources.hu.resx
@@ -1584,6 +1584,9 @@
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Automatikus kitöltés elől blokkolt URI elemek</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>A blokkolt URI elemek esetében az automatikus kitöltés nem kerül felajánlásra. Több URI elemet vesszővel kell elválasztani. Például: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Bejelentkezés hozzáadás kérése</value>
  </data>
@@ -2626,34 +2629,6 @@ Szeretnénk átváltani erre a fiókra?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Jelenlegi mesterjelszó</value>
  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Hozzáférési kulcs</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Hozzáférési kulcsok</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Létrehozta {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>Alkalmazás</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>Nem szerkeszthető a hozzáférési kulcs alkalmazás, mert az érvénytelenítené a hozzáférési kulcsot.</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>A hozzáférési kulcs nem kerül másolásra.</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>A hozzáférési kulcs nem másolódik át a klónozott elembe. Folytatjuk ennek az elemnek a klónozását?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Alkalmazás másolása</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Kétlépcsős bejelentkezéshez érhető el</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Mesterjelszó újbóli bekérés súgó</value>
  </data>
@@ -2666,50 +2641,4 @@ Szeretnénk átváltani erre a fiókra?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Érvénytelen API vezérjel</value>
  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Ez az elem nem osztható meg a szervezettel, mert már van egy ugyanezzel a hozzáférési kulccsal.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Automatikus kitöltés blokkolása</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Az automatikus kitöltés nem kerül felajánlásra ezeknél a webcímeknél.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Új blokkolt URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>Az URI mentésre került.</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>A formátum érvénytelen. Használjuk a https://, http:// vagy androidapp:// elemet.</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>URI szerkesztése</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>URI megadása</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Formátum: {0}. A több URI elemet vesszővel válasszuk el.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Formátum: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Az URI érvénytelen.</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>Az URI eltávolításra került.</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Nincsenek blokkolt URI elemek.</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>{0} URI már blokkolásra került.</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Nem szerkeszthető több URI egyszerre.</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.id.resx
+++ b/src/App/Resources/AppResources.id.resx
@@ -1585,6 +1585,9 @@ Proses pindai akan terjadi secara otomatis.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-fill blocked URIs</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ask to add login</value>
  </data>
@@ -2627,34 +2630,6 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2667,50 +2642,4 @@ Do you want to switch to this account?</value>
  <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.it.resx
+++ b/src/App/Resources/AppResources.it.resx
@@ -172,7 +172,7 @@
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="DoYouReallyWantToDelete" xml:space="preserve">
-    <value>Vuoi davvero eliminarlo? Questa operazione non può essere annullata.</value>
+    <value>Vuoi davvero eliminarlo? Non lo potrai ripristinare.</value>
    <comment>Confirmation alert message when deleteing something.</comment>
  </data>
  <data name="Edit" xml:space="preserve">
@@ -1584,6 +1584,9 @@
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>URI mai riempiti automaticamente</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Il riempimento automatico non sarà proposto per gli URI bloccati. Separa più URI con una virgola. Per esempio: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Chiedi di aggiungere nuovi login</value>
  </data>
@@ -2627,39 +2630,11 @@ Vuoi passare a questo account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Password principale corrente</value>
  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Creato {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>Applicazione</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>Non puoi modificare l'applicazione della passkey perché invaliderebbe la passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>La passkey non sarà copiata</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>La passkey non sarà copiata nell'elemento clonato. Vuoi continuare a clonare questo elemento?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copia applicazione</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Disponibile per la verifica in due passaggi</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Aiuto per chiedere la password principale di nuovo</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Lo sblocco potrebbe non riuscire a causa di memoria insufficiente. Riduci le impostazioni della memoria KDF per risolvere il problema.</value>
+    <value>Lo sblocco potrebbe fallire a causa di memoria insufficiente. Riduci le impostazioni della memoria KDF per risolvere il problema</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Chiave API non valida</value>
@@ -2667,50 +2642,4 @@ Vuoi passare a questo account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Token API non valido</value>
  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Questo elemento non può essere condiviso con l'organizzazione perché ne esiste già uno con la stessa passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Bocca riempimento automatico</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Il riempimento automatico non sarà offerto per questi URI.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Nuovo URI bloccato</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI salvato</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Formato non valido. Usa https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Modifica URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Inserisci URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Formato: {0}. Separa più URI con una virgola.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Formato: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>URI non valido</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI rimosso</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Non ci sono URI bloccati</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>L'URI {0} è già bloccato</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Non puoi modificare più URI contemporaneamente</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ja.resx
+++ b/src/App/Resources/AppResources.ja.resx
@@ -1585,6 +1585,9 @@
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>自動入力をブロックする URI</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>自動入力をさせない URI を指定してください。複数の URI をコンマで区切ってください。例: "https://twitter.com, androidapp://com.twitter.android"</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>ログイン情報の追加を尋ねる</value>
  </data>
@@ -2627,34 +2630,6 @@
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>現在のマスターパスワード</value>
  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>パスキー</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>パスキー</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>{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>アプリ</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>パスキーが無効になってしまうため、パスキーアプリを編集することはできません</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>パスキーはコピーされません</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>パスキーは複製されたアイテムにコピーされません。このアイテムを複製しますか？</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>アプリをコピー</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>2段階認証に利用可能です</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>マスターパスワードの再プロンプトヘルプ</value>
  </data>
@@ -2667,50 +2642,4 @@
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>無効な API トークン</value>
  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>すでに同じパスキーを持つものがあるため、このアイテムは組織と共有することはできません。</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>自動入力をブロック</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>これらの URI に対しては自動入力しません。</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>新しくブロックする URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI を保存しました</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>無効な形式です。https://、http://、androidapp:// を使用してください</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>URI を編集</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>URI を入力</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>形式は {0} です。複数の URI をカンマで区切ってください。</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>形式: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>不正な URI です</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI を削除しました</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>ブロックした URI はありません</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI {0} は既にブロックしています</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>一度に複数の URI を編集することはできません</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ka.resx
+++ b/src/App/Resources/AppResources.ka.resx
@@ -1585,6 +1585,9 @@ Scanning will happen automatically.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-fill blocked URIs</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ask to add login</value>
  </data>
@@ -2628,34 +2631,6 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2668,50 +2643,4 @@ Do you want to switch to this account?</value>
  <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.kn.resx
+++ b/src/App/Resources/AppResources.kn.resx
@@ -1586,6 +1586,9 @@ Scanning will happen automatically.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-fill blocked URIs</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ask to add login</value>
  </data>
@@ -2628,34 +2631,6 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2668,50 +2643,4 @@ Do you want to switch to this account?</value>
  <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.ko.resx
+++ b/src/App/Resources/AppResources.ko.resx
@@ -1585,6 +1585,9 @@
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>차단된 URI를 자동으로 채우기</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>자동 채우기는 차단된 URI에서는 작동하지 않습니다. 쉼표로 각각 URI를 나누십시오.</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>로그인을 추가할 건지 물어보기</value>
  </data>
@@ -2627,34 +2630,6 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2667,50 +2642,4 @@ Do you want to switch to this account?</value>
  <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.lt.resx
+++ b/src/App/Resources/AppResources.lt.resx
@@ -1585,6 +1585,9 @@ Nuskaitymas vyks automatiškai.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Automatiškai užpildyti užblokuotus URI</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Užblokuotų URI automatinis pildymas nebus siūlomas. Atskirkite kelis URI kableliais. Pavyzdžiui: „https://twitter.com, androidapp://com.twitter.android“.</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Prašyti pridėti prisijungimą</value>
  </data>
@@ -2628,34 +2631,6 @@ Ar norite pereiti prie šios paskyros?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Dabartinis pagrindinis slaptažodis</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>
@@ -2668,50 +2643,4 @@ Ar norite pereiti prie šios paskyros?</value>
  <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.lv.resx
+++ b/src/App/Resources/AppResources.lv.resx
@@ -1585,6 +1585,9 @@ Nolasīšana notiks automātiski.</value>
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Automātiskā aizpilde aizturētajos URI</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Automātiskā aizpilde aizturētajos URI netiks piedāvāta. Vairākus URI jāatdala ar komatu. Piemēram, "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Vaicāt, lai pievienotu pieteikšanās vienumu</value>
  </data>
@@ -1813,7 +1816,7 @@ Nolasīšana notiks automātiski.</value>
    <value>Ieslēdzot šo slēdzi, Tu piekrīti sekojošajam:</value>
  </data>
  <data name="AcceptPoliciesError" xml:space="preserve">
-    <value>Nav apstiprināti izmantošanas noteikumi un privātuma nosacījumi.</value>
+    <value>Nav pieņemti izmantošanas nosacījumi un privātuma politika.</value>
  </data>
  <data name="TermsOfService" xml:space="preserve">
    <value>Izmantošanas nosacījumi</value>
@@ -2627,34 +2630,6 @@ Vai pārslēgties uz šo kontu?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Pašreizējā galvenā parole</value>
  </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Paroļatslēga</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Paroļatslēgas</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Izveidota {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>Lietotne</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>Paroļatslēgas lietotni nevar labot, jo tas paroļatslēgu padarītu nederīgu</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Paroļatslēga netiks kopēta</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>Paroļatslēga netiks kopēta klonētajā vienumā. Vai turpināt šī vienuma klonēšanu?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Kopēt lietotni</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Pieejams ar divpakāpju pieteikšanos</value>
-  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Galvenās paroles pārvaicāšanas palīdzība</value>
  </data>
@@ -2667,50 +2642,4 @@ Vai pārslēgties uz šo kontu?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Nederīga API pilnvara</value>
  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Šo vienumu nevar kopīgot ar apvienību, jo tur jau ir tāds ar to pašu paroļatslēgu.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Neļaut automātisko aizpildīšanu</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Šiem URI automātiskā aizpildīšana netiks piedāvāta.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Jauns neatļautais URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saglabāts</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Nederīga vērtība. Jāizmanto https://, http:// vai androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Labot URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Ievadīt URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Pieraksts: {0}. Vairāki URI ir atdalāmi ar komatu.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Pieraksts: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Nederīgs URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI noņemts</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Nav neatļautu URI</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI {0} jau ir neatļauts</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Nevar labot vairākus URI vienlaicīgi</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ml.resx
+++ b/src/App/Resources/AppResources.ml.resx
@@ -1585,6 +1585,9 @@
  <data name="AutofillBlockedUris" xml:space="preserve">
    <value>Auto-fill blocked URIs</value>
  </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ask to add login</value>
  </data>
@@ -2627,34 +2630,6 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</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>
@@ -2667,50 +2642,4 @@ Do you want to switch to this account?</value>
  <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.mr.resx
+++ b/src/App/Resources/AppResources.mr.resx
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vince Grassia	9809b2724b	Fix Build Workflow (#2613 ) (cherry picked from commit `fdc0313d10`)	2023-07-13 10:07:04 -04:00
github-actions[bot]	c5741f55b2	Bumped version to 2023.7.0 (#2612 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com> (cherry picked from commit `f31c87b52e`)	2023-07-12 13:35:43 -04:00