WIP!!!

2026-01-24 13:23:27 +00:00 · 2022-02-23 20:40:25 +01:00
401 changed files with 394438 additions and 11184 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
    runs-on: ubuntu-20.04
    outputs:
      rc_branch_exists: ${{ steps.branch-check.outputs.rc_branch_exists }}
-      hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
+      release_branch_exists: ${{ steps.branch-check.outputs.release_branch_exists }}
    steps:
      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
@@ -43,10 +43,10 @@ jobs:
            echo "::set-output name=rc_branch_exists::0"
          fi

-          if [[ $(git ls-remote --heads origin hotfix) ]]; then
-            echo "::set-output name=hotfix_branch_exists::1"
+          if [[ $(git ls-remote --heads origin release) ]]; then
+            echo "::set-output name=release_branch_exists::1"
          else
-            echo "::set-output name=hotfix_branch_exists::0"
+            echo "::set-output name=release_branch_exists::0"
          fi
        shell: bash

@@ -180,9 +180,9 @@ jobs:
        if: |
            (github.ref == 'refs/heads/master'
              && needs.setup.outputs.rc_branch_exists == 0
-              && needs.setup.outputs.hotfix_branch_exists == 0)
-            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-            || github.ref == 'refs/heads/hotfix'
+              && needs.setup.outputs.release_branch_exists == 0)
+            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.release_branch_exists == 0)
+            || github.ref == 'refs/heads/release'
        run: |
          PUBLISHER_PATH="$GITHUB_WORKSPACE/store/google/Publisher/bin/Release/netcoreapp2.0/Publisher.dll"
          CREDS_PATH="$HOME/secrets/play_creds.json"
@@ -397,15 +397,6 @@ jobs:
          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Autofill/Info.plist
        shell: bash

-      - name: Update Entitlements
-        run: |
-          echo "########################################"
-          echo "##### Updating Entitlements"
-          echo "########################################"
-
-          perl -0777 -pi.bak -e 's/<key>aps-environment<\/key>\s*<string>development<\/string>/<key>aps-environment<\/key>\n\t<string>production<\/string>/' ./src/iOS/Entitlements.plist
-        shell: bash
-
      - name: Set up Keychain
        env:
          KEYCHAIN_PASSWORD: ${{ secrets.IOS_KEYCHAIN_PASSWORD }}
@@ -483,9 +474,9 @@ jobs:
        if: |
            (github.ref == 'refs/heads/master'
              && needs.setup.outputs.rc_branch_exists == 0
-              && needs.setup.outputs.hotfix_branch_exists == 0)
-            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-            || github.ref == 'refs/heads/hotfix'
+              && needs.setup.outputs.release_branch_exists == 0)
+            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.release_branch_exists == 0)
+            || github.ref == 'refs/heads/release'
        env:
          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
@@ -495,44 +486,6 @@ jobs:
        shell: bash


-  crowdin-push:
-    name: Crowdin Push
-    if: github.ref == 'refs/heads/master'
-    needs:
-      - android
-      - f-droid
-      - ios
-    runs-on: ubuntu-20.04
-    env:
-      _CROWDIN_PROJECT_ID: "269690"
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
-
-      - name: Login to Azure
-        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
-        with:
-          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
-
-      - name: Retrieve secrets
-        id: retrieve-secrets
-        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
-        with:
-          keyvault: "bitwarden-prod-kv"
-          secrets: "crowdin-api-token"
-
-      - name: Upload Sources
-        uses: crowdin/github-action@e39093fd75daae7859c68eded4b43d42ec78d8ea  # v1.3.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
-        with:
-          config: crowdin.yml
-          crowdin_branch_name: master
-          upload_sources: true
-          upload_translations: false
-
-
  check-failures:
    name: Check for failures
    if: always()
@@ -542,19 +495,14 @@ jobs:
      - android
      - f-droid
      - ios
-      - crowdin-push
    steps:
      - name: Check if any job failed
-        if: |
-            (github.ref == 'refs/heads/master')
-            || (github.ref == 'refs/heads/rc')
-            || (github.ref == 'refs/heads/hotfix')
+        if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') }}
        env:
          CLOC_STATUS: ${{ needs.cloc.result }}
          ANDROID_STATUS: ${{ needs.android.result }}
          F_DROID_STATUS: ${{ needs.f-droid.result }}
          IOS_STATUS: ${{ needs.ios.result }}
-          CROWDIN_PUSH_STATUS: ${{ needs.crowdin-push.result }}
        run: |
          if [ "$CLOC_STATUS" = "failure" ]; then
              exit 1
@@ -564,8 +512,6 @@ jobs:
              exit 1
          elif [ "$IOS_STATUS" = "failure" ]; then
              exit 1
-          elif [ "$CROWDIN_PUSH_STATUS" = "failure" ]; then
-              exit 1
          fi

      - name: Login to Azure - Prod Subscription
--- a/.github/workflows/crowdin-sync.yml
+++ b/.github/workflows/crowdin-sync.yml
@@ -4,8 +4,8 @@ name: Crowdin Sync
 on:
  workflow_dispatch:
    inputs: {}
-  schedule:
-    - cron: '0 0 * * 5'
+# schedule:
+#   - cron: '0 0 * * *'

 jobs:
  crowdin-sync:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,34 +3,25 @@ name: Release

 on:
  workflow_dispatch:
-    inputs:
-      release_type:
-        description: 'Release Options'
-        required: true
-        default: 'Initial Release'
-        type: choice
-        options:
-          - Initial Release
-          - Redeploy

 jobs:
  release:
    name: Create Release
    runs-on: ubuntu-20.04
-    outputs:
-      branch-name: ${{ steps.branch.outputs.branch-name }}
    steps:
      - name: Branch check
        run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix" ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/release" ]]; then
            echo "==================================="
-            echo "[!] Can only release from the 'rc' or 'hotfix' branches"
+            echo "[!] Can only release from the 'release' branch"
            echo "==================================="
            exit 1
          fi

      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+        with:
+          ref: release

      - name: Retrieve Mobile release version
        id: retrieve-mobile-version
@@ -40,7 +31,6 @@ jobs:
        shell: bash

      - name: Check to make sure Mobile release version has been bumped
-        if: ${{ github.event.inputs.release_type == 'Initial Release' }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
@@ -55,18 +45,12 @@ jobs:
          fi
        shell: bash

-      - name: Get branch name
-        id: branch
-        run: |
-          BRANCH_NAME=$(basename ${{ github.ref }})
-          echo "::set-output name=branch-name::$BRANCH_NAME"
-
      - name: Download all artifacts
        uses: dawidd6/action-download-artifact@b9571484721e8187f1fd08147b497129f8972c74  # v2.14.0
        with:
          workflow: build.yml
          workflow_conclusion: success
-          branch: ${{ steps.branch.outputs.branch-name }}
+          branch: release

      - name: Create release
        uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09  # v2.8.5
@@ -90,13 +74,15 @@ jobs:
    steps:
      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+        with:
+          ref: release

      - name: Download F-Droid .apk artifact
        uses: dawidd6/action-download-artifact@b9571484721e8187f1fd08147b497129f8972c74  # v2.14.0
        with:
          workflow: build.yml
          workflow_conclusion: success
-          branch: ${{ needs.release.outputs.branch-name }}
+          branch: release
          name: com.x8bit.bitwarden-fdroid.apk

      - name: Set up Node
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -1,83 +0,0 @@
---
-name: Version Bump
-
-on:
-  workflow_dispatch:
-    inputs:
-      version_number:
-        description: "New Version"
-        required: true
-
-jobs:
-  bump_version:
-    name: "Create version_bump_${{ github.event.inputs.version_number }} branch"
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout Branch
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
-
-      - name: Create Version Branch
-        run: |
-          git switch -c version_bump_${{ github.event.inputs.version_number }}
-          git push -u origin version_bump_${{ github.event.inputs.version_number }}
-
-      - name: Checkout Version Branch
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
-        with:
-          ref: version_bump_${{ github.event.inputs.version_number }}
-
-      - name: Bump Version - Android XML
-        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
-        with:
-          version: ${{ github.event.inputs.version_number }}
-          file_path: "./src/Android/Properties/AndroidManifest.xml"
-
-      - name: Bump Version - iOS.Autofill
-        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
-        with:
-          version: ${{ github.event.inputs.version_number }}
-          file_path: "./src/iOS.Autofill/Info.plist"
-
-      - name: Bump Version - iOS.Extension
-        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
-        with:
-          version: ${{ github.event.inputs.version_number }}
-          file_path: "./src/iOS.Extension/Info.plist"
-
-      - name: Bump Version - iOS
-        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
-        with:
-          version: ${{ github.event.inputs.version_number }}
-          file_path: "./src/iOS/Info.plist"
-
-      - name: Commit files
-        run: |
-          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git commit -m "Bumped version to ${{ github.event.inputs.version_number }}" -a
-
-      - name: Push changes
-        run: git push -u origin version_bump_${{ github.event.inputs.version_number }}
-
-      - name: Create Version PR
-        env:
-          PR_BRANCH: "version_bump_${{ github.event.inputs.version_number }}"
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          BASE_BRANCH: master
-          TITLE: "Bump version to ${{ github.event.inputs.version_number }}"
-        run: |
-          gh pr create --title "$TITLE" \
-            --base "$BASE" \
-            --head "$PR_BRANCH" \
-            --label "version update" \
-            --label "automated pr" \
-            --body "
-              ## Type of change
-              - [ ] Bug fix
-              - [ ] New feature development
-              - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
-              - [ ] Build/deploy pipeline (DevOps)
-              - [X] Other
-
-              ## Objective
-              Automated version bump to ${{ github.event.inputs.version_number }}"
--- a/bitwarden-mobile.sln
+++ b/bitwarden-mobile.sln
@@ -44,6 +44,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "test\Common\Commo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Test", "test\Core.Test\Core.Test.csproj", "{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Safari", "src\iOS.Safari\iOS.Safari.csproj", "{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -414,6 +416,36 @@ Global
 		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhone.Build.0 = Release|Any CPU
 		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Ad-Hoc|Any CPU.ActiveCfg = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Ad-Hoc|Any CPU.Build.0 = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Ad-Hoc|iPhone.ActiveCfg = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Ad-Hoc|iPhone.Build.0 = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.AppStore|Any CPU.ActiveCfg = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.AppStore|Any CPU.Build.0 = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.AppStore|iPhone.ActiveCfg = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.AppStore|iPhone.Build.0 = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.AppStore|iPhoneSimulator.ActiveCfg = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.AppStore|iPhoneSimulator.Build.0 = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Debug|Any CPU.Build.0 = Debug|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Debug|iPhone.Build.0 = Debug|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.FDroid|Any CPU.ActiveCfg = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.FDroid|Any CPU.Build.0 = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.FDroid|iPhone.ActiveCfg = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.FDroid|iPhone.Build.0 = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.FDroid|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.FDroid|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Release|Any CPU.Build.0 = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Release|iPhone.ActiveCfg = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Release|iPhone.Build.0 = Release|iPhone
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -431,6 +463,7 @@ Global
 		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39} = {8904C536-C67D-420F-9971-51B26574C3AA}
 		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0} = {8904C536-C67D-420F-9971-51B26574C3AA}
+		{7CE47211-43D4-4BBB-BB16-82A8A337ECE7} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7D436EA3-8B7E-45D2-8D14-0730BD2E0410}
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,9 +1,7 @@
 project_id_env: _CROWDIN_PROJECT_ID
 api_token_env: CROWDIN_API_TOKEN
-preserve_hierarchy: true
 files:
  - source: /src/App/Resources/AppResources.resx
-    dest: /src/App/Resources/%original_file_name%
    translation: /src/App/Resources/AppResources.%two_letters_code%.resx
    update_option: update_as_unapproved
    languages_mapping:
@@ -15,7 +13,6 @@ files:
        en-GB: en-GB
        en-IN: en-IN
  - source: /store/apple/en/copy.resx
-    dest: /store/apple/en/%original_file_name%
    translation: /store/apple/%two_letters_code%/copy.resx
    update_option: update_as_unapproved
    languages_mapping:
@@ -27,7 +24,6 @@ files:
        en-GB: en-GB
        en-IN: en-IN
  - source: /store/google/en/copy.resx
-    dest: /store/google/en/%original_file_name%
    translation: /store/google/%two_letters_code%/copy.resx
    update_option: update_as_unapproved
    languages_mapping:
--- a/src/Android/Accessibility/AccessibilityActivity.cs
+++ b/src/Android/Accessibility/AccessibilityActivity.cs
@@ -6,7 +6,6 @@ using Android.Views;
 using System;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-using Bit.Droid.Utilities;

 namespace Bit.Droid.Accessibility
 {
@@ -18,7 +17,6 @@ namespace Bit.Droid.Accessibility

        protected override void OnCreate(Bundle bundle)
        {
-            Intent?.Validate();
            base.OnCreate(bundle);
            HandleIntent(Intent, 932473);
        }
--- a/src/Android/Accessibility/AccessibilityHelpers.cs
+++ b/src/Android/Accessibility/AccessibilityHelpers.cs
@@ -54,7 +54,6 @@ namespace Bit.Droid.Accessibility
            // Rem. for "com.google.android.captiveportallogin": URL displayed in ActionBar subtitle without viewId.
            new Browser("com.jamal2367.styx", "search"),
            new Browser("com.kiwibrowser.browser", "url_bar"),
-            new Browser("com.kiwibrowser.browser.dev", "url_bar"),
            new Browser("com.microsoft.emmx", "url_bar"),
            new Browser("com.microsoft.emmx.beta", "url_bar"),
            new Browser("com.microsoft.emmx.canary", "url_bar"),
@@ -68,7 +67,6 @@ namespace Bit.Droid.Accessibility
            new Browser("com.opera.mini.native", "url_field"),
            new Browser("com.opera.mini.native.beta", "url_field"),
            new Browser("com.opera.touch", "addressbarEdit"),
-            new Browser("com.qflair.browserq", "url"),
            new Browser("com.qwant.liberty", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy (before v4)
            new Browser("com.sec.android.app.sbrowser", "location_bar_edit_text"),
            new Browser("com.sec.android.app.sbrowser.beta", "location_bar_edit_text"),
@@ -103,10 +101,8 @@ namespace Bit.Droid.Accessibility
            new Browser("org.mozilla.fennec_fdroid", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
            new Browser("org.mozilla.firefox", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
            new Browser("org.mozilla.firefox_beta", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
-            new Browser("org.mozilla.focus", "mozac_browser_toolbar_url_view,display_url"), // 2nd = Legacy
-            new Browser("org.mozilla.focus.beta", "mozac_browser_toolbar_url_view,display_url"), // 2nd = Legacy
-            new Browser("org.mozilla.focus.nightly", "mozac_browser_toolbar_url_view,display_url"), // 2nd = Legacy
-            new Browser("org.mozilla.klar", "mozac_browser_toolbar_url_view,display_url"), // 2nd = Legacy
+            new Browser("org.mozilla.focus", "display_url"),
+            new Browser("org.mozilla.klar", "display_url"),
            new Browser("org.mozilla.reference.browser", "mozac_browser_toolbar_url_view"),
            new Browser("org.mozilla.rocket", "display_url"),
            new Browser("org.torproject.torbrowser", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy (before v10.0.3)
--- a/src/Android/Accessibility/AccessibilityService.cs
+++ b/src/Android/Accessibility/AccessibilityService.cs
@@ -10,6 +10,7 @@ using Android.Views;
 using Android.Views.Accessibility;
 using Android.Widget;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;

@@ -24,7 +25,7 @@ namespace Bit.Droid.Accessibility
        private const string BitwardenPackage = "com.x8bit.bitwarden";
        private const string BitwardenWebsite = "vault.bitwarden.com";

-        private IStateService _stateService;
+        private IStorageService _storageService;
        private IBroadcasterService _broadcasterService;
        private DateTime? _lastSettingsReload = null;
        private TimeSpan _settingsReloadSpan = TimeSpan.FromMinutes(1);
@@ -443,9 +444,9 @@ namespace Bit.Droid.Accessibility

        private void LoadServices()
        {
-            if (_stateService == null)
+            if (_storageService == null)
            {
-                _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            }
            if (_broadcasterService == null)
            {
@@ -459,12 +460,12 @@ namespace Bit.Droid.Accessibility
            if (_lastSettingsReload == null || (now - _lastSettingsReload.Value) > _settingsReloadSpan)
            {
                _lastSettingsReload = now;
-                var uris = await _stateService.GetAutofillBlacklistedUrisAsync();
+                var uris = await _storageService.GetAsync<List<string>>(Constants.AutofillBlacklistedUrisKey);
                if (uris != null)
                {
                    _blacklistedUris = new HashSet<string>(uris);
                }
-                var isAutoFillTileAdded = await _stateService.GetAutofillTileAddedAsync();
+                var isAutoFillTileAdded = await _storageService.GetAsync<bool?>(Constants.AutofillTileAdded);
                AccessibilityHelpers.IsAutofillTileAdded = isAutoFillTileAdded.GetValueOrDefault();
            }
        }
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -68,7 +68,6 @@
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Xml" />
-    <Reference Include="System.Net.Http" Condition="'$(Configuration)'=='FDroid'" />
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Plugin.CurrentActivity">
@@ -149,8 +148,6 @@
    <Compile Include="Utilities\ThemeHelpers.cs" />
    <Compile Include="WebAuthCallbackActivity.cs" />
    <Compile Include="Renderers\SelectableLabelRenderer.cs" />
-    <Compile Include="Services\ClipboardService.cs" />
-    <Compile Include="Utilities\IntentExtensions.cs" />
  </ItemGroup>
  <ItemGroup>
    <AndroidAsset Include="Assets\FontAwesome.ttf" />
@@ -171,11 +168,9 @@
    <AndroidResource Include="Resources\drawable-xxhdpi\logo_legacy.png" />
    <AndroidResource Include="Resources\drawable-xxhdpi\logo_white_legacy.png" />
    <AndroidResource Include="Resources\drawable\card.xml" />
-    <AndroidResource Include="Resources\drawable\cog_environment.xml" />
-    <AndroidResource Include="Resources\drawable\cog_settings.xml" />
+    <AndroidResource Include="Resources\drawable\cog.xml" />
    <AndroidResource Include="Resources\drawable\icon.xml" />
    <AndroidResource Include="Resources\drawable\ic_launcher_foreground.xml" />
-    <AndroidResource Include="Resources\drawable\ic_warning.xml" />
    <AndroidResource Include="Resources\drawable\id.xml" />
    <AndroidResource Include="Resources\drawable\info.xml" />
    <AndroidResource Include="Resources\drawable\list_item_bg.xml" />
@@ -209,8 +204,6 @@
    <AndroidResource Include="Resources\values-night\styles.xml" />
    <AndroidResource Include="Resources\values\styles.xml" />
    <AndroidResource Include="Resources\values\colors.xml" />
-    <AndroidResource Include="Resources\values\manifest.xml" />
-    <AndroidResource Include="Resources\values-v30\manifest.xml" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\drawable\splash_screen.xml" />
@@ -276,8 +269,5 @@
      <SubType>Designer</SubType>
    </AndroidResource>
  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\values-v30\" />
-  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
--- a/src/Android/Autofill/AutofillHelpers.cs
+++ b/src/Android/Autofill/AutofillHelpers.cs
@@ -37,8 +37,6 @@ namespace Bit.Droid.Autofill
            "com.duckduckgo.mobile.android",
            "com.google.android.googlequicksearchbox",
            "org.mozilla.focus",
-            "org.mozilla.focus.beta",
-            "org.mozilla.focus.nightly",
            "org.mozilla.klar",
        };

@@ -73,7 +71,6 @@ namespace Bit.Droid.Autofill
            "com.google.android.captiveportallogin",
            "com.jamal2367.styx",
            "com.kiwibrowser.browser",
-            "com.kiwibrowser.browser.dev",
            "com.microsoft.emmx",
            "com.microsoft.emmx.beta",
            "com.microsoft.emmx.canary",
@@ -87,7 +84,6 @@ namespace Bit.Droid.Autofill
            "com.opera.mini.native",
            "com.opera.mini.native.beta",
            "com.opera.touch",
-            "com.qflair.browserq",
            "com.qwant.liberty",
            "com.sec.android.app.sbrowser",
            "com.sec.android.app.sbrowser.beta",
--- a/src/Android/Autofill/AutofillService.cs
+++ b/src/Android/Autofill/AutofillService.cs
@@ -22,8 +22,9 @@ namespace Bit.Droid.Autofill
    {
        private ICipherService _cipherService;
        private IVaultTimeoutService _vaultTimeoutService;
+        private IStorageService _storageService;
        private IPolicyService _policyService;
-        private IStateService _stateService;
+        private IUserService _userService;

        public async override void OnFillRequest(FillRequest request, CancellationSignal cancellationSignal,
            FillCallback callback)
@@ -37,18 +38,18 @@ namespace Bit.Droid.Autofill
            var parser = new Parser(structure, ApplicationContext);
            parser.Parse();

-            if (_stateService == null)
+            if (_storageService == null)
            {
-                _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            }

-            var shouldAutofill = await parser.ShouldAutofillAsync(_stateService);
+            var shouldAutofill = await parser.ShouldAutofillAsync(_storageService);
            if (!shouldAutofill)
            {
                return;
            }
            
-            var inlineAutofillEnabled = await _stateService.GetInlineAutofillEnabledAsync() ?? true;
+            var inlineAutofillEnabled = await _storageService.GetAsync<bool?>(Constants.InlineAutofillEnabledKey) ?? true;

            if (_vaultTimeoutService == null)
            {
@@ -80,12 +81,12 @@ namespace Bit.Droid.Autofill
                return;
            }

-            if (_stateService == null)
+            if (_storageService == null)
            {
-                _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            }

-            var disableSavePrompt = await _stateService.GetAutofillDisableSavePromptAsync();
+            var disableSavePrompt = await _storageService.GetAsync<bool?>(Constants.AutofillDisableSavePromptKey);
            if (disableSavePrompt.GetValueOrDefault())
            {
                return;
--- a/src/Android/Autofill/Parser.cs
+++ b/src/Android/Autofill/Parser.cs
@@ -80,13 +80,13 @@ namespace Bit.Droid.Autofill
            }
        }

-        public async Task<bool> ShouldAutofillAsync(IStateService stateService)
+        public async Task<bool> ShouldAutofillAsync(IStorageService storageService)
        {
            var fillable = !string.IsNullOrWhiteSpace(Uri) && !AutofillHelpers.BlacklistedUris.Contains(Uri) &&
                FieldCollection != null && FieldCollection.Fillable;
            if (fillable)
            {
-                var blacklistedUris = await stateService.GetAutofillBlacklistedUrisAsync();
+                var blacklistedUris = await storageService.GetAsync<List<string>>(Constants.AutofillBlacklistedUrisKey);
                if (blacklistedUris != null && blacklistedUris.Count > 0)
                {
                    fillable = !new HashSet<string>(blacklistedUris).Contains(Uri);
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -19,23 +19,39 @@ using System.Threading.Tasks;
 using AndroidX.Core.Content;
 using Bit.App.Utilities;
 using ZXing.Net.Mobile.Android;
-using Android.Util;

 namespace Bit.Droid
 {
-    // Activity and IntentFilter declarations have been moved to Properties/AndroidManifest.xml
-    // They have been hardcoded so we can use the default LaunchMode on Android 11+
-    // LaunchMode defined in values/manifest.xml for Android 10- and values-v30/manifest.xml for Android 11+
-    // See https://github.com/bitwarden/mobile/pull/1673 for details
+    [Activity(
+        Label = "Bitwarden",
+        Icon = "@mipmap/ic_launcher",
+        Theme = "@style/LaunchTheme",
+        MainLauncher = true,
+        LaunchMode = LaunchMode.SingleTask,
+        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation |
+                               ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden |
+                               ConfigChanges.Navigation | ConfigChanges.UiMode)]
+    [IntentFilter(
+        new[] { Intent.ActionSend },
+        Categories = new[] { Intent.CategoryDefault },
+        DataMimeTypes = new[]
+        {
+            @"application/*",
+            @"image/*",
+            @"video/*",
+            @"text/*"
+        })]
    [Register("com.x8bit.bitwarden.MainActivity")]
    public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
    {
        private IDeviceActionService _deviceActionService;
        private IMessagingService _messagingService;
        private IBroadcasterService _broadcasterService;
-        private IStateService _stateService;
+        private IUserService _userService;
        private IAppIdService _appIdService;
+        private IStorageService _storageService;
        private IEventService _eventService;
+        private PendingIntent _clearClipboardPendingIntent;
        private PendingIntent _eventUploadPendingIntent;
        private AppOptions _appOptions;
        private string _activityKey = $"{nameof(MainActivity)}_{Java.Lang.JavaSystem.CurrentTimeMillis().ToString()}";
@@ -47,6 +63,9 @@ namespace Bit.Droid
            var eventUploadIntent = new Intent(this, typeof(EventUploadReceiver));
            _eventUploadPendingIntent = PendingIntent.GetBroadcast(this, 0, eventUploadIntent,
                PendingIntentFlags.UpdateCurrent);
+            var clearClipboardIntent = new Intent(this, typeof(ClearClipboardAlarmReceiver));
+            _clearClipboardPendingIntent = PendingIntent.GetBroadcast(this, 0, clearClipboardIntent,
+                PendingIntentFlags.UpdateCurrent);

            var policy = new StrictMode.ThreadPolicy.Builder().PermitAll().Build();
            StrictMode.SetThreadPolicy(policy);
@@ -54,16 +73,14 @@ namespace Bit.Droid
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _eventService = ServiceContainer.Resolve<IEventService>("eventService");

            TabLayoutResource = Resource.Layout.Tabbar;
            ToolbarResource = Resource.Layout.Toolbar;

-            // this needs to be called here before base.OnCreate(...)
-            Intent?.Validate();
-
            base.OnCreate(savedInstanceState);
            if (!CoreHelpers.InDebugMode())
            {
@@ -71,7 +88,7 @@ namespace Bit.Droid
            }

 #if !FDROID
-            var appCenterHelper = new AppCenterHelper(_appIdService, _stateService);
+            var appCenterHelper = new AppCenterHelper(_appIdService, _userService);
            var appCenterTask = appCenterHelper.InitAsync();
 #endif

@@ -106,6 +123,10 @@ namespace Bit.Droid
                {
                    ExitApp();
                }
+                else if (message.Command == "copiedToClipboard")
+                {
+                    var task = ClearClipboardAlarmAsync(message.Data as Tuple<string, int?, bool>);
+                }
            });
        }

@@ -138,15 +159,7 @@ namespace Bit.Droid
            base.OnNewIntent(intent);
            try
            {
-                if (intent?.GetStringExtra("uri") is string uri)
-                {
-                    _messagingService.Send("popAllAndGoToAutofillCiphers");
-                    if (_appOptions != null)
-                    {
-                       _appOptions.Uri = uri;
-                    }
-                }
-                else if (intent.GetBooleanExtra("generatorTile", false))
+                if (intent.GetBooleanExtra("generatorTile", false))
                {
                    _messagingService.Send("popAllAndGoToTabGenerator");
                    if (_appOptions != null)
@@ -373,7 +386,7 @@ namespace Bit.Droid
        {
            Window?.SetStatusBarColor(ThemeHelpers.NavBarBackgroundColor);
            Window?.DecorView.SetBackgroundColor(ThemeHelpers.BackgroundColor);
-            ThemeHelpers.SetAppearance(ThemeManager.GetTheme(), ThemeManager.OsDarkModeEnabled());
+            ThemeHelpers.SetAppearance(ThemeManager.GetTheme(true), ThemeManager.OsDarkModeEnabled());
        }

        private void ExitApp()
@@ -382,6 +395,30 @@ namespace Bit.Droid
            Java.Lang.JavaSystem.Exit(0);
        }

+        private async Task ClearClipboardAlarmAsync(Tuple<string, int?, bool> data)
+        {
+            if (data.Item3)
+            {
+                return;
+            }
+            var clearMs = data.Item2;
+            if (clearMs == null)
+            {
+                var clearSeconds = await _storageService.GetAsync<int?>(Constants.ClearClipboardKey);
+                if (clearSeconds != null)
+                {
+                    clearMs = clearSeconds.Value * 1000;
+                }
+            }
+            if (clearMs == null)
+            {
+                return;
+            }
+            var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + clearMs.Value;
+            var alarmManager = GetSystemService(AlarmService) as AlarmManager;
+            alarmManager.Set(AlarmType.Rtc, triggerMs, _clearClipboardPendingIntent);
+        }
+
        private void StartEventAlarm()
        {
            var alarmManager = GetSystemService(AlarmService) as AlarmManager;
--- a/src/Android/MainApplication.cs
+++ b/src/Android/MainApplication.cs
@@ -16,8 +16,6 @@ using Bit.Droid.Utilities;
 using Plugin.CurrentActivity;
 using Plugin.Fingerprint;
 using Xamarin.Android.Net;
-using System.Net.Http;
-using System.Net;
 #if !FDROID
 using Android.Gms.Security;
 #endif
@@ -80,8 +78,7 @@ namespace Bit.Droid
                FFImageLoading.ImageService.Instance.Initialize(new FFImageLoading.Config.Configuration
                {
                    FadeAnimationEnabled = false,
-                    FadeAnimationForCachedImages = false,
-                    HttpClient = new HttpClient(new AndroidClientHandler() { AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate })
+                    FadeAnimationForCachedImages = false
                });
                ZXing.Net.Mobile.Forms.Android.Platform.Init();
            });
@@ -97,14 +94,13 @@ namespace Bit.Droid
            var secureStorageService = new SecureStorageService();
            var cryptoPrimitiveService = new CryptoPrimitiveService();
            var mobileStorageService = new MobileStorageService(preferencesStorage, liteDbStorage);
-            var stateService = new StateService(mobileStorageService, secureStorageService);
-            var deviceActionService = new DeviceActionService(stateService, messagingService,
+            var deviceActionService = new DeviceActionService(mobileStorageService, messagingService,
                broadcasterService, () => ServiceContainer.Resolve<IEventService>("eventService"));
            var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, messagingService,
                broadcasterService);
            var biometricService = new BiometricService();
            var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
-            var cryptoService = new CryptoService(stateService, cryptoFunctionService);
+            var cryptoService = new CryptoService(mobileStorageService, secureStorageService, cryptoFunctionService);
            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);

            ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);
@@ -114,8 +110,6 @@ namespace Bit.Droid
            ServiceContainer.Register<ICryptoPrimitiveService>("cryptoPrimitiveService", cryptoPrimitiveService);
            ServiceContainer.Register<IStorageService>("storageService", mobileStorageService);
            ServiceContainer.Register<IStorageService>("secureStorageService", secureStorageService);
-            ServiceContainer.Register<IStateService>("stateService", stateService);
-            ServiceContainer.Register<IClipboardService>("clipboardService", new ClipboardService(stateService));
            ServiceContainer.Register<IDeviceActionService>("deviceActionService", deviceActionService);
            ServiceContainer.Register<IPlatformUtilsService>("platformUtilsService", platformUtilsService);
            ServiceContainer.Register<IBiometricService>("biometricService", biometricService);
@@ -134,7 +128,7 @@ namespace Bit.Droid
            ServiceContainer.Register<IPushNotificationListenerService>(
                "pushNotificationListenerService", notificationListenerService);
            var androidPushNotificationService = new AndroidPushNotificationService(
-                stateService, notificationListenerService);
+                mobileStorageService, notificationListenerService);
            ServiceContainer.Register<IPushNotificationService>(
                "pushNotificationService", androidPushNotificationService);
 #endif
@@ -150,6 +144,10 @@ namespace Bit.Droid

        private async Task BootstrapAsync()
        {
+            var disableFavicon = await ServiceContainer.Resolve<IStorageService>("storageService")
+                .GetAsync<bool?>(Constants.DisableFaviconKey);
+            await ServiceContainer.Resolve<IStateService>("stateService").SaveAsync(
+                Constants.DisableFaviconKey, disableFavicon);
            await ServiceContainer.Resolve<IEnvironmentService>("environmentService").SetUrlsFromStorageAsync();
        }
    }
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -1,57 +1,61 @@
-<?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="2.15.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<?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="2.14.3"
+  android:installLocation="internalOnly"
+  package="com.x8bit.bitwarden">

-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />

-  <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.NFC"/>
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.CAMERA"/>
-  <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
-  <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.NFC" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.CAMERA" />
+  <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+  <uses-permission android:name="android.permission.USE_BIOMETRIC" />
  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-  <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY"/>
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+  <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />

-  <uses-feature android:name="android.hardware.camera" android:required="false"/>
-  <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+  <uses-feature android:name="android.hardware.camera" android:required="false" />
+  <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />

-  <application android:label="Bitwarden" android:theme="@style/LaunchTheme" android:allowBackup="false" tools:replace="android:allowBackup" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:networkSecurityConfig="@xml/network_security_config">
-    <provider android:name="androidx.core.content.FileProvider" android:authorities="com.x8bit.bitwarden.fileprovider" android:exported="false" android:grantUriPermissions="true">
-      <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/filepaths"/>
+  <application
+    android:label="Bitwarden"
+    android:theme="@style/LaunchTheme"
+    android:allowBackup="false"
+    tools:replace="android:allowBackup"
+    android:icon="@mipmap/ic_launcher"
+    android:roundIcon="@mipmap/ic_launcher_round"
+    android:networkSecurityConfig="@xml/network_security_config">
+    <provider
+      android:name="androidx.core.content.FileProvider"
+      android:authorities="com.x8bit.bitwarden.fileprovider"
+      android:exported="false"
+      android:grantUriPermissions="true">
+      <meta-data
+        android:name="android.support.FILE_PROVIDER_PATHS"
+        android:resource="@xml/filepaths" />
    </provider>

-    <meta-data android:name="android.max_aspect" android:value="2.1"/>
-    <meta-data android:name="android.content.APP_RESTRICTIONS" android:resource="@xml/app_restrictions"/>
+    <meta-data android:name="android.max_aspect" android:value="2.1" />
+    <meta-data android:name="android.content.APP_RESTRICTIONS" android:resource="@xml/app_restrictions" />

    <!-- Support for Samsung "Multi Window" mode (for Android < 7.0 users) -->
-    <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" android:value="true"/>
-    <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable" android:value="true"/>
+    <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" android:value="true" />
+    <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable" android:value="true" />

    <!-- Support for LG "Dual Window" mode (for Android < 7.0 users) -->
-    <meta-data android:name="com.lge.support.SPLIT_WINDOW" android:value="true"/>
-	<!-- Declare MainActivity manually so we can set LaunchMode using API dependant resource -->
-	<activity android:name="com.x8bit.bitwarden.MainActivity" android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|uiMode" android:exported="true" android:icon="@mipmap/ic_launcher" android:label="Bitwarden" android:launchMode="@integer/launchModeAPIlevel" android:theme="@style/LaunchTheme">
-	  <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
-		<category android:name="android.intent.category.LAUNCHER"/>
-	  </intent-filter>
-	  <intent-filter>
-	    <action android:name="android.intent.action.SEND"/>
-		<category android:name="android.intent.category.DEFAULT"/>
-		<data android:mimeType="application/*"/>
-		<data android:mimeType="image/*"/>
-		<data android:mimeType="video/*"/>
-		<data android:mimeType="text/*"/>
-	  </intent-filter>
-	</activity>
+    <meta-data android:name="com.lge.support.SPLIT_WINDOW" android:value="true" />
  </application>

  <!-- Package visibility (for Android 11+) -->
  <queries>
-    <intent>
-      <action android:name="*"/>
-    </intent>
+      <intent>
+          <action android:name="*"/>
+      </intent>
  </queries>

 </manifest>
--- a/src/Android/Push/FirebaseMessagingService.cs
+++ b/src/Android/Push/FirebaseMessagingService.cs
@@ -16,10 +16,10 @@ namespace Bit.Droid.Push
    {
        public async override void OnNewToken(string token)
        {
-            var stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            var storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            var pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService");
            
-            await stateService.SetPushRegisteredTokenAsync(token);
+            await storageService.SaveAsync(Core.Constants.PushRegisteredTokenKey, token);
            await pushNotificationService.RegisterAsync();
        }
        
--- a/src/Android/Receivers/PackageReplacedReceiver.cs
+++ b/src/Android/Receivers/PackageReplacedReceiver.cs
@@ -1,4 +1,5 @@
-using Android.App;
+using System;
+using Android.App;
 using Android.Content;
 using Bit.App.Abstractions;
 using Bit.App.Utilities;
@@ -13,10 +14,9 @@ namespace Bit.Droid.Receivers
    {
        public override async void OnReceive(Context context, Intent intent)
        {
-            await AppHelpers.PerformUpdateTasksAsync(
-                ServiceContainer.Resolve<ISyncService>("syncService"),
-                ServiceContainer.Resolve<IDeviceActionService>("deviceActionService"), 
-                ServiceContainer.Resolve<IStateService>("stateService"));
+            var storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            await AppHelpers.PerformUpdateTasksAsync(ServiceContainer.Resolve<ISyncService>("syncService"),
+                ServiceContainer.Resolve<IDeviceActionService>("deviceActionService"), storageService);
        }
    }
 }
--- a/src/Android/Renderers/CustomEntryRenderer.cs
+++ b/src/Android/Renderers/CustomEntryRenderer.cs
@@ -29,16 +29,7 @@ namespace Bit.Droid.Renderers
                    Control.PaddingBottom + 20);
                Control.ImeOptions = Control.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning |
                    (ImeAction)ImeFlags.NoExtractUi;
-            }   
-        }
-
-        // Workaround for bug preventing long-press -> copy/paste on Android 11
-        // See https://issuetracker.google.com/issues/37095917
-        protected override void OnAttachedToWindow()
-        {
-            base.OnAttachedToWindow();
-            Control.Enabled = false;
-            Control.Enabled = true;
+            }
        }

        // Workaround for failure to disable text prediction on non-password fields
--- a/src/Android/Resources/drawable/cog_settings.xml
+++ b/src/Android/Resources/drawable/cog_settings.xml
--- a/src/Android/Resources/drawable/cog_environment.xml
+++ b/src/Android/Resources/drawable/cog_environment.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1792"
-    android:viewportHeight="1792">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M1152,896q0,-106 -75,-181t-181,-75 -181,75 -75,181 75,181 181,75 181,-75 75,-181zM1664,787v222q0,12 -8,23t-20,13l-185,28q-19,54 -39,91 35,50 107,138 10,12 10,25t-9,23q-27,37 -99,108t-94,71q-12,0 -26,-9l-138,-108q-44,23 -91,38 -16,136 -29,186 -7,28 -36,28h-222q-14,0 -24.5,-8.5t-11.5,-21.5l-28,-184q-49,-16 -90,-37l-141,107q-10,9 -25,9 -14,0 -25,-11 -126,-114 -165,-168 -7,-10 -7,-23 0,-12 8,-23 15,-21 51,-66.5t54,-70.5q-27,-50 -41,-99l-183,-27q-13,-2 -21,-12.5t-8,-23.5v-222q0,-12 8,-23t19,-13l186,-28q14,-46 39,-92 -40,-57 -107,-138 -10,-12 -10,-24 0,-10 9,-23 26,-36 98.5,-107.5t94.5,-71.5q13,0 26,10l138,107q44,-23 91,-38 16,-136 29,-186 7,-28 36,-28h222q14,0 24.5,8.5t11.5,21.5l28,184q49,16 90,37l142,-107q9,-9 24,-9 13,0 25,10 129,119 165,170 7,8 7,22 0,12 -8,23 -15,21 -51,66.5t-54,70.5q26,50 41,98l183,28q13,2 21,12.5t8,23.5z" />
-</vector>
--- a/src/Android/Resources/drawable/ic_warning.xml
+++ b/src/Android/Resources/drawable/ic_warning.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="19dp"
-    android:viewportWidth="22"
-    android:viewportHeight="19">
-    <path
-        android:fillColor="#dd4b39"
-        android:pathData="M19.16 18.71H2.64c-0.36 0-0.72-0.09-1.03-0.27c-0.31-0.2-0.57-0.46-0.74-0.78c-0.18-0.32-0.27-0.67-0.27-1.04c0-0.36 0.1-0.72 0.28-1.03L9.14 1.1C9.32 0.76 9.58 0.5 9.89 0.32c0.3-0.18 0.65-0.28 1-0.28c0.36 0 0.7 0.1 1.02 0.28c0.3 0.18 0.56 0.44 0.74 0.75l8.26 14.51c0.18 0.31 0.28 0.67 0.28 1.03c0 0.37-0.09 0.72-0.26 1.04c-0.18 0.32-0.44 0.59-0.75 0.78c-0.31 0.18-0.66 0.28-1.02 0.27zM10.9 1.38c-0.13 0-0.26 0.04-0.38 0.1c-0.11 0.07-0.2 0.16-0.27 0.28L1.99 16.27c-0.07 0.11-0.1 0.24-0.1 0.36C1.9 16.76 1.92 16.9 2 17c0.06 0.12 0.16 0.22 0.27 0.3c0.12 0.06 0.25 0.1 0.38 0.1h16.52c0.13 0 0.26-0.04 0.37-0.1c0.12-0.08 0.21-0.18 0.28-0.3c0.06-0.1 0.1-0.23 0.1-0.36c0-0.12-0.04-0.25-0.1-0.36l-8.26-14.5c-0.07-0.13-0.17-0.22-0.28-0.29c-0.11-0.06-0.24-0.1-0.37-0.1zm0 11.42c-0.17 0-0.34-0.07-0.46-0.2c-0.12-0.12-0.19-0.29-0.19-0.46v-6.1c0-0.18 0.07-0.35 0.2-0.47c0.11-0.13 0.28-0.2 0.45-0.2c0.17 0 0.33 0.07 0.45 0.2c0.12 0.12 0.19 0.3 0.19 0.47v6.1c0 0.17-0.07 0.34-0.19 0.47c-0.12 0.12-0.28 0.2-0.45 0.2zm0 3.3c0.42 0 0.76-0.36 0.76-0.8c0-0.43-0.34-0.78-0.76-0.78c-0.43 0-0.77 0.35-0.77 0.79c0 0.43 0.34 0.79 0.77 0.79z"/>
-</vector>
--- a/src/Android/Resources/values-v30/manifest.xml
+++ b/src/Android/Resources/values-v30/manifest.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<resources>
-  <integer name="launchModeAPIlevel">0</integer>
-</resources>
--- a/src/Android/Resources/values/manifest.xml
+++ b/src/Android/Resources/values/manifest.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<resources>
-  <integer name="launchModeAPIlevel">2</integer>
-</resources>
--- a/src/Android/Resources/xml/autofillservice.xml
+++ b/src/Android/Resources/xml/autofillservice.xml
@@ -77,9 +77,6 @@
  <compatibility-package
    android:name="com.kiwibrowser.browser"
    android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.kiwibrowser.browser.dev"
-    android:maxLongVersionCode="10000000000"/>
  <compatibility-package
    android:name="com.microsoft.emmx"
    android:maxLongVersionCode="10000000000"/>
@@ -119,9 +116,6 @@
  <compatibility-package
    android:name="com.opera.touch"
    android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.qflair.browserq"
-    android:maxLongVersionCode="10000000000"/>
  <compatibility-package
    android:name="com.qwant.liberty"
    android:maxLongVersionCode="10000000000"/>
--- a/src/Android/Services/AndroidPushNotificationService.cs
+++ b/src/Android/Services/AndroidPushNotificationService.cs
@@ -1,8 +1,8 @@
 #if !FDROID
 using System;
 using System.Threading.Tasks;
-using AndroidX.Core.App;
 using Bit.App.Abstractions;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Xamarin.Forms;

@@ -10,27 +10,25 @@ namespace Bit.Droid.Services
 {
    public class AndroidPushNotificationService : IPushNotificationService
    {
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
        private readonly IPushNotificationListenerService _pushNotificationListenerService;

        public AndroidPushNotificationService(
-            IStateService stateService,
+            IStorageService storageService,
            IPushNotificationListenerService pushNotificationListenerService)
        {
-            _stateService = stateService;
+            _storageService = storageService;
            _pushNotificationListenerService = pushNotificationListenerService;
        }

-        public bool IsRegisteredForPush => NotificationManagerCompat.From(Android.App.Application.Context)?.AreNotificationsEnabled() ?? false;
-
        public async Task<string> GetTokenAsync()
        {
-            return await _stateService.GetPushCurrentTokenAsync();
+            return await _storageService.GetAsync<string>(Constants.PushCurrentTokenKey);
        }

        public async Task RegisterAsync()
        {
-            var registeredToken = await _stateService.GetPushRegisteredTokenAsync();
+            var registeredToken = await _storageService.GetAsync<string>(Constants.PushRegisteredTokenKey);
            var currentToken = await GetTokenAsync();
            if (!string.IsNullOrWhiteSpace(registeredToken) && registeredToken != currentToken)
            {
@@ -38,7 +36,7 @@ namespace Bit.Droid.Services
            }
            else
            {
-                await _stateService.SetPushLastRegistrationDateAsync(DateTime.UtcNow);
+                await _storageService.SaveAsync(Constants.PushLastRegistrationDateKey, DateTime.UtcNow);
            }
        }

--- a/src/Android/Services/ClipboardService.cs
+++ b/src/Android/Services/ClipboardService.cs
@@ -1,57 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Android.App;
-using Android.Content;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Droid.Receivers;
-using Plugin.CurrentActivity;
-using Xamarin.Essentials;
-
-namespace Bit.Droid.Services
-{
-    public class ClipboardService : IClipboardService
-    {
-        private readonly IStateService _stateService;
-        private readonly Lazy<PendingIntent> _clearClipboardPendingIntent;
-
-        public ClipboardService(IStateService stateService)
-        {
-            _stateService = stateService;
-
-            _clearClipboardPendingIntent = new Lazy<PendingIntent>(() =>
-                PendingIntent.GetBroadcast(CrossCurrentActivity.Current.Activity,
-                                           0,
-                                           new Intent(CrossCurrentActivity.Current.Activity, typeof(ClearClipboardAlarmReceiver)),
-                                           PendingIntentFlags.UpdateCurrent));
-        }
-
-        public async Task CopyTextAsync(string text, int expiresInMs = -1)
-        {
-            await Clipboard.SetTextAsync(text);
-
-            await ClearClipboardAlarmAsync(expiresInMs);
-        }
-
-        private async Task ClearClipboardAlarmAsync(int expiresInMs = -1)
-        {
-            var clearMs = expiresInMs;
-            if (clearMs < 0)
-            {
-                // if not set then we need to check if the user set this config
-                var clearSeconds = await _stateService.GetClearClipboardAsync();
-                if (clearSeconds != null)
-                {
-                    clearMs = clearSeconds.Value * 1000;
-                }
-            }
-            if (clearMs < 0)
-            {
-                return;
-            }
-            var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + clearMs;
-            var alarmManager = CrossCurrentActivity.Current.Activity.GetSystemService(Context.AlarmService) as AlarmManager;
-            alarmManager.Set(AlarmType.Rtc, triggerMs, _clearClipboardPendingIntent.Value);
-        }
-    }
-}
--- a/src/Android/Services/DeviceActionService.cs
+++ b/src/Android/Services/DeviceActionService.cs
@@ -33,7 +33,7 @@ namespace Bit.Droid.Services
 {
    public class DeviceActionService : IDeviceActionService
    {
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
        private readonly IMessagingService _messagingService;
        private readonly IBroadcasterService _broadcasterService;
        private readonly Func<IEventService> _eventServiceFunc;
@@ -43,12 +43,12 @@ namespace Bit.Droid.Services
        private string _userAgent;

        public DeviceActionService(
-            IStateService stateService,
+            IStorageService storageService,
            IMessagingService messagingService,
            IBroadcasterService broadcasterService,
            Func<IEventService> eventServiceFunc)
        {
-            _stateService = stateService;
+            _storageService = storageService;
            _messagingService = messagingService;
            _broadcasterService = broadcasterService;
            _eventServiceFunc = eventServiceFunc;
@@ -250,7 +250,7 @@ namespace Bit.Droid.Services
            try
            {
                DeleteDir(CrossCurrentActivity.Current.Activity.CacheDir);
-                await _stateService.SetLastFileCacheClearAsync(DateTime.UtcNow);
+                await _storageService.SaveAsync(Constants.LastFileCacheClearKey, DateTime.UtcNow);
            }
            catch (Exception) { }
        }
@@ -833,8 +833,9 @@ namespace Bit.Droid.Services
        {
            if (!string.IsNullOrWhiteSpace(cipher?.Login?.Totp))
            {
-                var autoCopyDisabled = await _stateService.GetDisableAutoTotpCopyAsync();
-                var canAccessPremium = await _stateService.CanAccessPremiumAsync();
+                var userService = ServiceContainer.Resolve<IUserService>("userService");
+                var autoCopyDisabled = await _storageService.GetAsync<bool?>(Constants.DisableAutoTotpCopyKey);
+                var canAccessPremium = await userService.CanAccessPremiumAsync();
                if ((canAccessPremium || cipher.OrganizationUseTotp) && !autoCopyDisabled.GetValueOrDefault())
                {
                    var totpService = ServiceContainer.Resolve<ITotpService>("totpService");
--- a/src/Android/Tiles/AutofillTileService.cs
+++ b/src/Android/Tiles/AutofillTileService.cs
@@ -4,6 +4,7 @@ using Android.Content;
 using Android.Runtime;
 using Android.Service.QuickSettings;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Bit.Droid.Accessibility;
@@ -17,7 +18,7 @@ namespace Bit.Droid.Tile
    [Register("com.x8bit.bitwarden.AutofillTileService")]
    public class AutofillTileService : TileService
    {
-        private IStateService _stateService;
+        private IStorageService _storageService;
        
        public override void OnTileAdded()
        {
@@ -58,11 +59,11 @@ namespace Bit.Droid.Tile
        private void SetTileAdded(bool isAdded)
        {
            AccessibilityHelpers.IsAutofillTileAdded = isAdded;
-            if (_stateService == null)
+            if (_storageService == null)
            {
-                _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            }
-            _stateService.SetAutofillTileAddedAsync(isAdded);
+            _storageService.SaveAsync(Constants.AutofillTileAdded, isAdded);
        }

        private void ScanAndFill()
--- a/src/Android/Utilities/AppCenterHelper.cs
+++ b/src/Android/Utilities/AppCenterHelper.cs
@@ -12,22 +12,22 @@ namespace Bit.Droid.Utilities
        private const string AppSecret = "d3834185-b4a6-4347-9047-b86c65293d42";

        private readonly IAppIdService _appIdService;
-        private readonly IStateService _stateService;
+        private readonly IUserService _userService;

        private string _userId;
        private string _appId;
        
        public AppCenterHelper(
            IAppIdService appIdService,
-            IStateService stateService)
+            IUserService userService)
        {
            _appIdService = appIdService;
-            _stateService = stateService;
+            _userService = userService;
        }

        public async Task InitAsync()
        {
-            _userId = await _stateService.GetActiveUserIdAsync();
+            _userId = await _userService.GetUserIdAsync();
            _appId = await _appIdService.GetAppIdAsync();
            
            AppCenter.Start(AppSecret, typeof(Crashes));
--- a/src/Android/Utilities/IntentExtensions.cs
+++ b/src/Android/Utilities/IntentExtensions.cs
@@ -1,22 +0,0 @@
-using Android.Content;
-using Android.OS;
-
-namespace Bit.Droid.Utilities
-{
-    public static class IntentExtensions
-    {
-        public static void Validate(this Intent intent)
-        {
-            try
-            {
-                // Check if getting the bundle of the extras causes any exception when unparcelling
-                // Note: getting the bundle like this will cause to call unparcel() internally
-                var b = intent?.Extras?.GetBundle("trashstringwhichhasnousebuttocheckunparcel");
-            }
-            catch (BadParcelableException)
-            {
-                intent.ReplaceExtras((Bundle)null);
-            }
-        }
-    }
-}
--- a/src/Android/WebAuthCallbackActivity.cs
+++ b/src/Android/WebAuthCallbackActivity.cs
@@ -1,7 +1,5 @@
 using Android.App;
 using Android.Content.PM;
-using Android.OS;
-using Bit.Droid.Utilities;

 namespace Bit.Droid
 {
@@ -11,12 +9,5 @@ namespace Bit.Droid
    [IntentFilter(new[] { Android.Content.Intent.ActionView },
        Categories = new[] { Android.Content.Intent.CategoryDefault, Android.Content.Intent.CategoryBrowsable },
        DataScheme = "bitwarden")]
-    public class WebAuthCallbackActivity : Xamarin.Essentials.WebAuthenticatorCallbackActivity
-    {
-        protected override void OnCreate(Bundle savedInstanceState)
-        {
-            Intent?.Validate();
-            base.OnCreate(savedInstanceState);
-        }
-    }
+    public class WebAuthCallbackActivity : Xamarin.Essentials.WebAuthenticatorCallbackActivity { }
 }
--- a/src/App/Abstractions/IPasswordRepromptService.cs
+++ b/src/App/Abstractions/IPasswordRepromptService.cs
@@ -7,9 +7,5 @@ namespace Bit.App.Abstractions
        string[] ProtectedFields { get; }

        Task<bool> ShowPasswordPromptAsync();
-        
-        Task<(string password, bool valid)> ShowPasswordPromptAndGetItAsync();
-
-        Task<bool> Enabled();
    }
 }
--- a/src/App/Abstractions/IPushNotificationService.cs
+++ b/src/App/Abstractions/IPushNotificationService.cs
@@ -4,7 +4,6 @@ namespace Bit.App.Abstractions
 {
    public interface IPushNotificationService
    {
-        bool IsRegisteredForPush { get; }
        Task<string> GetTokenAsync();
        Task RegisterAsync();
        Task UnregisterAsync();
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -15,11 +15,9 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.4.0" />
    <PackageReference Include="Plugin.Fingerprint" Version="2.1.4" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.3" />
-    <PackageReference Include="Xamarin.CommunityToolkit" Version="1.3.2" />
    <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
    <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2291" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
    <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
    <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
  </ItemGroup>
@@ -122,7 +120,6 @@
      <DependentUpon>SendGroupingsPage.xaml</DependentUpon>
      <SubType>Code</SubType>
    </Compile>
-    <Compile Remove="Pages\Accounts\AccountsPopupPage.xaml.cs" />
  </ItemGroup>

  <ItemGroup>
@@ -134,7 +131,6 @@
    <EmbeddedResource Update="Controls\CipherViewCell\CipherViewCell.xaml">
      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
    </EmbeddedResource>
-    <EmbeddedResource Remove="Pages\Accounts\AccountsPopupPage.xaml" />
  </ItemGroup>

  <ItemGroup>
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -4,8 +4,8 @@ using Bit.App.Pages;
 using Bit.App.Resources;
 using Bit.App.Services;
 using Bit.App.Utilities;
+using Bit.Core;
 using Bit.Core.Abstractions;
-using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 using System;
 using System.Threading.Tasks;
@@ -17,6 +17,7 @@ namespace Bit.App
 {
    public partial class App : Application
    {
+        private readonly IUserService _userService;
        private readonly IBroadcasterService _broadcasterService;
        private readonly IMessagingService _messagingService;
        private readonly IStateService _stateService;
@@ -24,6 +25,7 @@ namespace Bit.App
        private readonly ISyncService _syncService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly IAuthService _authService;
+        private readonly IStorageService _storageService;
        private readonly IStorageService _secureStorageService;
        private readonly IDeviceActionService _deviceActionService;

@@ -37,6 +39,7 @@ namespace Bit.App
                Current = this;
                return;
            }
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
@@ -44,6 +47,7 @@ namespace Bit.App
            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
            _authService = ServiceContainer.Resolve<IAuthService>("authService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _secureStorageService = ServiceContainer.Resolve<IStorageService>("secureStorageService");
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");

@@ -80,12 +84,8 @@ namespace Bit.App
                }
                else if (message.Command == "logout")
                {
-                    var extras = message.Data as Tuple<string, bool, bool>;
-                    var userId = extras?.Item1;
-                    var userInitiated = extras?.Item2;
-                    var expired = extras?.Item3;
                    Device.BeginInvokeOnMainThread(async () =>
-                        await LogOutAsync(userId, userInitiated, expired));
+                        await LogOutAsync((message.Data as bool?).GetValueOrDefault()));
                }
                else if (message.Command == "loggedOut")
                {
@@ -106,18 +106,6 @@ namespace Bit.App
                        await SleptAsync();
                    }
                }
-                else if (message.Command == "addAccount")
-                {
-                    await AddAccount();
-                }
-                else if (message.Command == "accountAdded")
-                {
-                    UpdateTheme();
-                }
-                else if (message.Command == "switchedAccount")
-                {
-                    await SwitchedAccountAsync();
-                }
                else if (message.Command == "migrated")
                {
                    await Task.Delay(1000);
@@ -125,8 +113,7 @@ namespace Bit.App
                }
                else if (message.Command == "popAllAndGoToTabGenerator" ||
                    message.Command == "popAllAndGoToTabMyVault" ||
-                    message.Command == "popAllAndGoToTabSend" ||
-                    message.Command == "popAllAndGoToAutofillCiphers")
+                    message.Command == "popAllAndGoToTabSend")
                {
                    Device.BeginInvokeOnMainThread(async () =>
                    {
@@ -136,11 +123,7 @@ namespace Bit.App
                            {
                                await tabsPage.Navigation.PopModalAsync(false);
                            }
-                            if (message.Command == "popAllAndGoToAutofillCiphers")
-                            {
-                                Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
-                            }
-                            else if (message.Command == "popAllAndGoToTabMyVault")
+                            if (message.Command == "popAllAndGoToTabMyVault")
                            {
                                Options.MyVaultTile = false;
                                tabsPage.ResetToVaultPage();
@@ -157,15 +140,6 @@ namespace Bit.App
                        }
                    });
                }
-                else if (message.Command == "convertAccountToKeyConnector")
-                {
-                    Device.BeginInvokeOnMainThread(async () =>
-                    {
-                        await Application.Current.MainPage.Navigation.PushModalAsync(
-                            new NavigationPage(new RemoveMasterPasswordPage()));
-                    });
-                }
-
            });
        }

@@ -179,7 +153,7 @@ namespace Bit.App
            if (string.IsNullOrWhiteSpace(Options.Uri))
            {
                var updated = await AppHelpers.PerformUpdateTasksAsync(_syncService, _deviceActionService,
-                    _stateService);
+                    _storageService);
                if (!updated)
                {
                    SyncIfNeeded();
@@ -188,8 +162,6 @@ namespace Bit.App
            if (Device.RuntimePlatform == Device.Android)
            {
                await _vaultTimeoutService.CheckVaultTimeoutAsync();
-                // Reset delay on every start
-                _vaultTimeoutService.DelayLockAndLogoutMs = null;
            }
            _messagingService.Send("startEventTimer");
        }
@@ -203,7 +175,7 @@ namespace Bit.App
                var isLocked = await _vaultTimeoutService.IsLockedAsync();
                if (!isLocked)
                {
-                    await _stateService.SetLastActiveTimeAsync(_deviceActionService.GetActiveTime());
+                    await _storageService.SaveAsync(Constants.LastActiveTimeKey, _deviceActionService.GetActiveTime());
                }
                SetTabsPageFromAutofill(isLocked);
                await SleptAsync();
@@ -222,7 +194,7 @@ namespace Bit.App

        private async Task SleptAsync()
        {
-            await _vaultTimeoutService.CheckVaultTimeoutAsync();
+            await HandleVaultTimeoutAsync();
            _messagingService.Send("stopEventTimer");
        }

@@ -248,65 +220,27 @@ namespace Bit.App
            new System.Globalization.UmAlQuraCalendar();
        }

-        private async Task LogOutAsync(string userId, bool? userInitiated, bool? expired)
+        private async Task LogOutAsync(bool expired)
        {
-            await AppHelpers.LogOutAsync(userId, userInitiated.GetValueOrDefault(true));
-            await SetMainPageAsync();
+            await AppHelpers.LogOutAsync();
            _authService.LogOut(() =>
            {
-                if (expired.GetValueOrDefault())
+                Current.MainPage = new HomePage();
+                if (expired)
                {
                    _platformUtilsService.ShowToast("warning", null, AppResources.LoginExpired);
                }
            });
        }

-        private async Task AddAccount()
-        {
-            Device.BeginInvokeOnMainThread(async () =>
-            {
-                Current.MainPage = new NavigationPage(new HomePage(Options));
-            });
-        }
-
-        private async Task SwitchedAccountAsync()
-        {
-            await AppHelpers.OnAccountSwitchAsync();
-            var shouldTimeout = await _vaultTimeoutService.ShouldTimeoutAsync();
-            Device.BeginInvokeOnMainThread(async () =>
-            {
-                if (shouldTimeout)
-                {
-                    await _vaultTimeoutService.ExecuteTimeoutActionAsync();
-                }
-                else
-                {
-                    await SetMainPageAsync();
-                }
-                await Task.Delay(50);
-                UpdateTheme();
-            });
-        }
-
        private async Task SetMainPageAsync()
        {
-            var authed = await _stateService.IsAuthenticatedAsync();
+            var authed = await _userService.IsAuthenticatedAsync();
            if (authed)
            {
-                var isLocked = await _vaultTimeoutService.IsLockedAsync();
-                var shouldTimeout = await _vaultTimeoutService.ShouldTimeoutAsync();
-                var vaultTimeoutAction = await _stateService.GetVaultTimeoutActionAsync();
-                if (isLocked || shouldTimeout)
+                if (await _vaultTimeoutService.IsLockedAsync())
                {
-                    if (vaultTimeoutAction == "logOut")
-                    {
-                        var email = await _stateService.GetEmailAsync();
-                        Current.MainPage = new NavigationPage(new LoginPage(email, Options));
-                    }
-                    else
-                    {
-                        Current.MainPage = new NavigationPage(new LockPage(Options));
-                    }
+                    Current.MainPage = new NavigationPage(new LockPage(Options));
                }
                else if (Options.FromAutofillFramework && Options.SaveType.HasValue)
                {
@@ -327,13 +261,40 @@ namespace Bit.App
            }
            else
            {
-                Current.MainPage = new NavigationPage(new HomePage(Options));
+                Current.MainPage = new HomePage(Options);
+            }
+        }
+
+        private async Task HandleVaultTimeoutAsync()
+        {
+            if (await _vaultTimeoutService.IsLockedAsync())
+            {
+                return;
+            }
+            var authed = await _userService.IsAuthenticatedAsync();
+            if (!authed)
+            {
+                return;
+            }
+            var vaultTimeout = await _storageService.GetAsync<int?>(Constants.VaultTimeoutKey);
+            vaultTimeout = vaultTimeout.GetValueOrDefault(-1);
+            if (vaultTimeout == 0)
+            {
+                var action = await _storageService.GetAsync<string>(Constants.VaultTimeoutActionKey);
+                if (action == "logOut")
+                {
+                    await _vaultTimeoutService.LogOutAsync();
+                }
+                else
+                {
+                    await _vaultTimeoutService.LockAsync(true);
+                }
            }
        }

        private async Task ClearCacheIfNeededAsync()
        {
-            var lastClear = await _stateService.GetLastFileCacheClearAsync();
+            var lastClear = await _storageService.GetAsync<DateTime?>(Constants.LastFileCacheClearKey);
            if ((DateTime.UtcNow - lastClear.GetValueOrDefault(DateTime.MinValue)).TotalDays >= 1)
            {
                var task = Task.Run(() => _deviceActionService.ClearCacheAsync());
@@ -376,12 +337,12 @@ namespace Bit.App
        {
            InitializeComponent();
            SetCulture();
-            ThemeManager.SetTheme(Current.Resources);
+            ThemeManager.SetTheme(Device.RuntimePlatform == Device.Android, Current.Resources);
            Current.RequestedThemeChanged += (s, a) =>
            {
                UpdateTheme();
            };
-            Current.MainPage = new NavigationPage(new HomePage(Options));
+            Current.MainPage = new HomePage();
            var mainPageTask = SetMainPageAsync();
            ServiceContainer.Resolve<MobilePlatformUtilsService>("platformUtilsService").Init();
        }
@@ -407,16 +368,17 @@ namespace Bit.App
        {
            Device.BeginInvokeOnMainThread(() =>
            {
-                ThemeManager.SetTheme(Current.Resources);
+                ThemeManager.SetTheme(Device.RuntimePlatform == Device.Android, Current.Resources);
                _messagingService.Send("updatedTheme");
            });
        }

        private async Task LockedAsync(bool autoPromptBiometric)
        {
+            await _stateService.PurgeAsync();
            if (autoPromptBiometric && Device.RuntimePlatform == Device.iOS)
            {
-                var vaultTimeout = await _stateService.GetVaultTimeoutAsync();
+                var vaultTimeout = await _storageService.GetAsync<int?>(Constants.VaultTimeoutKey);
                if (vaultTimeout == 0)
                {
                    autoPromptBiometric = false;
@@ -446,7 +408,7 @@ namespace Bit.App
                    }
                }
            }
-            await _stateService.SetPreviousPageInfoAsync(lastPageBeforeLock);
+            await _storageService.SaveAsync(Constants.PreviousPageKey, lastPageBeforeLock);
            var lockPage = new LockPage(Options, autoPromptBiometric);
            Device.BeginInvokeOnMainThread(() => Current.MainPage = new NavigationPage(lockPage));
        }
--- a/src/App/Controls/AccountViewCell/AccountViewCell.xaml
+++ b/src/App/Controls/AccountViewCell/AccountViewCell.xaml
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
-          xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-          xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
-          x:Class="Bit.App.Controls.AccountViewCell"
-          xmlns:controls="clr-namespace:Bit.App.Controls"
-          xmlns:u="clr-namespace:Bit.App.Utilities"
-          x:DataType="controls:AccountViewCellViewModel">
-    <Grid RowSpacing="0"
-          ColumnSpacing="0">
-
-        <Grid.Resources>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-        </Grid.Resources>
-
-        <Grid
-            IsVisible="{Binding IsAccount}"
-            VerticalOptions="CenterAndExpand">
-            
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Grid
-                Grid.Row="0"
-                Grid.Column="0"
-                RowSpacing="3"
-                Margin="12,0,0,0"
-                VerticalOptions="Center">
-
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <Label
-                    Grid.Column="0"
-                    Grid.Row="0"
-                    Text="{Binding AccountView.Email}"
-                    StyleClass="list-title"
-                    LineBreakMode="TailTruncation" />
-                <Label
-                    Grid.Column="0"
-                    Grid.Row="1"
-                    Text="{Binding AccountView.Hostname}"
-                    StyleClass="list-sub"
-                    LineBreakMode="TailTruncation" />
-            </Grid>
-
-            <Label
-                Grid.Column="1"
-                Grid.Row="0"
-                Text="{Binding AuthStatusText}"
-                FontSize="Small"
-                FontAttributes="Italic"
-                LineBreakMode="NoWrap"
-                HorizontalOptions="End"
-                Margin="10,0,20,0"
-                VerticalOptions="Center" />
-        </Grid>
-
-        <Grid
-            IsVisible="{Binding IsAccount, Converter={StaticResource inverseBool}}"
-            VerticalOptions="CenterAndExpand">
-            
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="36" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <Image
-                Grid.Column="0"
-                VerticalOptions="Center"
-                Margin="12,0,0,0"
-                WidthRequest="{OnPlatform 14, iOS=14, Android=26}"
-                HeightRequest="{OnPlatform 14, iOS=14, Android=26}"
-                Source="plus.png"
-                xct:IconTintColorEffect.TintColor="{DynamicResource TextColor}"
-                AutomationProperties.IsInAccessibleTree="False" />
-            <Label
-                Text="Add Account"
-                StyleClass="list-title"
-                LineBreakMode="TailTruncation"
-                VerticalOptions="Center"
-                Grid.Column="1" />
-        </Grid>
-    </Grid>
-</ViewCell>
--- a/src/App/Controls/AccountViewCell/AccountViewCell.xaml.cs
+++ b/src/App/Controls/AccountViewCell/AccountViewCell.xaml.cs
@@ -1,35 +0,0 @@
-using Bit.Core.Models.View;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class AccountViewCell : ViewCell
-    {
-        public static readonly BindableProperty AccountProperty = BindableProperty.Create(
-            nameof(Account), typeof(AccountView), typeof(AccountViewCell), default(AccountView), BindingMode.OneWay);
-
-        public AccountViewCell()
-        {
-            InitializeComponent();
-        }
-
-        public AccountView Account
-        {
-            get => GetValue(AccountProperty) as AccountView;
-            set => SetValue(AccountProperty, value);
-        }
-
-        protected override void OnPropertyChanged(string propertyName = null)
-        {
-            base.OnPropertyChanged(propertyName);
-            if (propertyName == AccountProperty.PropertyName)
-            {
-                if (Account == null)
-                {
-                    return;
-                }
-                BindingContext = new AccountViewCellViewModel(Account);
-            }
-        }
-    }
-}
--- a/src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs
+++ b/src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs
@@ -1,31 +0,0 @@
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Controls
-{
-    public class AccountViewCellViewModel : ExtendedViewModel
-    {
-        private AccountView _accountView;
-
-        public AccountViewCellViewModel(AccountView accountView)
-        {
-            AccountView = accountView;
-        }
-
-        public AccountView AccountView
-        {
-            get => _accountView;
-            set => SetProperty(ref _accountView, value);
-        }
-
-        public bool IsAccount
-        {
-            get => AccountView.IsAccount;
-        }
-
-        public string AuthStatusText
-        {
-            get => AccountView.AuthStatus.ToString();
-        }
-    }
-}
--- a/src/App/Controls/AvatarImageSource.cs
+++ b/src/App/Controls/AvatarImageSource.cs
@@ -1,114 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using SkiaSharp;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class AvatarImageSource : StreamImageSource
-    {
-        private string _data;
-
-        public AvatarImageSource(string data = null)
-        {
-            _data = data;
-        }
-
-        public override Func<CancellationToken, Task<Stream>> Stream => GetStreamAsync;
-
-        private Task<Stream> GetStreamAsync(CancellationToken userToken = new CancellationToken())
-        {
-            OnLoadingStarted();
-            userToken.Register(CancellationTokenSource.Cancel);
-            var result = Draw();
-            OnLoadingCompleted(CancellationTokenSource.IsCancellationRequested);
-            return Task.FromResult(result);
-        }
-
-        private Stream Draw()
-        {
-            string chars = null;
-            string upperData = null;
-
-            if (string.IsNullOrEmpty(_data))
-            {
-                chars = "..";
-            }
-            else if (_data?.Length > 2)
-            {
-                upperData = _data.ToUpper();
-                chars = upperData.Substring(0, 2).ToUpper();
-            }
-
-            var bgColor = StringToColor(upperData);
-            var textColor = Color.White;
-            var size = 50;
-
-            var bitmap = new SKBitmap(
-                size * 2,
-                size * 2,
-                SKImageInfo.PlatformColorType,
-                SKAlphaType.Premul);
-            var canvas = new SKCanvas(bitmap);
-            canvas.Clear(SKColors.Transparent);
-
-            var midX = canvas.LocalClipBounds.Size.ToSizeI().Width / 2;
-            var midY = canvas.LocalClipBounds.Size.ToSizeI().Height / 2;
-            var radius = midX - midX / 5;
-
-            var circlePaint = new SKPaint
-            {
-                IsAntialias = true,
-                Style = SKPaintStyle.Fill,
-                StrokeJoin = SKStrokeJoin.Miter,
-                Color = SKColor.Parse(bgColor.ToHex())
-            };
-            canvas.DrawCircle(midX, midY, radius, circlePaint);
-
-            var typeface = SKTypeface.FromFamilyName("Arial", SKFontStyle.Normal);
-            var textSize = midX / 1.3f;
-            var textPaint = new SKPaint
-            {
-                IsAntialias = true,
-                Style = SKPaintStyle.Fill,
-                Color = SKColor.Parse(textColor.ToHex()),
-                TextSize = textSize,
-                TextAlign = SKTextAlign.Center,
-                Typeface = typeface
-            };
-            var rect = new SKRect();
-            textPaint.MeasureText(chars, ref rect);
-            canvas.DrawText(chars, midX, midY + rect.Height / 2, textPaint);
-
-            return SKImage.FromBitmap(bitmap).Encode(SKEncodedImageFormat.Png, 100).AsStream();
-        }
-
-        private Color StringToColor(string str)
-        {
-            if (str == null)
-            {
-                return Color.FromHex("#33ffffff");
-            }
-            var hash = 0;
-            for (var i = 0; i < str.Length; i++)
-            {
-                hash = str[i] + ((hash << 5) - hash);
-            }
-            var color = "#FF";
-            for (var i = 0; i < 3; i++)
-            {
-                var value = (hash >> (i * 8)) & 0xff;
-                var base16 = "00" + Convert.ToString(value, 16);
-                color += base16.Substring(base16.Length - 2);
-            }
-            //if (Device.RuntimePlatform == Device.iOS)
-            //{
-            //    // TODO remove this once iOS ToolbarItem tint issue is solved
-            //    return Color.FromHex("#33ffffff");
-            //}
-            return Color.FromHex(color);
-        }
-    }
-}
--- a/src/App/Controls/ExtendedToolbarItem.cs
+++ b/src/App/Controls/ExtendedToolbarItem.cs
@@ -1,9 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class ExtendedToolbarItem : ToolbarItem
-    {
-        public bool UseOriginalImage { get; set; }
-    }
-}
--- a/src/Core/Models/Data/PreviousPageInfo.cs
+++ b/src/Core/Models/Data/PreviousPageInfo.cs
@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Data
+namespace Bit.App.Models
 {
    public class PreviousPageInfo
    {
--- a/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs
+++ b/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs
@@ -14,7 +14,7 @@ namespace Bit.App.Pages
    public class BaseChangePasswordViewModel : BaseViewModel
    {
        protected readonly IPlatformUtilsService _platformUtilsService;
-        protected readonly IStateService _stateService;
+        protected readonly IUserService _userService;
        protected readonly IPolicyService _policyService;
        protected readonly IPasswordGenerationService _passwordGenerationService;
        protected readonly II18nService _i18nService;
@@ -31,7 +31,7 @@ namespace Bit.App.Pages
        protected BaseChangePasswordViewModel()
        {
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
            _passwordGenerationService =
                ServiceContainer.Resolve<IPasswordGenerationService>("passwordGenerationService");
@@ -172,7 +172,7 @@ namespace Bit.App.Pages

        private async Task<List<string>> GetPasswordStrengthUserInput()
        {
-            var email = await _stateService.GetEmailAsync();
+            var email = await _userService.GetEmailAsync();
            List<string> userInput = null;
            var atPosition = email.IndexOf('@');
            if (atPosition > -1)
--- a/src/App/Pages/Accounts/DeleteAccountPage.xaml
+++ b/src/App/Pages/Accounts/DeleteAccountPage.xaml
@@ -1,81 +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.Accounts.DeleteAccountPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:DataType="pages:DeleteAccountViewModel"
-    Title="{Binding PageTitle}">
-    <ContentPage.BindingContext>
-        <pages:DeleteAccountViewModel />
-    </ContentPage.BindingContext>
-
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-    </ContentPage.ToolbarItems>
-
-    <ContentPage.Resources>
-        <Style TargetType="Label" x:Key="lblDescription">
-           <Setter Property="FontSize" Value="{OnPlatform Android=Large, iOS=Small}" />
-        </Style>
-    </ContentPage.Resources>
-
-    <ContentPage.Content>
-        <Grid Padding="20, 30" RowSpacing="0">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Image
-                Source="ic_warning"
-                WidthRequest="28"
-                HeightRequest="25"
-                HorizontalOptions="Start" />
-            <Label
-                Grid.Row="1"
-                Grid.ColumnSpan="2"
-                Text="{u:I18n DeletingYourAccountIsPermanent}"
-                HorizontalOptions="Start"
-                StyleClass="title-danger"
-                Margin="0,15,0,0"/>
-            <Label
-                Grid.Row="2"
-                Grid.ColumnSpan="2"
-                Text="{u:I18n DeleteAccountExplanation}"
-                Style="{StaticResource lblDescription}"
-                HorizontalOptions="Start"
-                Margin="0,6,50,0"
-                Opacity="0.6" />
-            <Button
-                Grid.Row="3"
-                Text="{u:I18n DeleteAccount}"
-                StyleClass="btn-danger"
-                HorizontalOptions="Start"
-                VerticalOptions="Start"
-                Margin="0,20,0,0"
-                Padding="16,0"
-                CornerRadius="2"
-                TextTransform="Uppercase"
-                Clicked="DeleteAccount_Clicked"/>
-            <Button
-                Grid.Row="3"
-                Grid.Column="1"
-                Text="{u:I18n Cancel}"
-                StyleClass="btn-secondary"
-                HorizontalOptions="Start"
-                VerticalOptions="Start"
-                Margin="0,20,0,0"
-                Padding="16,0"
-                CornerRadius="2"
-                TextTransform="Uppercase"
-                Clicked="Close_Clicked" />
-        </Grid>
-    </ContentPage.Content>
-</pages:BaseContentPage>
--- a/src/App/Pages/Accounts/DeleteAccountPage.xaml.cs
+++ b/src/App/Pages/Accounts/DeleteAccountPage.xaml.cs
@@ -1,33 +0,0 @@
-using System;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages.Accounts
-{
-    public partial class DeleteAccountPage : BaseContentPage
-    {
-        DeleteAccountViewModel _vm;
-
-        public DeleteAccountPage()
-        {
-            InitializeComponent();
-            _vm = BindingContext as DeleteAccountViewModel;
-            _vm.Page = this;
-        }
-
-        private async void Close_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                await Navigation.PopModalAsync();
-            }
-        }
-
-        private async void DeleteAccount_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                await _vm.DeleteAccountAsync();
-            }
-        }
-    }
-}
--- a/src/App/Pages/Accounts/DeleteAccountViewModel.cs
+++ b/src/App/Pages/Accounts/DeleteAccountViewModel.cs
@@ -1,84 +0,0 @@
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Exceptions;
-using Bit.Core.Utilities;
-#if !FDROID
-using Microsoft.AppCenter.Crashes;
-#endif
-
-namespace Bit.App.Pages
-{
-    public class DeleteAccountViewModel : BaseViewModel
-    {
-        readonly IApiService _apiService;
-        readonly IPasswordRepromptService _passwordRepromptService;
-        readonly IMessagingService _messagingService;
-        readonly ICryptoService _cryptoService;
-        readonly IPlatformUtilsService _platformUtilsService;
-        readonly IDeviceActionService _deviceActionService;
-
-        public DeleteAccountViewModel()
-        {
-            _apiService = ServiceContainer.Resolve<IApiService>("apiService");
-            _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
-            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-
-            PageTitle = AppResources.DeleteAccount;
-        }
-
-        public async Task DeleteAccountAsync()
-        {
-            try
-            {
-                if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
-                {
-                    await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
-                        AppResources.InternetConnectionRequiredTitle, AppResources.Ok);
-                    return;
-                }
-
-                var (password, valid) = await _passwordRepromptService.ShowPasswordPromptAndGetItAsync();
-                if (!valid)
-                {
-                    return;
-                }
-
-                await _deviceActionService.ShowLoadingAsync(AppResources.DeletingYourAccount);
-
-                var masterPasswordHashKey = await _cryptoService.HashPasswordAsync(password, null);
-                await _apiService.DeleteAccountAsync(new Core.Models.Request.DeleteAccountRequest
-                {
-                    MasterPasswordHash = masterPasswordHashKey
-                });
-
-                await _deviceActionService.HideLoadingAsync();
-
-                _messagingService.Send("logout");
-
-                await _platformUtilsService.ShowDialogAsync(AppResources.YourAccountHasBeenPermanentlyDeleted);
-            }
-            catch (ApiException apiEx)
-            {
-                await _deviceActionService.HideLoadingAsync();
-
-                if (apiEx?.Error != null)
-                {
-                    await _platformUtilsService.ShowDialogAsync(apiEx.Error.GetSingleMessage(), AppResources.AnErrorHasOccurred);
-                }
-            }
-            catch (System.Exception ex)
-            {
-                await _deviceActionService.HideLoadingAsync();
-#if !FDROID
-                Crashes.TrackError(ex);
-#endif
-                await _platformUtilsService.ShowDialogAsync(AppResources.AnErrorHasOccurred);
-            }
-        }
-    }
-}
--- a/src/App/Pages/Accounts/EnvironmentPage.xaml.cs
+++ b/src/App/Pages/Accounts/EnvironmentPage.xaml.cs
@@ -10,11 +10,14 @@ namespace Bit.App.Pages
    public partial class EnvironmentPage : BaseContentPage
    {
        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IMessagingService _messagingService;
        private readonly EnvironmentPageViewModel _vm;

        public EnvironmentPage()
        {
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _messagingService.Send("showStatusBar", true);
            InitializeComponent();
            _vm = BindingContext as EnvironmentPageViewModel;
            _vm.Page = this;
@@ -32,6 +35,7 @@ namespace Bit.App.Pages
            _vm.SubmitSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await SubmitSuccessAsync());
            _vm.CloseAction = async () =>
            {
+                _messagingService.Send("showStatusBar", false);
                await Navigation.PopModalAsync();
            };
        }
--- a/src/App/Pages/Accounts/HomePage.xaml
+++ b/src/App/Pages/Accounts/HomePage.xaml
@@ -1,107 +1,53 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.HomePage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:view="clr-namespace:Bit.Core.Models.View;assembly=BitwardenCore"
    xmlns:u="clr-namespace:Bit.App.Utilities"
    x:DataType="pages:HomeViewModel"
    Title="{Binding PageTitle}">
    <ContentPage.BindingContext>
        <pages:HomeViewModel />
    </ContentPage.BindingContext>
-
+    
    <ContentPage.ToolbarItems>
-        <controls:ExtendedToolbarItem
-            x:Name="_accountAvatar"
-            x:Key="accountAvatar"
-            IconImageSource="{Binding AvatarImageSource}"
-            Clicked="AccountSwitch_Clicked"
-            Order="Primary"
-            Priority="-1"
-            UseOriginalImage="True"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}" />
-        <ToolbarItem x:Name="_closeItem" x:Key="closeItem" Text="{u:I18n Close}"
-                     Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-        <ToolbarItem
-            Icon="cog_environment.png" Clicked="Environment_Clicked" Order="Primary"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Options}" />
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
    </ContentPage.ToolbarItems>

-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <StackLayout x:Name="_mainLayout" x:Key="mainLayout" Spacing="0" Padding="10, 5">
-                <StackLayout VerticalOptions="CenterAndExpand" Spacing="20">
-                    <Image
-                        x:Name="_logo"
-                        Source="logo.png"
-                        VerticalOptions="Center" />
-                    <Label Text="{u:I18n LoginOrCreateNewAccount}"
-                           StyleClass="text-lg"
-                           HorizontalTextAlignment="Center">
-                    </Label>
-                    <StackLayout Spacing="5">
-                        <Button Text="{u:I18n LogIn}"
-                                StyleClass="btn-primary"
-                                Clicked="LogIn_Clicked" />
-                        <Button Text="{u:I18n CreateAccount}"
-                                Clicked="Register_Clicked" />
-                        <Button Text="{u:I18n LogInSso}"
-                                Clicked="LogInSso_Clicked" />
-                    </StackLayout>
-                </StackLayout>
+    <StackLayout Spacing="0" Padding="10, 5">
+        <controls:FaButton Text="&#xf013;"
+                           StyleClass="btn-muted, btn-icon, btn-icon-platform"
+                           HorizontalOptions="Start"
+                           Clicked="Environment_Clicked"
+                           AutomationProperties.IsInAccessibleTree="True"
+                           AutomationProperties.Name="{u:I18n Options}">
+            <controls:FaButton.Margin>
+                <OnPlatform x:TypeArguments="Thickness">
+                    <On Platform="iOS" Value="0, 10, 0, 0" />
+                    <On Platform="Android" Value="0" />
+                </OnPlatform>
+            </controls:FaButton.Margin>
+        </controls:FaButton>
+        <StackLayout VerticalOptions="CenterAndExpand" Spacing="20">
+            <Image
+                x:Name="_logo"
+                Source="logo.png"
+                VerticalOptions="Center" />
+            <Label Text="{u:I18n LoginOrCreateNewAccount}"
+                   StyleClass="text-lg"
+                   HorizontalTextAlignment="Center"></Label>
+            <StackLayout Spacing="5">
+                <Button Text="{u:I18n LogIn}" 
+                        StyleClass="btn-primary"
+                        Clicked="LogIn_Clicked" />
+                <Button Text="{u:I18n CreateAccount}"
+                        Clicked="Register_Clicked" />
+                <Button Text="{u:I18n LogInSso}"
+                        Clicked="LogInSso_Clicked" />
            </StackLayout>
-        </ResourceDictionary>
-    </ContentPage.Resources>
-
-    <AbsoluteLayout
-        x:Name="_absLayout"
-        VerticalOptions="FillAndExpand"
-        HorizontalOptions="FillAndExpand">
-        <ContentView
-            x:Name="_mainContent"
-            AbsoluteLayout.LayoutFlags="All"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1">
-        </ContentView>
-
-        <!-- Account Switching Overlay -->
-        <ContentView
-            x:Name="_accountListOverlay"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
-            AbsoluteLayout.LayoutFlags="All"
-            IsVisible="False"
-            BackgroundColor="#22000000"
-            Padding="0">
-
-            <StackLayout
-                x:Name="_accountListContainer"
-                VerticalOptions="StartAndExpand"
-                HorizontalOptions="FillAndExpand"
-                BackgroundColor="{DynamicResource BackgroundColor}"
-                xct:ShadowEffect.Color="Black"
-                xct:ShadowEffect.Radius="10"
-                xct:ShadowEffect.OffsetY="3">
-                <ListView
-                    x:Name="_accountListView"
-                    ItemsSource="{Binding AccountViews}"
-                    ItemSelected="AccountRow_Selected"
-                    BackgroundColor="Transparent"
-                    VerticalOptions="FillAndExpand"
-                    RowHeight="60">
-                    <ListView.ItemTemplate>
-                        <DataTemplate x:DataType="view:AccountView">
-                            <controls:AccountViewCell
-                                Account="{Binding .}" />
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
-            </StackLayout>
-        </ContentView>
-    </AbsoluteLayout>
+        </StackLayout>
+    </StackLayout>

 </pages:BaseContentPage>
--- a/src/App/Pages/Accounts/HomePage.xaml.cs
+++ b/src/App/Pages/Accounts/HomePage.xaml.cs
@@ -12,10 +12,13 @@ namespace Bit.App.Pages
    {
        private readonly HomeViewModel _vm;
        private readonly AppOptions _appOptions;
+        private IMessagingService _messagingService;
        private IBroadcasterService _broadcasterService;

        public HomePage(AppOptions appOptions = null)
        {
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _messagingService.Send("showStatusBar", false);
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
            _appOptions = appOptions;
            InitializeComponent();
@@ -26,11 +29,6 @@ namespace Bit.App.Pages
            _vm.StartSsoLoginAction = () => Device.BeginInvokeOnMainThread(async () => await StartSsoLoginAsync());
            _vm.StartEnvironmentAction = () => Device.BeginInvokeOnMainThread(async () => await StartEnvironmentAsync());
            UpdateLogo();
-
-            if (!_appOptions?.IosExtension ?? false)
-            {
-                ToolbarItems.Remove(_closeItem);
-            }
        }

        public async Task DismissRegisterPageAndLogInAsync(string email)
@@ -39,18 +37,10 @@ namespace Bit.App.Pages
            await Navigation.PushModalAsync(new NavigationPage(new LoginPage(email, _appOptions)));
        }

-        protected override async void OnAppearing()
+        protected override void OnAppearing()
        {
            base.OnAppearing();
-            _mainContent.Content = _mainLayout;
-            if (await ShowAccountSwitcherAsync())
-            {
-                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-            }
-            else
-            {
-                ToolbarItems.Remove(_accountAvatar);
-            }
+            _messagingService.Send("showStatusBar", false);
            _broadcasterService.Subscribe(nameof(HomePage), async (message) =>
            {
                if (message.Command == "updatedTheme")
@@ -137,23 +127,5 @@ namespace Bit.App.Pages
            var page = new EnvironmentPage();
            await Navigation.PushModalAsync(new NavigationPage(page));
        }
-
-        private async void AccountSwitch_Clicked(object sender, EventArgs e)
-        {
-            if (_accountListOverlay.IsVisible)
-            {
-                await ShowAccountListAsync(false, _accountListContainer, _accountListOverlay);
-            }
-            else
-            {
-                await RefreshAccountViewsAsync(_accountListView, false);
-                await ShowAccountListAsync(true, _accountListContainer, _accountListOverlay);
-            }
-        }
-
-        private async void AccountRow_Selected(object sender, SelectedItemChangedEventArgs e)
-        {
-            await AccountRowSelectedAsync(sender, e, _accountListContainer, _accountListOverlay, null, true);
-        }
    }
 }
--- a/src/App/Pages/Accounts/HomePageViewModel.cs
+++ b/src/App/Pages/Accounts/HomePageViewModel.cs
@@ -1,27 +1,15 @@
 using System;
 using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;

 namespace Bit.App.Pages
 {
    public class HomeViewModel : BaseViewModel
    {
-        private readonly IStateService _stateService;
-
        public HomeViewModel()
        {
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-
            PageTitle = AppResources.Bitwarden;
        }
-
-        public ExtendedObservableCollection<AccountView> AccountViews
-        {
-            get => _stateService.AccountViews;
-        }
-
+        
        public Action StartLoginAction { get; set; }
        public Action StartRegisterAction { get; set; }
        public Action StartSsoLoginAction { get; set; }
--- a/src/App/Pages/Accounts/LockPage.xaml
+++ b/src/App/Pages/Accounts/LockPage.xaml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.LockPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:view="clr-namespace:Bit.Core.Models.View;assembly=BitwardenCore"
    xmlns:u="clr-namespace:Bit.App.Utilities"
    x:DataType="pages:LockPageViewModel"
    Title="{Binding PageTitle}">
@@ -15,19 +13,6 @@
        <pages:LockPageViewModel />
    </ContentPage.BindingContext>

-    <ContentPage.ToolbarItems>
-        <controls:ExtendedToolbarItem
-                x:Name="_accountAvatar"
-                x:Key="accountAvatar"
-                IconImageSource="{Binding AvatarImageSource}"
-                Clicked="AccountSwitch_Clicked"
-                Order="Primary"
-                Priority="-1"
-                UseOriginalImage="True"
-                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Account}" />
-    </ContentPage.ToolbarItems>
-
    <ContentPage.Resources>
        <ResourceDictionary>
            <u:InverseBoolConverter x:Key="inverseBool" />
@@ -40,162 +25,106 @@
                x:Name="_logOut"
                Clicked="LogOut_Clicked"
                Order="Secondary"/>
-
-            <ScrollView x:Name="_mainLayout" x:Key="mainLayout">
-                <StackLayout Spacing="20">
-                    <StackLayout StyleClass="box">
-                        <Grid
-                            StyleClass="box-row"
-                            IsVisible="{Binding PinLock}"
-                            Padding="0, 10, 0, 0">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Label
-                                Text="{u:I18n PIN}"
-                                StyleClass="box-label"
-                                Grid.Row="0"
-                                Grid.Column="0" />
-                            <controls:MonoEntry
-                                x:Name="_pin"
-                                Text="{Binding Pin}"
-                                StyleClass="box-value"
-                                Keyboard="Numeric"
-                                IsSpellCheckEnabled="False"
-                                IsTextPredictionEnabled="False"
-                                IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}" />
-                            <controls:FaButton
-                                StyleClass="box-row-button, box-row-button-platform"
-                                Text="{Binding ShowPasswordIcon}"
-                                Command="{Binding TogglePasswordCommand}"
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Grid.RowSpan="2"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                        </Grid>
-                        <Grid
-                            x:Name="_passwordGrid"
-                            StyleClass="box-row"
-                            IsVisible="{Binding PinLock, Converter={StaticResource inverseBool}}"
-                            Padding="0, 10, 0, 0">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Label
-                                Text="{u:I18n MasterPassword}"
-                                StyleClass="box-label"
-                                Grid.Row="0"
-                                Grid.Column="0" />
-                            <controls:MonoEntry
-                                x:Name="_masterPassword"
-                                Text="{Binding MasterPassword}"
-                                StyleClass="box-value"
-                                IsSpellCheckEnabled="False"
-                                IsTextPredictionEnabled="False"
-                                IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}" />
-                            <controls:FaButton
-                                StyleClass="box-row-button, box-row-button-platform"
-                                Text="{Binding ShowPasswordIcon}"
-                                Command="{Binding TogglePasswordCommand}"
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Grid.RowSpan="2"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                        </Grid>
-                        <StackLayout
-                            StyleClass="box-row"
-                            Padding="0, 10, 0, 0">
-                            <Label
-                                Text="{Binding LockedVerifyText}"
-                                StyleClass="box-footer-label" />
-                            <Label
-                                Text="{Binding LoggedInAsText}"
-                                StyleClass="box-footer-label"
-                                Margin="0, 10, 0, 0" />
-                        </StackLayout>
-                    </StackLayout>
-                    <StackLayout Padding="10, 0">
-                        <Label
-                            Text="{u:I18n BiometricInvalidated}"
-                            StyleClass="box-footer-label,text-danger,text-bold"
-                            IsVisible="{Binding BiometricIntegrityValid, Converter={StaticResource inverseBool}}" />
-                        <Button Text="{Binding BiometricButtonText}" Clicked="Biometric_Clicked"
-                                IsVisible="{Binding BiometricButtonVisible}">
-                        </Button>
-                        <Button
-                            x:Name="_unlockButton"
-                            Text="{u:I18n Unlock}"
-                            StyleClass="btn-primary"
-                            Clicked="Unlock_Clicked" />
-                    </StackLayout>
-                </StackLayout>
-            </ScrollView>
        </ResourceDictionary>
    </ContentPage.Resources>

-    <AbsoluteLayout
-        x:Name="_absLayout"
-        VerticalOptions="FillAndExpand"
-        HorizontalOptions="FillAndExpand">
-        <ContentView
-            x:Name="_mainContent"
-            AbsoluteLayout.LayoutFlags="All"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1">
-        </ContentView>
+    <ContentPage.ToolbarItems>
+    </ContentPage.ToolbarItems>

-        <!-- Account Switching Overlay -->
-        <ContentView
-            x:Name="_accountListOverlay"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
-            AbsoluteLayout.LayoutFlags="All"
-            IsVisible="False"
-            BackgroundColor="#22000000"
-            Padding="0">
-
-            <StackLayout
-                x:Name="_accountListContainer"
-                VerticalOptions="StartAndExpand"
-                HorizontalOptions="FillAndExpand"
-                BackgroundColor="{DynamicResource BackgroundColor}"
-                xct:ShadowEffect.Color="Black"
-                xct:ShadowEffect.Radius="10"
-                xct:ShadowEffect.OffsetY="3">
-                <ListView
-                    x:Name="_accountListView"
-                    ItemsSource="{Binding AccountViews}"
-                    ItemSelected="AccountRow_Selected"
-                    BackgroundColor="Transparent"
-                    VerticalOptions="FillAndExpand"
-                    RowHeight="60">
-                    <ListView.ItemTemplate>
-                        <DataTemplate x:DataType="view:AccountView">
-                            <controls:AccountViewCell
-                                Account="{Binding .}" />
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
+    <ScrollView>
+        <StackLayout Spacing="20">
+            <StackLayout StyleClass="box">
+                <Grid StyleClass="box-row" IsVisible="{Binding PinLock}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Label
+                        Text="{u:I18n PIN}"
+                        StyleClass="box-label"
+                        Grid.Row="0"
+                        Grid.Column="0" />
+                    <controls:MonoEntry
+                        x:Name="_pin"
+                        Text="{Binding Pin}"
+                        StyleClass="box-value"
+                        Keyboard="Numeric"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding SubmitCommand}" />
+                    <controls:FaButton
+                        StyleClass="box-row-button, box-row-button-platform"
+                        Text="{Binding ShowPasswordIcon}"
+                        Command="{Binding TogglePasswordCommand}"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
+                </Grid>
+                <Grid StyleClass="box-row" IsVisible="{Binding PinLock, Converter={StaticResource inverseBool}}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Label
+                        Text="{u:I18n MasterPassword}"
+                        StyleClass="box-label"
+                        Grid.Row="0"
+                        Grid.Column="0" />
+                    <controls:MonoEntry
+                        x:Name="_masterPassword"
+                        Text="{Binding MasterPassword}"
+                        StyleClass="box-value"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding SubmitCommand}" />
+                    <controls:FaButton
+                        StyleClass="box-row-button, box-row-button-platform"
+                        Text="{Binding ShowPasswordIcon}"
+                        Command="{Binding TogglePasswordCommand}"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
+                </Grid>
+                <Label
+                    Text="{Binding LockedVerifyText}"
+                    StyleClass="box-footer-label" />
+                <Label
+                    Text="{Binding LoggedInAsText}"
+                    StyleClass="box-footer-label"
+                    Margin="0, 10, 0, 0" />
            </StackLayout>
-        </ContentView>
-    </AbsoluteLayout>
+            <StackLayout Padding="10, 0">
+                <Label
+                    Text="{u:I18n BiometricInvalidated}"
+                    StyleClass="box-footer-label,text-danger,text-bold"
+                    IsVisible="{Binding BiometricIntegrityValid, Converter={StaticResource inverseBool}}" />
+                <Button Text="{Binding BiometricButtonText}" Clicked="Biometric_Clicked"
+                        IsVisible="{Binding BiometricButtonVisible}"></Button>
+                <Button Text="{u:I18n Unlock}"
+                        StyleClass="btn-primary"
+                        Clicked="Unlock_Clicked" />
+            </StackLayout>
+        </StackLayout>
+    </ScrollView>

 </pages:BaseContentPage>
--- a/src/App/Pages/Accounts/LockPage.xaml.cs
+++ b/src/App/Pages/Accounts/LockPage.xaml.cs
@@ -1,5 +1,7 @@
 using Bit.App.Models;
 using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
 using System;
 using System.Threading.Tasks;
 using Bit.App.Utilities;
@@ -9,6 +11,7 @@ namespace Bit.App.Pages
 {
    public partial class LockPage : BaseContentPage
    {
+        private readonly IStorageService _storageService;
        private readonly AppOptions _appOptions;
        private readonly bool _autoPromptBiometric;
        private readonly LockPageViewModel _vm;
@@ -18,6 +21,7 @@ namespace Bit.App.Pages

        public LockPage(AppOptions appOptions = null, bool autoPromptBiometric = true)
        {
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _appOptions = appOptions;
            _autoPromptBiometric = autoPromptBiometric;
            InitializeComponent();
@@ -61,16 +65,7 @@ namespace Bit.App.Pages
                return;
            }
            _appeared = true;
-            _mainContent.Content = _mainLayout;
-            if (await ShowAccountSwitcherAsync())
-            {
-                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-            }
-            else
-            {
-                ToolbarItems.Remove(_accountAvatar);
-            }
-            await _vm.InitAsync();
+            await _vm.InitAsync(_autoPromptBiometric);
            if (!_vm.BiometricLock)
            {
                if (_vm.PinLock)
@@ -82,22 +77,6 @@ namespace Bit.App.Pages
                    RequestFocus(MasterPasswordEntry);
                }
            }
-            else
-            {
-                if (_vm.UsingKeyConnector && !_vm.PinLock)
-                {
-                    _passwordGrid.IsVisible = false;
-                    _unlockButton.IsVisible = false;
-                }
-                if (_autoPromptBiometric)
-                {
-                    var tasks = Task.Run(async () =>
-                    {
-                        await Task.Delay(500);
-                        Device.BeginInvokeOnMainThread(async () => await _vm.PromptBiometricAsync());
-                    });
-                }
-            }
        }

        private void Unlock_Clicked(object sender, EventArgs e)
@@ -151,26 +130,7 @@ namespace Bit.App.Pages
                return;
            }
            var previousPage = await AppHelpers.ClearPreviousPage();
-
            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
        }
-
-        private async void AccountSwitch_Clicked(object sender, EventArgs e)
-        {
-            if (_accountListOverlay.IsVisible)
-            {
-                await ShowAccountListAsync(false, _accountListContainer, _accountListOverlay);
-            }
-            else
-            {
-                await RefreshAccountViewsAsync(_accountListView, false);
-                await ShowAccountListAsync(true, _accountListContainer, _accountListOverlay);
-            }
-        }
-
-        private async void AccountRow_Selected(object sender, SelectedItemChangedEventArgs e)
-        {
-            await AccountRowSelectedAsync(sender, e, _accountListContainer, _accountListOverlay, null, true);
-        }
    }
 }
--- a/src/App/Pages/Accounts/LockPageViewModel.cs
+++ b/src/App/Pages/Accounts/LockPageViewModel.cs
@@ -1,5 +1,7 @@
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
+using Bit.App.Models;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
@@ -8,7 +10,6 @@ using System;
 using System.Threading.Tasks;
 using Bit.App.Utilities;
 using Bit.Core.Models.Request;
-using Bit.Core.Models.View;
 using Xamarin.Forms;

 namespace Bit.App.Pages
@@ -20,11 +21,13 @@ namespace Bit.App.Pages
        private readonly IDeviceActionService _deviceActionService;
        private readonly IVaultTimeoutService _vaultTimeoutService;
        private readonly ICryptoService _cryptoService;
+        private readonly IStorageService _storageService;
+        private readonly IUserService _userService;
        private readonly IMessagingService _messagingService;
+        private readonly IStorageService _secureStorageService;
        private readonly IEnvironmentService _environmentService;
        private readonly IStateService _stateService;
        private readonly IBiometricService _biometricService;
-        private readonly IKeyConnectorService _keyConnectorService;

        private string _email;
        private bool _showPassword;
@@ -32,7 +35,6 @@ namespace Bit.App.Pages
        private bool _biometricLock;
        private bool _biometricIntegrityValid = true;
        private bool _biometricButtonVisible;
-        private bool _usingKeyConnector;
        private string _biometricButtonText;
        private string _loggedInAsText;
        private string _lockedVerifyText;
@@ -45,11 +47,13 @@ namespace Bit.App.Pages
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _secureStorageService = ServiceContainer.Resolve<IStorageService>("secureStorageService");
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
-            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");

            PageTitle = AppResources.VerifyMasterPassword;
            TogglePasswordCommand = new Command(TogglePassword);
@@ -72,11 +76,6 @@ namespace Bit.App.Pages
            set => SetProperty(ref _pinLock, value);
        }

-        public bool UsingKeyConnector
-        {
-            get => _usingKeyConnector;
-        }
-
        public bool BiometricLock
        {
            get => _biometricLock;
@@ -113,11 +112,6 @@ namespace Bit.App.Pages
            set => SetProperty(ref _lockedVerifyText, value);
        }

-        public ExtendedObservableCollection<AccountView> AccountViews
-        {
-            get => _stateService.AccountViews;
-        }
-
        public Command SubmitCommand { get; }
        public Command TogglePasswordCommand { get; }
        public string ShowPasswordIcon => ShowPassword ? "" : "";
@@ -125,19 +119,12 @@ namespace Bit.App.Pages
        public string Pin { get; set; }
        public Action UnlockedAction { get; set; }

-        public async Task InitAsync()
+        public async Task InitAsync(bool autoPromptBiometric)
        {
            _pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
-            PinLock = (_pinSet.Item1 && _stateService.GetPinProtectedAsync() != null) || _pinSet.Item2;
+            PinLock = (_pinSet.Item1 && _vaultTimeoutService.PinProtectedKey != null) || _pinSet.Item2;
            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();
-            }
-            _email = await _stateService.GetEmailAsync();
+            _email = await _userService.GetEmailAsync();
            var webVault = _environmentService.GetWebVaultUrl();
            if (string.IsNullOrWhiteSpace(webVault))
            {
@@ -152,16 +139,8 @@ namespace Bit.App.Pages
            }
            else
            {
-                if (_usingKeyConnector)
-                {
-                    PageTitle = AppResources.UnlockVault;
-                    LockedVerifyText = AppResources.VaultLockedIdentity;
-                }
-                else
-                {
-                    PageTitle = AppResources.VerifyMasterPassword;
-                    LockedVerifyText = AppResources.VaultLockedMasterPassword;
-                }
+                PageTitle = AppResources.VerifyMasterPassword;
+                LockedVerifyText = AppResources.VaultLockedMasterPassword;
            }

            if (BiometricLock)
@@ -180,7 +159,14 @@ namespace Bit.App.Pages
                    BiometricButtonText = supportsFace ? AppResources.UseFaceIDToUnlock :
                        AppResources.UseFingerprintToUnlock;
                }
-
+                if (autoPromptBiometric)
+                {
+                    var tasks = Task.Run(async () =>
+                    {
+                        await Task.Delay(500);
+                        Device.BeginInvokeOnMainThread(async () => await PromptBiometricAsync());
+                    });
+                }
            }
        }

@@ -202,8 +188,8 @@ namespace Bit.App.Pages
            }

            ShowPassword = false;
-            var kdf = await _stateService.GetKdfTypeAsync();
-            var kdfIterations = await _stateService.GetKdfIterationsAsync();
+            var kdf = await _userService.GetKdfAsync();
+            var kdfIterations = await _userService.GetKdfIterationsAsync();

            if (PinLock)
            {
@@ -214,9 +200,9 @@ namespace Bit.App.Pages
                    {
                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email,
                            kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), kdfIterations.GetValueOrDefault(5000),
-                            await _stateService.GetPinProtectedCachedAsync());
+                            _vaultTimeoutService.PinProtectedKey);
                        var encKey = await _cryptoService.GetEncKeyAsync(key);
-                        var protectedPin = await _stateService.GetProtectedPinAsync();
+                        var protectedPin = await _storageService.GetAsync<string>(Constants.ProtectedPin);
                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
                        failed = decPin != Pin;
                        if (!failed)
@@ -285,12 +271,12 @@ namespace Bit.App.Pages
                {
                    if (_pinSet.Item1)
                    {
-                        var protectedPin = await _stateService.GetProtectedPinAsync();
+                        var protectedPin = await _storageService.GetAsync<string>(Constants.ProtectedPin);
                        var encKey = await _cryptoService.GetEncKeyAsync(key);
                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
                        var pinKey = await _cryptoService.MakePinKeyAysnc(decPin, _email,
                            kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), kdfIterations.GetValueOrDefault(5000));
-                        await _stateService.SetPinProtectedCachedAsync(await _cryptoService.EncryptAsync(key.Key, pinKey));
+                        _vaultTimeoutService.PinProtectedKey = await _cryptoService.EncryptAsync(key.Key, pinKey);
                    }
                    MasterPassword = string.Empty;
                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
@@ -356,7 +342,7 @@ namespace Bit.App.Pages
                    page.MasterPasswordEntry.Focus();
                }
            });
-            _stateService.BiometricLocked = !success;
+            _vaultTimeoutService.BiometricLocked = !success;
            if (success)
            {
                await DoContinueAsync();
@@ -375,7 +361,9 @@ namespace Bit.App.Pages

        private async Task DoContinueAsync()
        {
-            _stateService.BiometricLocked = false;
+            _vaultTimeoutService.BiometricLocked = false;
+            var disableFavicon = await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey);
+            await _stateService.SaveAsync(Constants.DisableFaviconKey, disableFavicon.GetValueOrDefault());
            _messagingService.Send("unlocked");
            UnlockedAction?.Invoke();
        }
--- a/src/App/Pages/Accounts/LoginPage.xaml
+++ b/src/App/Pages/Accounts/LoginPage.xaml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.LoginPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:view="clr-namespace:Bit.Core.Models.View;assembly=BitwardenCore"
    xmlns:u="clr-namespace:Bit.App.Utilities"
    x:DataType="pages:LoginPageViewModel"
    Title="{Binding PageTitle}">
@@ -15,21 +13,6 @@
        <pages:LoginPageViewModel />
    </ContentPage.BindingContext>

-    <ContentPage.ToolbarItems>
-        <controls:ExtendedToolbarItem
-                x:Name="_accountAvatar"
-                x:Key="accountAvatar"
-                IconImageSource="{Binding AvatarImageSource}"
-                Clicked="AccountSwitch_Clicked"
-                Order="Primary"
-                Priority="-1"
-                UseOriginalImage="True"
-                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Account}" />
-        <ToolbarItem x:Name="_closeItem" x:Key="closeItem" Text="{u:I18n Close}"
-                     Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-    </ContentPage.ToolbarItems>
-
    <ContentPage.Resources>
        <ResourceDictionary>
            <u:InverseBoolConverter x:Key="inverseBool" />
@@ -42,109 +25,68 @@
                x:Name="_getPasswordHint"
                Clicked="Hint_Clicked" 
                Order="Secondary"/>
-
-            <ScrollView x:Name="_mainLayout" x:Key="mainLayout">
-                <StackLayout Spacing="20">
-                    <StackLayout StyleClass="box">
-                        <StackLayout StyleClass="box-row">
-                            <Label
-                                Text="{u:I18n EmailAddress}"
-                                StyleClass="box-label" />
-                            <Entry
-                                x:Name="_email"
-                                Text="{Binding Email}"
-                                Keyboard="Email"
-                                StyleClass="box-value" />
-                        </StackLayout>
-                        <Grid StyleClass="box-row">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Label
-                                Text="{u:I18n MasterPassword}"
-                                StyleClass="box-label"
-                                Grid.Row="0"
-                                Grid.Column="0" />
-                            <controls:MonoEntry
-                                x:Name="_masterPassword"
-                                Text="{Binding MasterPassword}"
-                                StyleClass="box-value"
-                                IsSpellCheckEnabled="False"
-                                IsTextPredictionEnabled="False"
-                                IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                ReturnType="Go"
-                                ReturnCommand="{Binding LogInCommand}" />
-                            <controls:FaButton
-                                StyleClass="box-row-button, box-row-button-platform"
-                                Text="{Binding ShowPasswordIcon}"
-                                Command="{Binding TogglePasswordCommand}"
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Grid.RowSpan="2"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                        </Grid>
-                    </StackLayout>
-                    <StackLayout Padding="10, 0">
-                        <Button Text="{u:I18n LogIn}" 
-                                StyleClass="btn-primary"
-                                Clicked="LogIn_Clicked" />
-                    </StackLayout>
-                </StackLayout>
-            </ScrollView>
        </ResourceDictionary>
    </ContentPage.Resources>
-    
-    <AbsoluteLayout
-        x:Name="_absLayout"
-        VerticalOptions="FillAndExpand"
-        HorizontalOptions="FillAndExpand">
-        <ContentView
-            x:Name="_mainContent"
-            AbsoluteLayout.LayoutFlags="All"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1">
-        </ContentView>

-        <!-- Account Switching Overlay -->
-        <ContentView
-            x:Name="_accountListOverlay"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
-            AbsoluteLayout.LayoutFlags="All"
-            IsVisible="False"
-            BackgroundColor="#22000000"
-            Padding="0">
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+    </ContentPage.ToolbarItems>

-            <StackLayout
-                x:Name="_accountListContainer"
-                VerticalOptions="StartAndExpand"
-                HorizontalOptions="FillAndExpand"
-                BackgroundColor="{DynamicResource BackgroundColor}"
-                xct:ShadowEffect.Color="Black"
-                xct:ShadowEffect.Radius="10"
-                xct:ShadowEffect.OffsetY="3">
-                <ListView
-                    x:Name="_accountListView"
-                    ItemsSource="{Binding AccountViews}"
-                    ItemSelected="AccountRow_Selected"
-                    BackgroundColor="Transparent"
-                    VerticalOptions="FillAndExpand"
-                    RowHeight="60">
-                    <ListView.ItemTemplate>
-                        <DataTemplate x:DataType="view:AccountView">
-                            <controls:AccountViewCell
-                                Account="{Binding .}" />
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
+    <ScrollView>
+        <StackLayout Spacing="20">
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row">
+                    <Label
+                        Text="{u:I18n EmailAddress}"
+                        StyleClass="box-label" />
+                    <Entry
+                        x:Name="_email"
+                        Text="{Binding Email}"
+                        Keyboard="Email"
+                        StyleClass="box-value" />
+                </StackLayout>
+                <Grid StyleClass="box-row">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Label
+                        Text="{u:I18n MasterPassword}"
+                        StyleClass="box-label"
+                        Grid.Row="0"
+                        Grid.Column="0" />
+                    <controls:MonoEntry
+                        x:Name="_masterPassword"
+                        Text="{Binding MasterPassword}"
+                        StyleClass="box-value"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding LogInCommand}" />
+                    <controls:FaButton
+                        StyleClass="box-row-button, box-row-button-platform"
+                        Text="{Binding ShowPasswordIcon}"
+                        Command="{Binding TogglePasswordCommand}"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
+                </Grid>
            </StackLayout>
-        </ContentView>
-    </AbsoluteLayout>
+            <StackLayout Padding="10, 0">
+                <Button Text="{u:I18n LogIn}" 
+                        StyleClass="btn-primary"
+                        Clicked="LogIn_Clicked" />
+            </StackLayout>
+        </StackLayout>
+    </ScrollView>

 </pages:BaseContentPage>
--- a/src/App/Pages/Accounts/LoginPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginPage.xaml.cs
@@ -1,5 +1,7 @@
 using Bit.App.Models;
 using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
 using System;
 using System.Threading.Tasks;
 using Bit.App.Utilities;
@@ -9,6 +11,8 @@ namespace Bit.App.Pages
 {
    public partial class LoginPage : BaseContentPage
    {
+        private readonly IMessagingService _messagingService;
+        private readonly IStorageService _storageService;
        private readonly LoginPageViewModel _vm;
        private readonly AppOptions _appOptions;

@@ -16,6 +20,9 @@ namespace Bit.App.Pages

        public LoginPage(string email = null, AppOptions appOptions = null)
        {
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _messagingService.Send("showStatusBar", true);
            _appOptions = appOptions;
            InitializeComponent();
            _vm = BindingContext as LoginPageViewModel;
@@ -26,6 +33,7 @@ namespace Bit.App.Pages
                () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
            _vm.CloseAction = async () =>
            {
+                _messagingService.Send("showStatusBar", false);
                await Navigation.PopModalAsync();
            };
            _vm.Email = email;
@@ -46,11 +54,6 @@ namespace Bit.App.Pages
            {
                ToolbarItems.Add(_getPasswordHint);
            }
-
-            if (!_appOptions?.IosExtension ?? false)
-            {
-                ToolbarItems.Remove(_closeItem);
-            }
        }

        public Entry MasterPasswordEntry { get; set; }
@@ -58,15 +61,6 @@ namespace Bit.App.Pages
        protected override async void OnAppearing()
        {
            base.OnAppearing();
-            _mainContent.Content = _mainLayout;
-            if (await ShowAccountSwitcherAsync())
-            {
-                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-            }
-            else
-            {
-                ToolbarItems.Remove(_accountAvatar);
-            }
            await _vm.InitAsync();
            if (!_inputFocused)
            {
@@ -136,23 +130,5 @@ namespace Bit.App.Pages
            var page = new UpdateTempPasswordPage();
            await Navigation.PushModalAsync(new NavigationPage(page));
        }
-
-        private async void AccountSwitch_Clicked(object sender, EventArgs e)
-        {
-            if (_accountListOverlay.IsVisible)
-            {
-                await ShowAccountListAsync(false, _accountListContainer, _accountListOverlay);
-            }
-            else
-            {
-                await RefreshAccountViewsAsync(_accountListView, false);
-                await ShowAccountListAsync(true, _accountListContainer, _accountListOverlay);
-            }
-        }
-
-        private async void AccountRow_Selected(object sender, SelectedItemChangedEventArgs e)
-        {
-            await AccountRowSelectedAsync(sender, e, _accountListContainer, _accountListOverlay, null, true);
-        }
    }
 }
--- a/src/App/Pages/Accounts/LoginPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPageViewModel.cs
@@ -1,21 +1,25 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
 using System;
 using System.Threading.Tasks;
 using Bit.App.Utilities;
-using Bit.Core.Models.View;
 using Xamarin.Forms;

 namespace Bit.App.Pages
 {
    public class LoginPageViewModel : CaptchaProtectedViewModel
    {
+        private const string Keys_RememberedEmail = "rememberedEmail";
+        private const string Keys_RememberEmail = "rememberEmail";
+
        private readonly IDeviceActionService _deviceActionService;
        private readonly IAuthService _authService;
        private readonly ISyncService _syncService;
+        private readonly IStorageService _storageService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly IStateService _stateService;
        private readonly IEnvironmentService _environmentService;
@@ -30,6 +34,7 @@ namespace Bit.App.Pages
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _authService = ServiceContainer.Resolve<IAuthService>("authService");
            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
@@ -62,11 +67,6 @@ namespace Bit.App.Pages
            set => SetProperty(ref _masterPassword, value);
        }

-        public ExtendedObservableCollection<AccountView> AccountViews
-        {
-            get => _stateService.AccountViews;
-        }
-
        public Command LogInCommand { get; }
        public Command TogglePasswordCommand { get; }
        public string ShowPasswordIcon => ShowPassword ? "" : "";
@@ -85,9 +85,9 @@ namespace Bit.App.Pages
        {
            if (string.IsNullOrWhiteSpace(Email))
            {
-                Email = await _stateService.GetRememberedEmailAsync();
+                Email = await _storageService.GetAsync<string>(Keys_RememberedEmail);
            }
-            var rememberEmail = await _stateService.GetRememberEmailAsync();
+            var rememberEmail = await _storageService.GetAsync<bool?>(Keys_RememberEmail);
            RememberEmail = rememberEmail.GetValueOrDefault(true);
        }

@@ -131,11 +131,11 @@ namespace Bit.App.Pages
                var response = await _authService.LogInAsync(Email, MasterPassword, _captchaToken);
                if (RememberEmail)
                {
-                    await _stateService.SetRememberedEmailAsync(Email);
+                    await _storageService.SaveAsync(Keys_RememberedEmail, Email);
                }
                else
                {
-                    await _stateService.SetRememberedEmailAsync(null);
+                    await _storageService.RemoveAsync(Keys_RememberedEmail);
                }
                await AppHelpers.ResetInvalidUnlockAttemptsAsync();

@@ -163,6 +163,8 @@ namespace Bit.App.Pages
                }
                else
                {
+                    var disableFavicon = await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey);
+                    await _stateService.SaveAsync(Constants.DisableFaviconKey, disableFavicon.GetValueOrDefault());
                    var task = Task.Run(async () => await _syncService.FullSyncAsync(true));
                    LogInSuccessAction?.Invoke();
                }
--- a/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
@@ -10,6 +10,8 @@ namespace Bit.App.Pages
 {
    public partial class LoginSsoPage : BaseContentPage
    {
+        private readonly IStorageService _storageService;
+        private readonly IMessagingService _messagingService;
        private readonly IVaultTimeoutService _vaultTimeoutService;
        private readonly LoginSsoPageViewModel _vm;
        private readonly AppOptions _appOptions;
@@ -18,7 +20,10 @@ namespace Bit.App.Pages

        public LoginSsoPage(AppOptions appOptions = null)
        {
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _messagingService.Send("showStatusBar", true);
            _appOptions = appOptions;
            InitializeComponent();
            _vm = BindingContext as LoginSsoPageViewModel;
@@ -31,6 +36,7 @@ namespace Bit.App.Pages
                () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
            _vm.CloseAction = async () =>
            {
+                _messagingService.Send("showStatusBar", false);
                await Navigation.PopModalAsync();
            };
            if (Device.RuntimePlatform == Device.Android)
@@ -110,14 +116,7 @@ namespace Bit.App.Pages
        {
            RestoreAppOptionsFromCopy();
            await AppHelpers.ClearPreviousPage();
-            if (await _vaultTimeoutService.IsLockedAsync())
-            {
-                Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
-            }
-            else
-            {
-                Application.Current.MainPage = new TabsPage(_appOptions, null);
-            }
+            Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
        }
    }
 }
--- a/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using System;
@@ -15,12 +16,16 @@ namespace Bit.App.Pages
 {
    public class LoginSsoPageViewModel : BaseViewModel
    {
+        private const string Keys_RememberedOrgIdentifier = "rememberedOrgIdentifier";
+        private const string Keys_RememberOrgIdentifier = "rememberOrgIdentifier";
+
        private readonly IDeviceActionService _deviceActionService;
        private readonly IAuthService _authService;
        private readonly ISyncService _syncService;
        private readonly IApiService _apiService;
        private readonly IPasswordGenerationService _passwordGenerationService;
        private readonly ICryptoFunctionService _cryptoFunctionService;
+        private readonly IStorageService _storageService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly IStateService _stateService;

@@ -35,6 +40,7 @@ namespace Bit.App.Pages
            _passwordGenerationService =
                ServiceContainer.Resolve<IPasswordGenerationService>("passwordGenerationService");
            _cryptoFunctionService = ServiceContainer.Resolve<ICryptoFunctionService>("cryptoFunctionService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");

@@ -60,9 +66,9 @@ namespace Bit.App.Pages
        {
            if (string.IsNullOrWhiteSpace(OrgIdentifier))
            {
-                OrgIdentifier = await _stateService.GetRememberedOrgIdentifierAsync();
+                OrgIdentifier = await _storageService.GetAsync<string>(Keys_RememberedOrgIdentifier);
            }
-            var rememberOrgIdentifier = await _stateService.GetRememberOrgIdentifierAsync();
+            var rememberOrgIdentifier = await _storageService.GetAsync<bool?>(Keys_RememberOrgIdentifier);
            RememberOrgIdentifier = rememberOrgIdentifier.GetValueOrDefault(true);
        }

@@ -133,7 +139,7 @@ namespace Bit.App.Pages
            var code = GetResultCode(authResult, state);
            if (!string.IsNullOrEmpty(code))
            {
-                await LogIn(code, codeVerifier, redirectUri, OrgIdentifier);
+                await LogIn(code, codeVerifier, redirectUri);
            }
            else
            {
@@ -158,19 +164,19 @@ namespace Bit.App.Pages
            return code;
        }

-        private async Task LogIn(string code, string codeVerifier, string redirectUri, string orgId)
+        private async Task LogIn(string code, string codeVerifier, string redirectUri)
        {
            try
            {
-                var response = await _authService.LogInSsoAsync(code, codeVerifier, redirectUri, orgId);
+                var response = await _authService.LogInSsoAsync(code, codeVerifier, redirectUri);
                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                if (RememberOrgIdentifier)
                {
-                    await _stateService.SetRememberedOrgIdentifierAsync(OrgIdentifier);
+                    await _storageService.SaveAsync(Keys_RememberedOrgIdentifier, OrgIdentifier);
                }
                else
                {
-                    await _stateService.SetRememberedOrgIdentifierAsync(null);
+                    await _storageService.RemoveAsync(Keys_RememberedOrgIdentifier);
                }
                await _deviceActionService.HideLoadingAsync();
                if (response.TwoFactor)
@@ -187,6 +193,8 @@ namespace Bit.App.Pages
                }
                else
                {
+                    var disableFavicon = await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey);
+                    await _stateService.SaveAsync(Constants.DisableFaviconKey, disableFavicon.GetValueOrDefault());
                    var task = Task.Run(async () => await _syncService.FullSyncAsync(true));
                    SsoAuthSuccessAction?.Invoke();
                }
--- a/src/App/Pages/Accounts/RegisterPage.xaml.cs
+++ b/src/App/Pages/Accounts/RegisterPage.xaml.cs
@@ -1,4 +1,6 @@
-using System;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System;
 using System.Threading.Tasks;
 using Xamarin.Forms;

@@ -6,18 +8,22 @@ namespace Bit.App.Pages
 {
    public partial class RegisterPage : BaseContentPage
    {
+        private readonly IMessagingService _messagingService;
        private readonly RegisterPageViewModel _vm;

        private bool _inputFocused;

        public RegisterPage(HomePage homePage)
        {
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _messagingService.Send("showStatusBar", true);
            InitializeComponent();
            _vm = BindingContext as RegisterPageViewModel;
            _vm.Page = this;
            _vm.RegistrationSuccess = () => Device.BeginInvokeOnMainThread(async () => await RegistrationSuccessAsync(homePage));
            _vm.CloseAction = async () =>
            {
+                _messagingService.Send("showStatusBar", false);
                await Navigation.PopModalAsync();
            };
            MasterPasswordEntry = _masterPassword;
--- a/src/App/Pages/Accounts/RemoveMasterPasswordPage.xaml
+++ b/src/App/Pages/Accounts/RemoveMasterPasswordPage.xaml
@@ -1,33 +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.RemoveMasterPasswordPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:DataType="pages:RemoveMasterPasswordPageViewModel"
-    Title="{Binding PageTitle}">
-
-    <ContentPage.BindingContext>
-        <pages:RemoveMasterPasswordPageViewModel />
-    </ContentPage.BindingContext>
-
-        <StackLayout Spacing="20"
-                     Padding="10, 5">
-            <StackLayout Spacing="18"
-                         Padding="30">
-                <Label x:Name="_warningLabel"
-                       HorizontalTextAlignment="Center"/>
-                <Label x:Name="_warningLabel2"
-                       HorizontalTextAlignment="Center"/>
-            </StackLayout>
-            <StackLayout Spacing="5">
-                <Button Text="{u:I18n Continue}" 
-                        StyleClass="btn-primary"
-                        Clicked="Continue_Clicked" />
-                <Button Text="{u:I18n LeaveOrganization}"
-                        Clicked="LeaveOrg_Clicked" />
-            </StackLayout>
-        </StackLayout>
-
-</pages:BaseContentPage>
--- a/src/App/Pages/Accounts/RemoveMasterPasswordPage.xaml.cs
+++ b/src/App/Pages/Accounts/RemoveMasterPasswordPage.xaml.cs
@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Bit.App.Resources;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class RemoveMasterPasswordPage : BaseContentPage
-    {
-        private readonly RemoveMasterPasswordPageViewModel _vm;
-
-        public Action NavigateAction { get; set; }
-
-        public RemoveMasterPasswordPage()
-        {
-            InitializeComponent();
-            _vm = BindingContext as RemoveMasterPasswordPageViewModel;
-
-        }
-
-        protected override async void OnAppearing()
-        {
-            await _vm.Init();
-            _warningLabel.Text = string.Format(AppResources.RemoveMasterPasswordWarning,
-                _vm.Organization.Name);
-            _warningLabel2.Text = AppResources.RemoveMasterPasswordWarning2;
-        }
-
-        private async void Continue_Clicked(object sender, System.EventArgs e)
-        {
-            if (DoOnce())
-            {
-                await _vm.MigrateAccount();
-                await Navigation.PopModalAsync();
-            }
-        }
-
-        private async void LeaveOrg_Clicked(object sender, System.EventArgs e)
-        {
-            if (DoOnce())
-            {
-                var confirm = await DisplayAlert(AppResources.LeaveOrganization,
-                    string.Format(AppResources.LeaveOrganizationName, _vm.Organization.Name),
-                    AppResources.Yes, AppResources.No);
-                if (confirm)
-                {
-                    await _vm.LeaveOrganization();
-                    await Navigation.PopModalAsync();
-                }
-            }
-        }
-
-        protected override async void OnDisappearing()
-        {
-            NavigateAction?.Invoke();
-        }
-    }
-}
--- a/src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs
@@ -1,56 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.Domain;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Pages
-{
-    public class RemoveMasterPasswordPageViewModel : BaseViewModel
-    {
-        private readonly IKeyConnectorService _keyConnectorService;
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IApiService _apiService;
-        private readonly ISyncService _syncService;
-
-        public Organization Organization;
-
-        public RemoveMasterPasswordPageViewModel()
-        {
-            PageTitle = AppResources.RemoveMasterPassword;
-
-            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _apiService = ServiceContainer.Resolve<IApiService>("apiService");
-            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
-
-        }
-
-        public async Task Init()
-        {
-            Organization = await _keyConnectorService.GetManagingOrganization();
-        }
-
-        public async Task MigrateAccount()
-        {
-            await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-
-            await _keyConnectorService.MigrateUser();
-            await _syncService.FullSyncAsync(true);
-
-            await _deviceActionService.HideLoadingAsync();
-        }
-
-        public async Task LeaveOrganization()
-        {
-            await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-
-            await _apiService.PostLeaveOrganization(Organization.Id);
-            await _syncService.FullSyncAsync(true);
-
-            await _deviceActionService.HideLoadingAsync();
-        }
-    }
-}
--- a/src/App/Pages/Accounts/SetPasswordPage.xaml.cs
+++ b/src/App/Pages/Accounts/SetPasswordPage.xaml.cs
@@ -1,4 +1,6 @@
-using System;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System;
 using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Utilities;
@@ -8,11 +10,14 @@ namespace Bit.App.Pages
 {
    public partial class SetPasswordPage : BaseContentPage
    {
+        private readonly IMessagingService _messagingService;
        private readonly SetPasswordPageViewModel _vm;
        private readonly AppOptions _appOptions;

        public SetPasswordPage(AppOptions appOptions = null, string orgIdentifier = null)
        {
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _messagingService.Send("showStatusBar", true);
            _appOptions = appOptions;
            InitializeComponent();
            _vm = BindingContext as SetPasswordPageViewModel;
@@ -21,6 +26,7 @@ namespace Bit.App.Pages
                () => Device.BeginInvokeOnMainThread(async () => await SetPasswordSuccessAsync());
            _vm.CloseAction = async () =>
            {
+                _messagingService.Send("showStatusBar", false);
                await Navigation.PopModalAsync();
            };
            _vm.OrgIdentifier = orgIdentifier;
--- a/src/App/Pages/Accounts/SetPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/SetPasswordPageViewModel.cs
@@ -7,6 +7,7 @@ using Bit.Core.Models.Request;
 using Bit.Core.Utilities;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -22,7 +23,7 @@ namespace Bit.App.Pages
        private readonly IApiService _apiService;
        private readonly ICryptoService _cryptoService;
        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IStateService _stateService;
+        private readonly IUserService _userService;
        private readonly IPolicyService _policyService;
        private readonly IPasswordGenerationService _passwordGenerationService;
        private readonly II18nService _i18nService;
@@ -39,7 +40,7 @@ namespace Bit.App.Pages
            _apiService = ServiceContainer.Resolve<IApiService>("apiService");
            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
            _passwordGenerationService =
                ServiceContainer.Resolve<IPasswordGenerationService>("passwordGenerationService");
@@ -158,7 +159,7 @@ namespace Bit.App.Pages

            var kdf = KdfType.PBKDF2_SHA256;
            var kdfIterations = 100000;
-            var email = await _stateService.GetEmailAsync();
+            var email = await _userService.GetEmailAsync();
            var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdf, kdfIterations);
            var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
            var localMasterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
@@ -195,8 +196,8 @@ namespace Bit.App.Pages
                await _deviceActionService.ShowLoadingAsync(AppResources.CreatingAccount);
                // Set Password and relevant information
                await _apiService.SetPasswordAsync(request);
-                await _stateService.SetKdfTypeAsync(kdf);
-                await _stateService.SetKdfIterationsAsync(kdfIterations);
+                await _userService.SetInformationAsync(await _userService.GetUserIdAsync(),
+                    await _userService.GetEmailAsync(), kdf, kdfIterations);
                await _cryptoService.SetKeyAsync(key);
                await _cryptoService.SetKeyHashAsync(localMasterPasswordHash);
                await _cryptoService.SetEncKeyAsync(encKey.Item2.EncryptedString);
@@ -215,7 +216,7 @@ namespace Bit.App.Pages
                    {
                        ResetPasswordKey = encryptedKey.EncryptedString
                    };
-                    var userId = await _stateService.GetActiveUserIdAsync();
+                    var userId = await _userService.GetUserIdAsync();
                    // Enroll user
                    await _apiService.PutOrganizationUserResetPasswordEnrollmentAsync(OrgId, userId, resetRequest);
                }
@@ -288,7 +289,7 @@ namespace Bit.App.Pages

        private async Task<List<string>> GetPasswordStrengthUserInput()
        {
-            var email = await _stateService.GetEmailAsync();
+            var email = await _userService.GetEmailAsync();
            List<string> userInput = null;
            var atPosition = email.IndexOf('@');
            if (atPosition > -1)
--- a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
+++ b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
@@ -14,6 +14,8 @@ namespace Bit.App.Pages
    {
        private readonly IBroadcasterService _broadcasterService;
        private readonly IMessagingService _messagingService;
+        private readonly IStorageService _storageService;
+        private readonly IVaultTimeoutService _vaultTimeoutService;
        private readonly AppOptions _appOptions;

        private TwoFactorPageViewModel _vm;
@@ -28,8 +30,10 @@ namespace Bit.App.Pages
            _authingWithSso = authingWithSso ?? false;
            _appOptions = appOptions;
            _orgIdentifier = orgIdentifier;
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
            _vm = BindingContext as TwoFactorPageViewModel;
            _vm.Page = this;
            _vm.StartSetPasswordAction = () =>
--- a/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
+++ b/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
@@ -22,6 +23,7 @@ namespace Bit.App.Pages
        private readonly IDeviceActionService _deviceActionService;
        private readonly IAuthService _authService;
        private readonly ISyncService _syncService;
+        private readonly IStorageService _storageService;
        private readonly IApiService _apiService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly IEnvironmentService _environmentService;
@@ -41,6 +43,7 @@ namespace Bit.App.Pages
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _authService = ServiceContainer.Resolve<IAuthService>("authService");
            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _apiService = ServiceContainer.Resolve<IApiService>("apiService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
@@ -300,6 +303,8 @@ namespace Bit.App.Pages
                } 
                else
                {
+                    var disableFavicon = await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey);
+                    await _stateService.SaveAsync(Constants.DisableFaviconKey, disableFavicon.GetValueOrDefault());
                    TwoFactorAuthSuccessAction?.Invoke();
                }
            }
--- a/src/App/Pages/Accounts/UpdateTempPasswordPage.xaml.cs
+++ b/src/App/Pages/Accounts/UpdateTempPasswordPage.xaml.cs
@@ -19,6 +19,9 @@ namespace Bit.App.Pages
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            
+            // Service Use
+            _messagingService.Send("showStatusBar", true);
+            
            // Binding
            InitializeComponent();
            _pageName = string.Concat(nameof(UpdateTempPasswordPage), "_", DateTime.UtcNow.Ticks);
--- a/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
@@ -43,9 +43,9 @@ namespace Bit.App.Pages
            }
            
            // Retrieve details for key generation
-            var kdf = await _stateService.GetKdfTypeAsync();
-            var kdfIterations = await _stateService.GetKdfIterationsAsync();
-            var email = await _stateService.GetEmailAsync();
+            var kdf = await _userService.GetKdfAsync();
+            var kdfIterations = await _userService.GetKdfIterationsAsync();
+            var email = await _userService.GetEmailAsync();
            
            // Create new key and hash new password
            var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdf, kdfIterations);
--- a/src/App/Pages/BaseContentPage.cs
+++ b/src/App/Pages/BaseContentPage.cs
@@ -1,11 +1,10 @@
-using Bit.Core.Abstractions;
+using Bit.Core;
+using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using System;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
-using Bit.App.Controls;
 using Bit.App.Utilities;
-using Bit.Core.Enums;
 using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration;
 using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
@@ -14,9 +13,8 @@ namespace Bit.App.Pages
 {
    public class BaseContentPage : ContentPage
    {
-        private IStateService _stateService;
+        private IStorageService _storageService;
        private IDeviceActionService _deviceActionService;
-        private IMessagingService _messagingService;

        protected int ShowModalAnimationDelay = 400;
        protected int ShowPageAnimationDelay = 100;
@@ -32,10 +30,10 @@ namespace Bit.App.Pages

        public DateTime? LastPageAction { get; set; }

-        protected async override void OnAppearing()
+        protected override void OnAppearing()
        {
            base.OnAppearing();
-            await SaveActivity();
+            SaveActivity();
        }

        public bool DoOnce(Action action = null, int milliseconds = 1000)
@@ -108,121 +106,22 @@ namespace Bit.App.Pages
            });
        }

-        protected async Task<bool> ShowAccountSwitcherAsync()
-        {
-            return await _stateService.HasMultipleAccountsAsync();
-        }
-
-        protected async Task RefreshAccountViewsAsync(Xamarin.Forms.ListView accountListView, bool allowAddAccountRow)
-        {
-            await _stateService.RefreshAccountViewsAsync(allowAddAccountRow);
-            // Property change trigger on account listview is yielding inconsistent results, using a hammer instead
-            accountListView.ItemsSource = null;
-            accountListView.ItemsSource = _stateService.AccountViews;
-        }
-        protected async Task<AvatarImageSource> GetAvatarImageSourceAsync(bool useCurrentActiveAccount = true)
-        {
-            return new AvatarImageSource(useCurrentActiveAccount ? await _stateService.GetEmailAsync() : null);
-        }
-
-        protected async Task ShowAccountListAsync(bool isVisible, View listContainer, View overlay, View fab = null)
-        {
-            Device.BeginInvokeOnMainThread(async () =>
-            {
-                // Not all animations are awaited. This is intentional to allow multiple simultaneous animations.
-                if (isVisible)
-                {
-                    // start listView in default (off-screen) position
-                    await listContainer.TranslateTo(0, listContainer.Height * -1, 0);
-
-                    // set overlay opacity to zero before making visible and start fade-in
-                    overlay.Opacity = 0;
-                    overlay.IsVisible = true;
-                    overlay.FadeTo(1, 100);
-
-                    if (Device.RuntimePlatform == Device.Android && fab != null)
-                    {
-                        // start fab fade-out
-                        fab.FadeTo(0, 200);
-                    }
-
-                    // slide account list into view
-                    await listContainer.TranslateTo(0, 0, 200, Easing.SinOut);
-                }
-                else
-                {
-                    // start overlay fade-out
-                    overlay.FadeTo(0, 200);
-
-                    if (Device.RuntimePlatform == Device.Android && fab != null)
-                    {
-                        // start fab fade-in
-                        fab.FadeTo(1, 200);
-                    }
-
-                    // slide account list out of view
-                    await listContainer.TranslateTo(0, listContainer.Height * -1, 200, Easing.SinIn);
-
-                    // remove overlay
-                    overlay.IsVisible = false;
-                }
-            });
-        }
-
-        protected async Task AccountRowSelectedAsync(object sender, SelectedItemChangedEventArgs e, View listContainer,
-            View overlay, View fab = null, bool? allowActiveAccountSelection = false)
-        {
-            if (!DoOnce())
-            {
-                return;
-            }
-            if (!(e.SelectedItem is AccountViewCellViewModel item))
-            {
-                return;
-            }
-
-            ((Xamarin.Forms.ListView)sender).SelectedItem = null;
-            await Task.Delay(100);
-            await ShowAccountListAsync(false, listContainer, overlay, fab);
-
-            if (item.AccountView.IsAccount)
-            {
-                if (item.AccountView.AuthStatus != AuthenticationStatus.Active)
-                {
-                    await _stateService.SetActiveUserAsync(item.AccountView.UserId);
-                    _messagingService.Send("switchedAccount");
-                }
-                else if (allowActiveAccountSelection ?? false)
-                {
-                    _messagingService.Send("switchedAccount");
-                }
-            }
-            else
-            {
-                _messagingService.Send("addAccount");
-            }
-        }
-
        private void SetServices()
        {
-            if (_stateService == null)
+            if (_storageService == null)
            {
-                _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            }
            if (_deviceActionService == null)
            {
                _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            }
-            if (_messagingService == null)
-            {
-                _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            }
        }

-        private async Task SaveActivity()
+        private void SaveActivity()
        {
            SetServices();
-            await _stateService.SetLastActiveTimeAsync(_deviceActionService.GetActiveTime());
+            _storageService.SaveAsync(Constants.LastActiveTimeKey, _deviceActionService.GetActiveTime());
        }
    }
 }
--- a/src/App/Pages/BaseViewModel.cs
+++ b/src/App/Pages/BaseViewModel.cs
@@ -1,5 +1,4 @@
-using Bit.App.Controls;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Xamarin.Forms;

 namespace Bit.App.Pages
@@ -7,7 +6,6 @@ namespace Bit.App.Pages
    public abstract class BaseViewModel : ExtendedViewModel
    {
        private string _pageTitle = string.Empty;
-        private AvatarImageSource _avatar;

        public string PageTitle
        {
@@ -15,12 +13,6 @@ namespace Bit.App.Pages
            set => SetProperty(ref _pageTitle, value);
        }

-        public AvatarImageSource AvatarImageSource
-        {
-            get => _avatar ?? new AvatarImageSource();
-            set => SetProperty(ref _avatar, value);
-        }
-
        public ContentPage Page { get; set; }
    }
 }
--- a/src/App/Pages/Generator/GeneratorHistoryPageViewModel.cs
+++ b/src/App/Pages/Generator/GeneratorHistoryPageViewModel.cs
@@ -12,7 +12,6 @@ namespace Bit.App.Pages
    {
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly IPasswordGenerationService _passwordGenerationService;
-        private readonly IClipboardService _clipboardService;

        private bool _showNoData;

@@ -21,7 +20,6 @@ namespace Bit.App.Pages
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>(
                "passwordGenerationService");
-            _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");

            PageTitle = AppResources.PasswordHistory;
            History = new ExtendedObservableCollection<GeneratedPasswordHistory>();
@@ -53,7 +51,7 @@ namespace Bit.App.Pages

        private async void CopyAsync(GeneratedPasswordHistory ph)
        {
-            await _clipboardService.CopyTextAsync(ph.Password);
+            await _platformUtilsService.CopyToClipboardAsync(ph.Password);
            _platformUtilsService.ShowToast("info", null,
                string.Format(AppResources.ValueHasBeenCopied, AppResources.Password));
        }
--- a/src/App/Pages/Generator/GeneratorPageViewModel.cs
+++ b/src/App/Pages/Generator/GeneratorPageViewModel.cs
@@ -13,7 +13,6 @@ namespace Bit.App.Pages
    {
        private readonly IPasswordGenerationService _passwordGenerationService;
        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IClipboardService _clipboardService;

        private PasswordGenerationOptions _options;
        private PasswordGeneratorPolicyOptions _enforcedPolicyOptions;
@@ -39,8 +38,6 @@ namespace Bit.App.Pages
            _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>(
                "passwordGenerationService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
-
            PageTitle = AppResources.PasswordGenerator;
            TypeOptions = new List<string> { AppResources.Password, AppResources.Passphrase };
        }
@@ -308,7 +305,7 @@ namespace Bit.App.Pages

        public async Task CopyAsync()
        {
-            await _clipboardService.CopyTextAsync(Password);
+            await _platformUtilsService.CopyToClipboardAsync(Password);
            _platformUtilsService.ShowToast("success", null,
                string.Format(AppResources.ValueHasBeenCopied, AppResources.Password));
        }
--- a/src/App/Pages/Send/SendAddEditPageViewModel.cs
+++ b/src/App/Pages/Send/SendAddEditPageViewModel.cs
@@ -19,7 +19,7 @@ namespace Bit.App.Pages
        private readonly IDeviceActionService _deviceActionService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly IMessagingService _messagingService;
-        private readonly IStateService _stateService;
+        private readonly IUserService _userService;
        private readonly ISendService _sendService;
        private bool _sendEnabled;
        private bool _canAccessPremium;
@@ -51,7 +51,7 @@ namespace Bit.App.Pages
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _sendService = ServiceContainer.Resolve<ISendService>("sendService");
            TogglePasswordCommand = new Command(TogglePassword);

@@ -220,8 +220,8 @@ namespace Bit.App.Pages
        public async Task InitAsync()
        {
            PageTitle = EditMode ? AppResources.EditSend : AppResources.AddSend;
-            _canAccessPremium = await _stateService.CanAccessPremiumAsync();
-            _emailVerified = await _stateService.GetEmailVerifiedAsync();
+            _canAccessPremium = await _userService.CanAccessPremiumAsync();
+            _emailVerified = await _userService.GetEmailVerifiedAsync();
            SendEnabled = ! await AppHelpers.IsSendDisabledByPolicyAsync();
            DisableHideEmail = await AppHelpers.IsHideEmailDisabledByPolicyAsync();
            SendOptionsPolicyInEffect = SendEnabled && DisableHideEmail;
--- a/src/App/Pages/Send/SendGroupingsPage/SendGroupingsPageViewModel.cs
+++ b/src/App/Pages/Send/SendGroupingsPage/SendGroupingsPageViewModel.cs
@@ -32,19 +32,21 @@ namespace Bit.App.Pages

        private readonly ISendService _sendService;
        private readonly ISyncService _syncService;
-        private readonly IStateService _stateService;
+        private readonly IUserService _userService;
        private readonly IVaultTimeoutService _vaultTimeoutService;
        private readonly IDeviceActionService _deviceActionService;
        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IStorageService _storageService;

        public SendGroupingsPageViewModel()
        {
            _sendService = ServiceContainer.Resolve<ISendService>("sendService");
            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");

            Loading = true;
            PageTitle = AppResources.Send;
@@ -114,7 +116,7 @@ namespace Bit.App.Pages
            {
                return;
            }
-            var authed = await _stateService.IsAuthenticatedAsync();
+            var authed = await _userService.IsAuthenticatedAsync();
            if (!authed)
            {
                return;
@@ -123,7 +125,7 @@ namespace Bit.App.Pages
            {
                return;
            }
-            if (await _stateService.GetSyncOnRefreshAsync() && Refreshing && !SyncRefreshing)
+            if (await _storageService.GetAsync<bool>(Constants.SyncOnRefreshKey) && Refreshing && !SyncRefreshing)
            {
                SyncRefreshing = true;
                await _syncService.FullSyncAsync(false);
--- a/src/App/Pages/Settings/AutofillServicesPageViewModel.cs
+++ b/src/App/Pages/Settings/AutofillServicesPageViewModel.cs
@@ -2,6 +2,7 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.App.Services;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;

@@ -10,7 +11,7 @@ namespace Bit.App.Pages
    public class AutofillServicesPageViewModel : BaseViewModel
    {
        private readonly IDeviceActionService _deviceActionService;
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
        private readonly MobileI18nService _i18nService;
        
        private bool _autofillServiceToggled;
@@ -22,7 +23,7 @@ namespace Bit.App.Pages
        public AutofillServicesPageViewModel()
        {
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService;
            PageTitle = AppResources.AutofillServices;
        }
@@ -151,7 +152,7 @@ namespace Bit.App.Pages
        
        public async Task InitAsync()
        {
-            InlineAutofillToggled = await _stateService.GetInlineAutofillEnabledAsync() ?? true;
+            InlineAutofillToggled = await _storageService.GetAsync<bool?>(Constants.InlineAutofillEnabledKey) ?? true;
            _inited = true;
        }

@@ -201,7 +202,7 @@ namespace Bit.App.Pages
        {
            if (_inited)
            {
-                await _stateService.SetInlineAutofillEnabledAsync(InlineAutofillToggled);
+                await _storageService.SaveAsync(Constants.InlineAutofillEnabledKey, InlineAutofillToggled);
            }
        }
    }
--- a/src/App/Pages/Settings/ExportVaultPage.xaml
+++ b/src/App/Pages/Settings/ExportVaultPage.xaml
@@ -25,27 +25,21 @@
    </ContentPage.ToolbarItems>

    <ScrollView>
-        <StackLayout
-            StyleClass="box"
-            Spacing="20">
-            <Frame
-                IsVisible="{Binding DisablePrivateVaultPolicyEnabled}"
-                Padding="10"
-                Margin="0, 12, 0, 0"
-                HasShadow="False"
-                BackgroundColor="Transparent"
-                BorderColor="Accent">
-                <Label
-                    Text="{u:I18n DisablePersonalVaultExportPolicyInEffect}"
-                    StyleClass="text-muted, text-sm, text-bold"
-                    HorizontalTextAlignment="Center" />
-            </Frame>
-            <Grid
-                RowSpacing="10"
-                RowDefinitions="70, Auto, Auto">
-                <StackLayout
-                    StyleClass="box-row"
-                    Grid.Row="0">
+        <StackLayout Spacing="20">
+            <StackLayout StyleClass="box">
+                <Frame
+                    IsVisible="{Binding DisablePrivateVaultPolicyEnabled}"
+                    Padding="10"
+                    Margin="0, 12, 0, 0"
+                    HasShadow="False"
+                    BackgroundColor="Transparent"
+                    BorderColor="Accent">
+                    <Label
+                        Text="{u:I18n DisablePersonalVaultExportPolicyInEffect}"
+                        StyleClass="text-muted, text-sm, text-bold"
+                        HorizontalTextAlignment="Center" />
+                </Frame>
+                <StackLayout StyleClass="box-row, box-row-input, box-row-input-options-platform">
                    <Label
                        Text="{u:I18n FileFormat}"
                        StyleClass="box-label" />
@@ -57,37 +51,23 @@
                        StyleClass="box-value"
                        IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}" />
                </StackLayout>
-                <StackLayout
-                    StyleClass="box-row"
-                    Grid.Row="1"
-                    IsVisible="{Binding UseOTPVerification}">
+                <Grid StyleClass="box-row">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
                    <Label
-                        Text="{u:I18n SendVerificationCodeToEmail}"
-                        StyleClass="box-label"
-                        LineBreakMode="WordWrap"
-                        Margin="0,0,0,10" />
-                    <Button x:Name="_requestOTP"
-                        Text="{u:I18n SendCode}"
-                        Clicked="RequestOTP_Clicked"
-                        HorizontalOptions="Fill"
-                        VerticalOptions="End"
-                        IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"
-                        Margin="0,0,0,10"/>
-                </StackLayout>
-                <Grid
-                    StyleClass="box-row"
-                    Grid.Row="2"
-                    RowDefinitions="Auto,Auto,Auto"
-                    ColumnDefinitions="*,Auto"
-                    Padding="0">
-                    <Label
-                        Text="{Binding SecretName}"
+                        Text="{u:I18n MasterPassword}"
                        StyleClass="box-label"
                        Grid.Row="0"
-                        Grid.ColumnSpan="2" />
+                        Grid.Column="0" />
                    <controls:MonoEntry
-                        x:Name="_secret"
-                        Text="{Binding Secret}"
+                        x:Name="_masterPassword"
+                        Text="{Binding MasterPassword}"
                        StyleClass="box-value"
                        IsSpellCheckEnabled="False"
                        IsTextPredictionEnabled="False"
@@ -101,33 +81,22 @@
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
                        Command="{Binding TogglePasswordCommand}"
-                        Grid.Row="1"
+                        Grid.Row="0"
                        Grid.Column="1"
+                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        IsVisible="{Binding UseOTPVerification, Converter={StaticResource inverseBool}}"/>
-                    <Label
-                        Text="{u:I18n ConfirmYourIdentity}"
-                        StyleClass="box-footer-label"
-                        LineBreakMode="WordWrap"
-                        Grid.Row="2"
-                        Margin="0,10,0,0"
-                        IsVisible="{Binding UseOTPVerification}" />
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                </Grid>
-                
-            </Grid>
-            <StackLayout
-                StyleClass="box-row">
                <Label
                    Text="{u:I18n ExportVaultMasterPasswordDescription}"
-                    StyleClass="box-footer-label, box-footer-label-switch"
-                    IsVisible="{Binding UseOTPVerification, Converter={StaticResource inverseBool}}"/>
-                <Button
-                    Text="{u:I18n ExportVault}"
-                    Clicked="ExportVault_Clicked"
-                    HorizontalOptions="Fill"
-                    VerticalOptions="End"
-                    IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"/>
+                    StyleClass="box-footer-label, box-footer-label-switch" />
+                <StackLayout Spacing="20">
+                    <Button Text="{u:I18n ExportVault}"
+                            Clicked="ExportVault_Clicked"
+                            HorizontalOptions="Fill"
+                            VerticalOptions="End"
+                            IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"/>
+                </StackLayout>
            </StackLayout>
        </StackLayout>
    </ScrollView>
--- a/src/App/Pages/Settings/ExportVaultPage.xaml.cs
+++ b/src/App/Pages/Settings/ExportVaultPage.xaml.cs
@@ -17,7 +17,7 @@ namespace Bit.App.Pages
            _vm = BindingContext as ExportVaultPageViewModel;
            _vm.Page = this;
            _fileFormatPicker.ItemDisplayBinding = new Binding("Value");
-            SecretEntry = _secret;
+            MasterPasswordEntry = _masterPassword;
        }

        protected async override void OnAppearing()
@@ -39,7 +39,7 @@ namespace Bit.App.Pages
                    });
                }
            });
-            RequestFocus(_secret);
+            RequestFocus(_masterPassword);
        }

        protected async override void OnDisappearing()
@@ -48,7 +48,7 @@ namespace Bit.App.Pages
            _broadcasterService.Unsubscribe(nameof(ExportVaultPage));
        }

-        public Entry SecretEntry { get; set; }
+        public Entry MasterPasswordEntry { get; set; }

        private async void Close_Clicked(object sender, System.EventArgs e)
        {
@@ -66,15 +66,6 @@ namespace Bit.App.Pages
            }
        }

-        private async void RequestOTP_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                await _vm.RequestOTP();
-                _requestOTP.IsEnabled = false;
-            }
-        }
-
        void FileFormat_Changed(object sender, EventArgs e)
        {
            _vm?.UpdateWarning();
--- a/src/App/Pages/Settings/ExportVaultPageViewModel.cs
+++ b/src/App/Pages/Settings/ExportVaultPageViewModel.cs
@@ -4,10 +4,11 @@ using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Text;
 using System.Threading.Tasks;
+using Bit.Core;
 using Bit.Core.Enums;
-using Bit.Core.Exceptions;
 #if !FDROID
 using Microsoft.AppCenter.Crashes;
 #endif
@@ -20,33 +21,26 @@ namespace Bit.App.Pages
        private readonly IDeviceActionService _deviceActionService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly II18nService _i18nService;
+        private readonly ICryptoService _cryptoService;
        private readonly IExportService _exportService;
        private readonly IPolicyService _policyService;
-        private readonly IKeyConnectorService _keyConnectorService;
-        private readonly IUserVerificationService _userVerificationService;
-        private readonly IApiService _apiService;

        private int _fileFormatSelectedIndex;
        private string _exportWarningMessage;
        private bool _showPassword;
-        private string _secret;
+        private string _masterPassword;
        private byte[] _exportResult;
        private string _defaultFilename;
        private bool _initialized = false;
-        private bool _useOTPVerification = false;
-        private string _secretName;
-        private string _instructionText;

        public ExportVaultPageViewModel()
        {
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
+            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
            _exportService = ServiceContainer.Resolve<IExportService>("exportService");
            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
-            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>("userVerificationService");
-            _apiService = ServiceContainer.Resolve<IApiService>("apiService");

            PageTitle = AppResources.ExportVault;
            TogglePasswordCommand = new Command(TogglePassword);
@@ -65,19 +59,7 @@ namespace Bit.App.Pages
            _initialized = true;
            FileFormatSelectedIndex = FileFormatOptions.FindIndex(k => k.Key == "json");
            DisablePrivateVaultPolicyEnabled = await _policyService.PolicyAppliesToUser(PolicyType.DisablePersonalVaultExport);
-            UseOTPVerification = await _keyConnectorService.GetUsesKeyConnector();

-            if (UseOTPVerification)
-            {
-                InstructionText = _i18nService.T("ExportVaultOTPDescription");
-                SecretName = _i18nService.T("VerificationCode");
-            }
-            else
-            {
-                InstructionText = _i18nService.T("ExportVaultMasterPasswordDescription");
-                SecretName = _i18nService.T("MasterPassword");
-            }
-            
            UpdateWarning();
        }

@@ -112,28 +94,10 @@ namespace Bit.App.Pages
                additionalPropertyNames: new string[] {nameof(ShowPasswordIcon)});
        }

-        public bool UseOTPVerification
+        public string MasterPassword
        {
-            get => _useOTPVerification;
-            set => SetProperty(ref _useOTPVerification, value);
-        }
-
-        public string Secret
-        {
-            get => _secret;
-            set => SetProperty(ref _secret, value);
-        }
-
-        public string SecretName
-        {
-            get => _secretName;
-            set => SetProperty(ref _secretName, value);
-        }
-
-        public string InstructionText
-        {
-            get => _instructionText;
-            set => SetProperty(ref _instructionText, value);
+            get => _masterPassword;
+            set => SetProperty(ref _masterPassword, value);
        }

        public Command TogglePasswordCommand { get; }
@@ -143,13 +107,27 @@ namespace Bit.App.Pages
        public void TogglePassword()
        {
            ShowPassword = !ShowPassword;
-            (Page as ExportVaultPage).SecretEntry.Focus();
+            (Page as ExportVaultPage).MasterPasswordEntry.Focus();
        }

        public Command ExportVaultCommand { get; }

        public async Task ExportVaultAsync()
        {
+            if (string.IsNullOrEmpty(_masterPassword))
+            {
+                await _platformUtilsService.ShowDialogAsync(_i18nService.T("InvalidMasterPassword"));
+                return;
+            }
+
+            var passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(_masterPassword, null);
+            MasterPassword = string.Empty;
+            if (!passwordValid)
+            {
+                await _platformUtilsService.ShowDialogAsync(_i18nService.T("InvalidMasterPassword"));
+                return;
+            }
+
            bool userConfirmedExport = await _platformUtilsService.ShowDialogAsync(ExportWarningMessage,
                _i18nService.T("ExportVaultConfirmationTitle"), _i18nService.T("ExportVault"), _i18nService.T("Cancel"));

@@ -158,16 +136,6 @@ namespace Bit.App.Pages
                return;
            }

-            var verificationType = await _keyConnectorService.GetUsesKeyConnector()
-                ? VerificationType.OTP
-                : VerificationType.MasterPassword;
-            if (!await _userVerificationService.VerifyUser(Secret, verificationType))
-            {
-                return;
-            }
-
-            Secret = string.Empty;
-
            try
            {
                var data = await _exportService.GetExport(FileFormatOptions[FileFormatSelectedIndex].Key);
@@ -194,27 +162,6 @@ namespace Bit.App.Pages
            }
        }

-        public async Task RequestOTP()
-        {
-            try
-            {
-                await _deviceActionService.ShowLoadingAsync(AppResources.Sending);
-                await _apiService.PostAccountRequestOTP();
-                await _deviceActionService.HideLoadingAsync();
-                _platformUtilsService.ShowToast("success", null, AppResources.CodeSent);
-            }
-            catch (ApiException e)
-            {
-                await _deviceActionService.HideLoadingAsync();
-                if (e?.Error != null)
-                {
-                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
-                        AppResources.AnErrorHasOccurred);
-                }
-            }
-
-        }
-
        public async void SaveFileSelected(string contentUri, string filename)
        {
            if (_deviceActionService.SaveFile(_exportResult, null, filename ?? _defaultFilename, contentUri))
--- a/src/App/Pages/Settings/ExtensionPageViewModel.cs
+++ b/src/App/Pages/Settings/ExtensionPageViewModel.cs
@@ -7,8 +7,12 @@ namespace Bit.App.Pages
 {
    public class ExtensionPageViewModel : BaseViewModel
    {
+        private const string StartedKey = "appExtensionStarted";
+        private const string ActivatedKey = "appExtensionActivated";
+
        private readonly IMessagingService _messagingService;
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
+        private readonly IPlatformUtilsService _platformUtilsService;

        private bool _started;
        private bool _activated;
@@ -16,7 +20,8 @@ namespace Bit.App.Pages
        public ExtensionPageViewModel()
        {
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            PageTitle = AppResources.AppExtension;
        }

@@ -47,8 +52,8 @@ namespace Bit.App.Pages

        public async Task InitAsync()
        {
-            var started = await _stateService.GetAppExtensionStartedAsync();
-            var activated = await _stateService.GetAppExtensionActivatedAsync();
+            var started = await _storageService.GetAsync<bool?>(StartedKey);
+            var activated = await _storageService.GetAsync<bool?>(ActivatedKey);
            Started = started.GetValueOrDefault();
            Activated = activated.GetValueOrDefault();
        }
--- a/src/App/Pages/Settings/OptionsPageViewModel.cs
+++ b/src/App/Pages/Settings/OptionsPageViewModel.cs
@@ -1,4 +1,5 @@
-using Bit.App.Resources;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
@@ -12,6 +13,9 @@ namespace Bit.App.Pages
 {
    public class OptionsPageViewModel : BaseViewModel
    {
+        private readonly IDeviceActionService _deviceActionService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IStorageService _storageService;
        private readonly ITotpService _totpService;
        private readonly IStateService _stateService;
        private readonly IMessagingService _messagingService;
@@ -30,6 +34,9 @@ namespace Bit.App.Pages

        public OptionsPageViewModel()
        {
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
@@ -159,17 +166,19 @@ namespace Bit.App.Pages

        public async Task InitAsync()
        {
-            AutofillDisableSavePrompt = (await _stateService.GetAutofillDisableSavePromptAsync()).GetValueOrDefault();
-            var blacklistedUrisList = await _stateService.GetAutofillBlacklistedUrisAsync();
+            AutofillDisableSavePrompt = (await _storageService.GetAsync<bool?>(
+                Constants.AutofillDisableSavePromptKey)).GetValueOrDefault();
+            var blacklistedUrisList = await _storageService.GetAsync<List<string>>(
+                Constants.AutofillBlacklistedUrisKey);
            AutofillBlacklistedUris = blacklistedUrisList != null ? string.Join(", ", blacklistedUrisList) : null;
            DisableAutoTotpCopy = !(await _totpService.IsAutoCopyEnabledAsync());
-            DisableFavicon = (await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
-            var theme = await _stateService.GetThemeAsync();
+            DisableFavicon = (await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey)).GetValueOrDefault();
+            var theme = await _storageService.GetAsync<string>(Constants.ThemeKey);
            ThemeSelectedIndex = ThemeOptions.FindIndex(k => k.Key == theme);
-            var defaultUriMatch = await _stateService.GetDefaultUriMatchAsync();
+            var defaultUriMatch = await _storageService.GetAsync<int?>(Constants.DefaultUriMatch);
            UriMatchSelectedIndex = defaultUriMatch == null ? 0 :
                UriMatchOptions.FindIndex(k => (int?)k.Key == defaultUriMatch);
-            var clearClipboard = await _stateService.GetClearClipboardAsync();
+            var clearClipboard = await _storageService.GetAsync<int?>(Constants.ClearClipboardKey);
            ClearClipboardSelectedIndex = ClearClipboardOptions.FindIndex(k => k.Key == clearClipboard);
            _inited = true;
        }
@@ -178,7 +187,7 @@ namespace Bit.App.Pages
        {
            if (_inited)
            {
-                await _stateService.SetDisableAutoTotpCopyAsync(DisableAutoTotpCopy);
+                await _storageService.SaveAsync(Constants.DisableAutoTotpCopyKey, DisableAutoTotpCopy);
            }
        }

@@ -186,7 +195,8 @@ namespace Bit.App.Pages
        {
            if (_inited)
            {
-                await _stateService.SetDisableFaviconAsync(DisableFavicon);
+                await _storageService.SaveAsync(Constants.DisableFaviconKey, DisableFavicon);
+                await _stateService.SaveAsync(Constants.DisableFaviconKey, DisableFavicon);
            }
        }

@@ -194,7 +204,8 @@ namespace Bit.App.Pages
        {
            if (_inited && ClearClipboardSelectedIndex > -1)
            {
-                await _stateService.SetClearClipboardAsync(ClearClipboardOptions[ClearClipboardSelectedIndex].Key);
+                await _storageService.SaveAsync(Constants.ClearClipboardKey,
+                    ClearClipboardOptions[ClearClipboardSelectedIndex].Key);
            }
        }

@@ -203,8 +214,8 @@ namespace Bit.App.Pages
            if (_inited && ThemeSelectedIndex > -1)
            {
                var theme = ThemeOptions[ThemeSelectedIndex].Key;
-                await _stateService.SetThemeAsync(theme);
-                ThemeManager.SetTheme(Application.Current.Resources);
+                await _storageService.SaveAsync(Constants.ThemeKey, theme);
+                ThemeManager.SetTheme(Device.RuntimePlatform == Device.Android, Application.Current.Resources);
                _messagingService.Send("updatedTheme");
            }
        }
@@ -213,7 +224,8 @@ namespace Bit.App.Pages
        {
            if (_inited && UriMatchSelectedIndex > -1)
            {
-                await _stateService.SetDefaultUriMatchAsync((int?)UriMatchOptions[UriMatchSelectedIndex].Key);
+                await _storageService.SaveAsync(Constants.DefaultUriMatch,
+                    (int?)UriMatchOptions[UriMatchSelectedIndex].Key);
            }
        }

@@ -221,7 +233,7 @@ namespace Bit.App.Pages
        {
            if (_inited)
            {
-                await _stateService.SetAutofillDisableSavePromptAsync(AutofillDisableSavePrompt);
+                await _storageService.SaveAsync(Constants.AutofillDisableSavePromptKey, AutofillDisableSavePrompt);
            }
        }

@@ -231,7 +243,7 @@ namespace Bit.App.Pages
            {
                if (string.IsNullOrWhiteSpace(AutofillBlacklistedUris))
                {
-                    await _stateService.SetAutofillBlacklistedUrisAsync(null);
+                    await _storageService.RemoveAsync(Constants.AutofillBlacklistedUrisKey);
                    AutofillBlacklistedUris = null;
                    return;
                }
@@ -253,7 +265,7 @@ namespace Bit.App.Pages
                        }
                        urisList.Add(cleanedUri);
                    }
-                    await _stateService.SetAutofillBlacklistedUrisAsync(urisList);
+                    await _storageService.SaveAsync(Constants.AutofillBlacklistedUrisKey, urisList);
                    AutofillBlacklistedUris = string.Join(", ", urisList);
                }
                catch { }
--- a/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs
@@ -1,11 +1,10 @@
 using System.ComponentModel;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.App.Abstractions;
-using Bit.App.Controls;
-using Bit.App.Pages.Accounts;
 using Bit.App.Resources;
 using Bit.Core.Utilities;
+using System.Linq;
+using System.Threading.Tasks;
+using Bit.App.Controls;
 using Xamarin.Forms;

 namespace Bit.App.Pages
@@ -135,10 +134,6 @@ namespace Bit.App.Pages
            {
                await _vm.LogOutAsync();
            }
-            else if (item.Name == AppResources.DeleteAccount)
-            {
-                await Navigation.PushModalAsync(new NavigationPage(new DeleteAccountPage()));
-            }
            else if (item.Name == AppResources.LockNow)
            {
                await _vm.LockAsync();
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using System;
@@ -16,17 +17,16 @@ namespace Bit.App.Pages
    {
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly ICryptoService _cryptoService;
-        private readonly IStateService _stateService;
+        private readonly IUserService _userService;
        private readonly IDeviceActionService _deviceActionService;
        private readonly IEnvironmentService _environmentService;
        private readonly IMessagingService _messagingService;
        private readonly IVaultTimeoutService _vaultTimeoutService;
+        private readonly IStorageService _storageService;
        private readonly ISyncService _syncService;
        private readonly IBiometricService _biometricService;
        private readonly IPolicyService _policyService;
        private readonly ILocalizeService _localizeService;
-        private readonly IKeyConnectorService _keyConnectorService;
-        private readonly IClipboardService _clipboardService;

        private const int CustomVaultTimeoutValue = -100;

@@ -36,8 +36,6 @@ namespace Bit.App.Pages
        private string _lastSyncDate;
        private string _vaultTimeoutDisplayValue;
        private string _vaultTimeoutActionDisplayValue;
-        private bool _showChangeMasterPassword;
-
        private List<KeyValuePair<string, int?>> _vaultTimeouts =
            new List<KeyValuePair<string, int?>>
            {
@@ -66,17 +64,16 @@ namespace Bit.App.Pages
        {
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
            _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
            _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");
-            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
-            _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");

            GroupedItems = new ExtendedObservableCollection<SettingsPageListGroup>();
            PageTitle = AppResources.Settings;
@@ -108,7 +105,7 @@ namespace Bit.App.Pages

            _vaultTimeout = await _vaultTimeoutService.GetVaultTimeout();
            _vaultTimeoutDisplayValue = _vaultTimeouts.FirstOrDefault(o => o.Value == _vaultTimeout).Key;
-            var action = await _stateService.GetVaultTimeoutActionAsync() ?? "lock";
+            var action = await _storageService.GetAsync<string>(Constants.VaultTimeoutActionKey) ?? "lock";
            _vaultTimeoutActionDisplayValue = _vaultTimeoutActions.FirstOrDefault(o => o.Value == action).Key;
            var pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
            _pin = pinSet.Item1 || pinSet.Item2;
@@ -119,9 +116,6 @@ namespace Bit.App.Pages
                _vaultTimeoutDisplayValue = AppResources.Custom;
            }

-            _showChangeMasterPassword = IncludeLinksWithSubscriptionInfo() &&
-                !await _keyConnectorService.GetUsesKeyConnector();
-
            BuildList();
        }

@@ -134,7 +128,7 @@ namespace Bit.App.Pages
                AppResources.Close);
            if (copy)
            {
-                await _clipboardService.CopyTextAsync(debugText);
+                await _platformUtilsService.CopyToClipboardAsync(debugText);
            }
        }

@@ -148,7 +142,7 @@ namespace Bit.App.Pages
            List<string> fingerprint;
            try
            {
-                fingerprint = await _cryptoService.GetFingerprintAsync(await _stateService.GetActiveUserIdAsync());
+                fingerprint = await _cryptoService.GetFingerprintAsync(await _userService.GetUserIdAsync());
            }
            catch (Exception e) when (e.Message == "No public key available.")
            {
@@ -318,17 +312,13 @@ namespace Bit.App.Pages
                    AppResources.SetPINDescription, null, AppResources.Submit, AppResources.Cancel, true);
                if (!string.IsNullOrWhiteSpace(pin))
                {
-                    var masterPassOnRestart = false;
-                    if (!await _keyConnectorService.GetUsesKeyConnector())
-                    {
-                        masterPassOnRestart = await _platformUtilsService.ShowDialogAsync(
-                            AppResources.PINRequireMasterPasswordRestart, AppResources.UnlockWithPIN,
-                            AppResources.Yes, AppResources.No);
-                    }
+                    var masterPassOnRestart = await _platformUtilsService.ShowDialogAsync(
+                       AppResources.PINRequireMasterPasswordRestart, AppResources.UnlockWithPIN,
+                       AppResources.Yes, AppResources.No);

-                    var kdf = await _stateService.GetKdfTypeAsync();
-                    var kdfIterations = await _stateService.GetKdfIterationsAsync();
-                    var email = await _stateService.GetEmailAsync();
+                    var kdf = await _userService.GetKdfAsync();
+                    var kdfIterations = await _userService.GetKdfIterationsAsync();
+                    var email = await _userService.GetEmailAsync();
                    var pinKey = await _cryptoService.MakePinKeyAysnc(pin, email,
                        kdf.GetValueOrDefault(Core.Enums.KdfType.PBKDF2_SHA256),
                        kdfIterations.GetValueOrDefault(5000));
@@ -338,12 +328,12 @@ namespace Bit.App.Pages
                    if (masterPassOnRestart)
                    {
                        var encPin = await _cryptoService.EncryptAsync(pin);
-                        await _stateService.SetProtectedPinAsync(encPin.EncryptedString);
-                        await _stateService.SetPinProtectedCachedAsync(pinProtectedKey);
+                        await _storageService.SaveAsync(Constants.ProtectedPin, encPin.EncryptedString);
+                        _vaultTimeoutService.PinProtectedKey = pinProtectedKey;
                    }
                    else
                    {
-                        await _stateService.SetPinProtectedAsync(pinProtectedKey.EncryptedString);
+                        await _storageService.SaveAsync(Constants.PinProtectedKey, pinProtectedKey.EncryptedString);
                    }
                }
                else
@@ -378,13 +368,13 @@ namespace Bit.App.Pages
            if (_biometric)
            {
                await _biometricService.SetupBiometricAsync();
-                await _stateService.SetBiometricUnlockAsync(true);
+                await _storageService.SaveAsync(Constants.BiometricUnlockKey, true);
            }
            else
            {
-                await _stateService.SetBiometricUnlockAsync(null);
+                await _storageService.RemoveAsync(Constants.BiometricUnlockKey);
            }
-            _stateService.BiometricLocked = false;
+            _vaultTimeoutService.BiometricLocked = false;
            await _cryptoService.ToggleKeyAsync();
            BuildList();
        }
@@ -470,7 +460,7 @@ namespace Bit.App.Pages
                new SettingsPageListItem { Name = AppResources.FingerprintPhrase },
                new SettingsPageListItem { Name = AppResources.LogOut }
            };
-            if (_showChangeMasterPassword)
+            if (IncludeLinksWithSubscriptionInfo())
            {
                accountItems.Insert(0, new SettingsPageListItem { Name = AppResources.ChangeMasterPassword });
            }
@@ -489,8 +479,7 @@ namespace Bit.App.Pages
                new SettingsPageListItem { Name = AppResources.Options },
                new SettingsPageListItem { Name = AppResources.About },
                new SettingsPageListItem { Name = AppResources.HelpAndFeedback },
-                new SettingsPageListItem { Name = AppResources.RateTheApp },
-                new SettingsPageListItem { Name = AppResources.DeleteAccount }
+                new SettingsPageListItem { Name = AppResources.RateTheApp }
            };
            GroupedItems.ResetWithRange(new List<SettingsPageListGroup>
            {
--- a/src/App/Pages/Settings/SyncPageViewModel.cs
+++ b/src/App/Pages/Settings/SyncPageViewModel.cs
@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
@@ -11,7 +12,7 @@ namespace Bit.App.Pages
    {
        private readonly IDeviceActionService _deviceActionService;
        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
        private readonly ISyncService _syncService;
        private readonly ILocalizeService _localizeService;

@@ -23,7 +24,7 @@ namespace Bit.App.Pages
        {
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
            _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");

@@ -51,7 +52,7 @@ namespace Bit.App.Pages
        public async Task InitAsync()
        {
            await SetLastSyncAsync();
-            EnableSyncOnRefresh = await _stateService.GetSyncOnRefreshAsync();
+            EnableSyncOnRefresh = await _storageService.GetAsync<bool>(Constants.SyncOnRefreshKey);
            _inited = true;
        }

@@ -59,7 +60,7 @@ namespace Bit.App.Pages
        {
            if (_inited)
            {
-                await _stateService.SetSyncOnRefreshAsync(_syncOnRefresh);
+                await _storageService.SaveAsync(Constants.SyncOnRefreshKey, _syncOnRefresh);
            }
        }

--- a/src/App/Pages/TabsPage.cs
+++ b/src/App/Pages/TabsPage.cs
@@ -2,7 +2,6 @@
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
-using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 using Xamarin.Forms;

@@ -11,7 +10,6 @@ namespace Bit.App.Pages
    public class TabsPage : TabbedPage
    {
        private readonly IMessagingService _messagingService;
-        private readonly IKeyConnectorService _keyConnectorService;
        
        private NavigationPage _groupingsPage;
        private NavigationPage _sendGroupingsPage;
@@ -20,7 +18,6 @@ namespace Bit.App.Pages
        public TabsPage(AppOptions appOptions = null, PreviousPageInfo previousPage = null)
        {
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");

            _groupingsPage = new NavigationPage(new GroupingsPage(true, previousPage: previousPage))
            {
@@ -46,7 +43,7 @@ namespace Bit.App.Pages
            var settingsPage = new NavigationPage(new SettingsPage(this))
            {
                Title = AppResources.Settings,
-                IconImageSource = "cog_settings.png"
+                IconImageSource = "cog.png"
            };
            Children.Add(settingsPage);

@@ -75,15 +72,6 @@ namespace Bit.App.Pages
            }
        }

-        protected override async void OnAppearing()
-        {
-            base.OnAppearing();
-            if (await _keyConnectorService.UserNeedsMigration())
-            {
-                _messagingService.Send("convertAccountToKeyConnector");
-            }
-        }
-
        public void ResetToVaultPage()
        {
            CurrentPage = _groupingsPage;
--- a/src/App/Pages/Vault/AddEditPage.xaml
+++ b/src/App/Pages/Vault/AddEditPage.xaml
@@ -556,7 +556,7 @@
                        StyleClass="box-value"
                        HorizontalOptions="End" />
                </StackLayout>
-                <StackLayout x:Name="_passwordPrompt" StyleClass="box-row, box-row-switch">
+                <StackLayout StyleClass="box-row, box-row-switch">
                    <Label
                        Text="{u:I18n PasswordPrompt}"
                        StyleClass="box-label-regular" />
@@ -656,16 +656,6 @@
                                            </Keyboard>
                                        </Entry.Keyboard>
                                    </controls:MonoEntry>
-                                    <StackLayout
-                                        StyleClass="box-row, box-row-input"
-                                        IsVisible="{Binding IsLinkedType}">
-                                        <Picker
-                                            x:Name="_linkedFieldOptionPicker"
-                                            ItemsSource="{Binding LinkedFieldOptions, Mode=OneTime}"
-                                            SelectedIndex="{Binding LinkedFieldOptionSelectedIndex}"
-                                            ItemDisplayBinding="{Binding Key}"
-                                            StyleClass="box-value" />
-                                    </StackLayout>
                                    <Switch
                                        IsToggled="{Binding BooleanValue}"
                                        Grid.Row="0"
--- a/src/App/Pages/Vault/AddEditPage.xaml.cs
+++ b/src/App/Pages/Vault/AddEditPage.xaml.cs
@@ -2,6 +2,7 @@
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Utilities;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
@@ -17,10 +18,9 @@ namespace Bit.App.Pages
    public partial class AddEditPage : BaseContentPage
    {
        private readonly AppOptions _appOptions;
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
        private readonly IDeviceActionService _deviceActionService;
        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly IKeyConnectorService _keyConnectorService;

        private AddEditPageViewModel _vm;
        private bool _fromAutofill;
@@ -37,11 +37,9 @@ namespace Bit.App.Pages
            bool cloneMode = false,
            ViewPage viewPage = null)
        {
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
-            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
-
            _appOptions = appOptions;
            _fromAutofill = fromAutofill;
            FromAutofillFramework = _appOptions?.FromAutofillFramework ?? false;
@@ -173,8 +171,6 @@ namespace Bit.App.Pages
                }
                _scrollView.Scrolled += (sender, args) => _vm.HandleScroll();
            });
-            // Hide password reprompt option if using key connector
-            _passwordPrompt.IsVisible = !await _keyConnectorService.GetUsesKeyConnector();
        }

        protected override void OnDisappearing()
@@ -332,10 +328,10 @@ namespace Bit.App.Pages
                {
                    return;
                }
-                var addLoginShown = await _stateService.GetAddSitePromptShownAsync();
+                var addLoginShown = await _storageService.GetAsync<bool?>(Constants.AddSitePromptShownKey);
                if (_vm.Cipher.Type == CipherType.Login && !_fromAutofill && !addLoginShown.GetValueOrDefault())
                {
-                    await _stateService.SetAddSitePromptShownAsync(true);
+                    await _storageService.SaveAsync(Constants.AddSitePromptShownKey, true);
                    if (Device.RuntimePlatform == Device.iOS)
                    {
                        if (_deviceActionService.SystemMajorVersion() < 12)
--- a/src/App/Pages/Vault/AddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/AddEditPageViewModel.cs
@@ -22,8 +22,7 @@ namespace Bit.App.Pages
        private readonly ICipherService _cipherService;
        private readonly IFolderService _folderService;
        private readonly ICollectionService _collectionService;
-        private readonly IStateService _stateService;
-        private readonly IOrganizationService _organizationService;
+        private readonly IUserService _userService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly IAuditService _auditService;
        private readonly IMessagingService _messagingService;
@@ -65,14 +64,20 @@ namespace Bit.App.Pages
                new KeyValuePair<UriMatchType?, string>(UriMatchType.Exact, AppResources.Exact),
                new KeyValuePair<UriMatchType?, string>(UriMatchType.Never, AppResources.Never)
            };
+        private List<KeyValuePair<FieldType, string>> _fieldTypeOptions =
+            new List<KeyValuePair<FieldType, string>>
+            {
+                new KeyValuePair<FieldType, string>(FieldType.Text, AppResources.FieldTypeText),
+                new KeyValuePair<FieldType, string>(FieldType.Hidden, AppResources.FieldTypeHidden),
+                new KeyValuePair<FieldType, string>(FieldType.Boolean, AppResources.FieldTypeBoolean)
+            };

        public AddEditPageViewModel()
        {
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
            _folderService = ServiceContainer.Resolve<IFolderService>("folderService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            _organizationService = ServiceContainer.Resolve<IOrganizationService>("organizationService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _auditService = ServiceContainer.Resolve<IAuditService>("auditService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
@@ -304,9 +309,9 @@ namespace Bit.App.Pages

        public async Task<bool> LoadAsync(AppOptions appOptions = null)
        {
-            var myEmail = await _stateService.GetEmailAsync();
+            var myEmail = await _userService.GetEmailAsync();
            OwnershipOptions.Add(new KeyValuePair<string, string>(myEmail, null));
-            var orgs = await _organizationService.GetAllAsync();
+            var orgs = await _userService.GetAllOrganizationAsync();
            foreach (var org in orgs.OrderBy(o => o.Name))
            {
                if (org.Enabled && org.Status == OrganizationUserStatusType.Confirmed)
@@ -662,20 +667,8 @@ namespace Bit.App.Pages

        public async void AddField()
        {
-            var fieldTypeOptions = new List<KeyValuePair<FieldType, string>>
-            {
-                new KeyValuePair<FieldType, string>(FieldType.Text, AppResources.FieldTypeText),
-                new KeyValuePair<FieldType, string>(FieldType.Hidden, AppResources.FieldTypeHidden),
-                new KeyValuePair<FieldType, string>(FieldType.Boolean, AppResources.FieldTypeBoolean),
-            };
-
-            if (Cipher.LinkedFieldOptions != null)
-            {
-                fieldTypeOptions.Add(new KeyValuePair<FieldType, string>(FieldType.Linked, AppResources.FieldTypeLinked));
-            }
-
            var typeSelection = await Page.DisplayActionSheet(AppResources.SelectTypeField, AppResources.Cancel, null,
-                fieldTypeOptions.Select(f => f.Value).ToArray());
+                _fieldTypeOptions.Select(f => f.Value).ToArray());
            if (typeSelection != null && typeSelection != AppResources.Cancel)
            {
                var name = await _deviceActionService.DisplayPromptAync(AppResources.CustomFieldName);
@@ -687,7 +680,7 @@ namespace Bit.App.Pages
                {
                    Fields = new ExtendedObservableCollection<AddEditPageFieldViewModel>();
                }
-                var type = fieldTypeOptions.FirstOrDefault(f => f.Value == typeSelection).Key;
+                var type = _fieldTypeOptions.FirstOrDefault(f => f.Value == typeSelection).Key;
                Fields.Add(new AddEditPageFieldViewModel(Cipher, new FieldView
                {
                    Type = type,
@@ -753,12 +746,6 @@ namespace Bit.App.Pages
            {
                Cipher.Type = TypeOptions[TypeSelectedIndex].Value;
                TriggerCipherChanged();
-
-                // Linked Custom Fields only apply to a specific item type
-                foreach (var field in Fields.Where(f => f.IsLinkedType).ToList())
-                {
-                    Fields.Remove(field);
-                }
            }
        }

@@ -863,29 +850,23 @@ namespace Bit.App.Pages

    public class AddEditPageFieldViewModel : ExtendedViewModel
    {
-        private II18nService _i18nService;
        private FieldView _field;
        private CipherView _cipher;
        private bool _showHiddenValue;
        private bool _booleanValue;
-        private int _linkedFieldOptionSelectedIndex;
        private string[] _additionalFieldProperties = new string[]
        {
            nameof(IsBooleanType),
            nameof(IsHiddenType),
            nameof(IsTextType),
-            nameof(IsLinkedType),
        };

        public AddEditPageFieldViewModel(CipherView cipher, FieldView field)
        {
-            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
            _cipher = cipher;
            Field = field;
            ToggleHiddenValueCommand = new Command(ToggleHiddenValue);
            BooleanValue = IsBooleanType && field.Value == "true";
-            LinkedFieldOptionSelectedIndex = !Field.LinkedId.HasValue ? 0 :
-                LinkedFieldOptions.FindIndex(lfo => lfo.Value == Field.LinkedId.Value);
        }

        public FieldView Field
@@ -917,32 +898,12 @@ namespace Bit.App.Pages
            }
        }

-        public int LinkedFieldOptionSelectedIndex
-        {
-            get => _linkedFieldOptionSelectedIndex;
-            set
-            {
-                if (SetProperty(ref _linkedFieldOptionSelectedIndex, value))
-                {
-                    LinkedFieldValueChanged();
-                }
-            }
-        }
-
-        public List<KeyValuePair<string, LinkedIdType>> LinkedFieldOptions
-        {
-            get => _cipher.LinkedFieldOptions?
-                .Select(kvp => new KeyValuePair<string, LinkedIdType>(_i18nService.T(kvp.Key), kvp.Value))
-                .ToList();
-        }
-
        public Command ToggleHiddenValueCommand { get; set; }

        public string ShowHiddenValueIcon => _showHiddenValue ? "" : "";
        public bool IsTextType => _field.Type == FieldType.Text;
        public bool IsBooleanType => _field.Type == FieldType.Boolean;
        public bool IsHiddenType => _field.Type == FieldType.Hidden;
-        public bool IsLinkedType => _field.Type == FieldType.Linked;
        public bool ShowViewHidden => IsHiddenType && (_cipher.ViewPassword || _field.NewField);

        public void ToggleHiddenValue()
@@ -959,14 +920,5 @@ namespace Bit.App.Pages
        {
            TriggerPropertyChanged(nameof(Field), _additionalFieldProperties);
        }
-
-        private void LinkedFieldValueChanged()
-        {
-            if (Field != null && LinkedFieldOptionSelectedIndex > -1)
-            {
-                Field.LinkedId = LinkedFieldOptions.Find(lfo =>
-                    lfo.Value == LinkedFieldOptions[LinkedFieldOptionSelectedIndex].Value).Value;
-            }
-        }
    }
 }
--- a/src/App/Pages/Vault/AttachmentsPageViewModel.cs
+++ b/src/App/Pages/Vault/AttachmentsPageViewModel.cs
@@ -17,8 +17,7 @@ namespace Bit.App.Pages
        private readonly IDeviceActionService _deviceActionService;
        private readonly ICipherService _cipherService;
        private readonly ICryptoService _cryptoService;
-        private readonly IStateService _stateService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
+        private readonly IUserService _userService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private CipherView _cipher;
        private Cipher _cipherDomain;
@@ -33,8 +32,7 @@ namespace Bit.App.Pages
            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            Attachments = new ExtendedObservableCollection<AttachmentView>();
            DeleteAttachmentCommand = new Command<AttachmentView>(DeleteAsync);
            PageTitle = AppResources.Attachments;
@@ -66,7 +64,7 @@ namespace Bit.App.Pages
            Cipher = await _cipherDomain.DecryptAsync();
            LoadAttachments();
            _hasUpdatedKey = await _cryptoService.HasEncKeyAsync();
-            var canAccessPremium = await _stateService.CanAccessPremiumAsync();
+            var canAccessPremium = await _userService.CanAccessPremiumAsync();
            _canAccessAttachments = canAccessPremium || Cipher.OrganizationId != null;
            if (!_canAccessAttachments)
            {
@@ -137,11 +135,6 @@ namespace Bit.App.Pages

        public async Task ChooseFileAsync()
        {
-            // Prevent Android from locking if vault timeout set to "immediate"
-            if (Device.RuntimePlatform == Device.Android)
-            {
-                _vaultTimeoutService.DelayLockAndLogoutMs = 60000;
-            }
            await _deviceActionService.SelectFileAsync();
        }

--- a/src/App/Pages/Vault/AutofillCiphersPageViewModel.cs
+++ b/src/App/Pages/Vault/AutofillCiphersPageViewModel.cs
@@ -8,8 +8,10 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Xamarin.Forms;

@@ -86,7 +88,8 @@ namespace Bit.App.Pages

        public async Task LoadAsync()
        {
-            WebsiteIconsEnabled = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
+            WebsiteIconsEnabled = !(await _stateService.GetAsync<bool?>(Constants.DisableFaviconKey))
+                .GetValueOrDefault();
            ShowList = false;
            var groupedItems = new List<GroupingsPageListGroup>();
            var ciphers = await _cipherService.GetAllDecryptedByUrlAsync(Uri, null);
--- a/src/App/Pages/Vault/CiphersPageViewModel.cs
+++ b/src/App/Pages/Vault/CiphersPageViewModel.cs
@@ -76,7 +76,8 @@ namespace Bit.App.Pages

        public async Task InitAsync()
        {
-            WebsiteIconsEnabled = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
+            WebsiteIconsEnabled = !(await _stateService.GetAsync<bool?>(Constants.DisableFaviconKey))
+                .GetValueOrDefault();
            if (!string.IsNullOrWhiteSpace((Page as CiphersPage).SearchBar.Text))
            {
                Search((Page as CiphersPage).SearchBar.Text, 200);
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
@@ -1,13 +1,11 @@
 <?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"
-    xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
    x:Class="Bit.App.Pages.GroupingsPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
    xmlns:u="clr-namespace:Bit.App.Utilities"
    xmlns:effects="clr-namespace:Bit.App.Effects"
    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:view="clr-namespace:Bit.Core.Models.View;assembly=BitwardenCore"
    x:DataType="pages:GroupingsPageViewModel"
    Title="{Binding PageTitle}"
    x:Name="_page">
@@ -17,15 +15,6 @@
    </ContentPage.BindingContext>

    <ContentPage.ToolbarItems>
-        <controls:ExtendedToolbarItem
-            x:Name="_accountAvatar"
-            IconImageSource="{Binding AvatarImageSource}"
-            Clicked="AccountSwitch_Clicked"
-            Order="Primary"
-            Priority="-1"
-            UseOriginalImage="True"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}" />
        <ToolbarItem Icon="search.png" Clicked="Search_Clicked"
                     AutomationProperties.IsInAccessibleTree="True"
                     AutomationProperties.Name="{u:I18n Search}" />
@@ -146,8 +135,6 @@
            AbsoluteLayout.LayoutFlags="All"
            AbsoluteLayout.LayoutBounds="0, 0, 1, 1">
        </ContentView>
-        
-        <!-- Android FAB -->
        <Button
            x:Name="_fab"
            Image="plus.png"
@@ -161,40 +148,6 @@
                <effects:FabShadowEffect />
            </Button.Effects>
        </Button>
-
-        <!-- Account Switching Overlay -->
-        <ContentView
-            x:Name="_accountListOverlay"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
-            AbsoluteLayout.LayoutFlags="All"
-            IsVisible="False"
-            BackgroundColor="#22000000"
-            Padding="0">
-
-            <StackLayout
-                x:Name="_accountListContainer"
-                VerticalOptions="StartAndExpand"
-                HorizontalOptions="FillAndExpand"
-                BackgroundColor="{DynamicResource BackgroundColor}"
-                xct:ShadowEffect.Color="Black"
-                xct:ShadowEffect.Radius="10"
-                xct:ShadowEffect.OffsetY="3">
-                <ListView
-                    x:Name="_accountListView"
-                    ItemsSource="{Binding AccountViews}"
-                    ItemSelected="AccountRow_Selected"
-                    BackgroundColor="Transparent"
-                    VerticalOptions="FillAndExpand"
-                    RowHeight="60">
-                    <ListView.ItemTemplate>
-                        <DataTemplate x:DataType="view:AccountView">
-                            <controls:AccountViewCell
-                                Account="{Binding .}" />
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
-            </StackLayout>
-        </ContentView>
    </AbsoluteLayout>

 </pages:BaseContentPage>
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
@@ -1,5 +1,7 @@
 using Bit.App.Abstractions;
+using Bit.App.Models;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
@@ -7,7 +9,6 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Bit.App.Controls;
-using Bit.Core.Models.Data;
 using Xamarin.Forms;

 namespace Bit.App.Pages
@@ -17,7 +18,7 @@ namespace Bit.App.Pages
        private readonly IBroadcasterService _broadcasterService;
        private readonly ISyncService _syncService;
        private readonly IPushNotificationService _pushNotificationService;
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
        private readonly IVaultTimeoutService _vaultTimeoutService;
        private readonly ICipherService _cipherService;
        private readonly IDeviceActionService _deviceActionService;
@@ -36,7 +37,7 @@ namespace Bit.App.Pages
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
            _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
@@ -69,10 +70,6 @@ namespace Bit.App.Pages
                _absLayout.Children.Remove(_fab);
                ToolbarItems.Remove(_addItem);
            }
-            if (!mainPage)
-            {
-                ToolbarItems.Remove(_accountAvatar);
-            }
        }

        protected async override void OnAppearing()
@@ -83,11 +80,6 @@ namespace Bit.App.Pages
                IsBusy = true;
            }

-            if (_vm.MainPage)
-            {
-                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-            }
-
            _broadcasterService.Subscribe(_pageName, async (message) =>
            {
                if (message.Command == "syncStarted")
@@ -108,7 +100,7 @@ namespace Bit.App.Pages
                }
            });

-            var migratedFromV1 = await _stateService.GetMigratedFromV1Async();
+            var migratedFromV1 = await _storageService.GetAsync<bool?>(Constants.MigratedFromV1);
            await LoadOnAppearedAsync(_mainLayout, false, async () =>
            {
                if (!_syncService.SyncInProgress || (await _cipherService.GetAllAsync()).Any())
@@ -136,10 +128,10 @@ namespace Bit.App.Pages
                    !_vm.HasCiphers &&
                    Xamarin.Essentials.Connectivity.NetworkAccess != Xamarin.Essentials.NetworkAccess.None)
                {
-                    var triedV1ReSync = await _stateService.GetTriedV1ResyncAsync();
+                    var triedV1ReSync = await _storageService.GetAsync<bool?>(Constants.TriedV1Resync);
                    if (!triedV1ReSync.GetValueOrDefault())
                    {
-                        await _stateService.SetTriedV1ResyncAsync(true);
+                        await _storageService.SaveAsync(Constants.TriedV1Resync, true);
                        await _syncService.FullSyncAsync(true);
                    }
                }
@@ -153,14 +145,14 @@ namespace Bit.App.Pages
            }

            // Push registration
-            var lastPushRegistration = await _stateService.GetPushLastRegistrationDateAsync();
+            var lastPushRegistration = await _storageService.GetAsync<DateTime?>(Constants.PushLastRegistrationDateKey);
            lastPushRegistration = lastPushRegistration.GetValueOrDefault(DateTime.MinValue);
            if (Device.RuntimePlatform == Device.iOS)
            {
-                var pushPromptShow = await _stateService.GetPushInitialPromptShownAsync();
+                var pushPromptShow = await _storageService.GetAsync<bool?>(Constants.PushInitialPromptShownKey);
                if (!pushPromptShow.GetValueOrDefault(false))
                {
-                    await _stateService.SetPushInitialPromptShownAsync(true);
+                    await _storageService.SaveAsync(Constants.PushInitialPromptShownKey, true);
                    await DisplayAlert(AppResources.EnableAutomaticSyncing, AppResources.PushNotificationAlert,
                        AppResources.OkGotIt);
                }
@@ -181,8 +173,8 @@ namespace Bit.App.Pages
                {
                    if (migratedFromV1.GetValueOrDefault())
                    {
-                        var migratedFromV1AutofillPromptShown = 
-                            await _stateService.GetMigratedFromV1AutofillPromptShownAsync();
+                        var migratedFromV1AutofillPromptShown = await _storageService.GetAsync<bool?>(
+                            Constants.MigratedFromV1AutofillPromptShown);
                        if (!migratedFromV1AutofillPromptShown.GetValueOrDefault())
                        {
                            await DisplayAlert(AppResources.Autofill,
@@ -190,7 +182,7 @@ namespace Bit.App.Pages
                        }
                    }
                }
-                await _stateService.SetMigratedFromV1AutofillPromptShownAsync(true);
+                await _storageService.SaveAsync(Constants.MigratedFromV1AutofillPromptShown, true);
            }
        }

@@ -292,24 +284,5 @@ namespace Bit.App.Pages
            _addItem.IsEnabled = !_vm.Deleted;
            _addItem.IconImageSource = _vm.Deleted ? null : "plus.png";
        }
-
-        private async void AccountSwitch_Clicked(object sender, EventArgs e)
-        {
-            
-            if (_accountListOverlay.IsVisible)
-            {
-                await ShowAccountListAsync(false, _accountListContainer, _accountListOverlay, _fab);
-            }
-            else
-            {
-                await RefreshAccountViewsAsync(_accountListView, true);
-                await ShowAccountListAsync(true, _accountListContainer, _accountListOverlay, _fab);
-            }
-        }
-
-        private async void AccountRow_Selected(object sender, SelectedItemChangedEventArgs e)
-        {
-            await AccountRowSelectedAsync(sender, e, _accountListContainer, _accountListOverlay, _fab);
-        }
    }
 }
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
@@ -1,6 +1,7 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.App.Utilities;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
@@ -10,7 +11,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Bit.Core;
 using Xamarin.Forms;

 namespace Bit.App.Pages
@@ -39,11 +39,13 @@ namespace Bit.App.Pages
        private readonly IFolderService _folderService;
        private readonly ICollectionService _collectionService;
        private readonly ISyncService _syncService;
+        private readonly IUserService _userService;
        private readonly IVaultTimeoutService _vaultTimeoutService;
        private readonly IDeviceActionService _deviceActionService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly IMessagingService _messagingService;
        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
        private readonly IPasswordRepromptService _passwordRepromptService;

        public GroupingsPageViewModel()
@@ -52,11 +54,13 @@ namespace Bit.App.Pages
            _folderService = ServiceContainer.Resolve<IFolderService>("folderService");
            _collectionService = ServiceContainer.Resolve<ICollectionService>("collectionService");
            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
            _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");

            Loading = true;
@@ -76,6 +80,7 @@ namespace Bit.App.Pages
        public string CollectionId { get; set; }
        public Func<CipherView, bool> Filter { get; set; }
        public bool Deleted { get; set; }
+
        public bool HasCiphers { get; set; }
        public bool HasFolders { get; set; }
        public bool HasCollections { get; set; }
@@ -134,11 +139,6 @@ namespace Bit.App.Pages
            get => _websiteIconsEnabled;
            set => SetProperty(ref _websiteIconsEnabled, value);
        }
-        public ExtendedObservableCollection<AccountView> AccountViews
-        {
-            get => _stateService.AccountViews;
-        }
-
        public ExtendedObservableCollection<GroupingsPageListGroup> GroupedItems { get; set; }
        public Command RefreshCommand { get; set; }
        public Command<CipherView> CipherOptionsCommand { get; set; }
@@ -150,7 +150,7 @@ namespace Bit.App.Pages
            {
                return;
            }
-            var authed = await _stateService.IsAuthenticatedAsync();
+            var authed = await _userService.IsAuthenticatedAsync();
            if (!authed)
            {
                return;
@@ -159,7 +159,7 @@ namespace Bit.App.Pages
            {
                return;
            }
-            if (await _stateService.GetSyncOnRefreshAsync() && Refreshing && !SyncRefreshing)
+            if (await _storageService.GetAsync<bool>(Constants.SyncOnRefreshKey) && Refreshing && !SyncRefreshing)
            {
                SyncRefreshing = true;
                await _syncService.FullSyncAsync(false);
@@ -175,7 +175,8 @@ namespace Bit.App.Pages
            var groupedItems = new List<GroupingsPageListGroup>();
            var page = Page as GroupingsPage;

-            WebsiteIconsEnabled = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
+            WebsiteIconsEnabled = !(await _stateService.GetAsync<bool?>(Constants.DisableFaviconKey))
+                .GetValueOrDefault();
            try
            {
                await LoadDataAsync();
--- a/src/App/Pages/Vault/PasswordHistoryPageViewModel.cs
+++ b/src/App/Pages/Vault/PasswordHistoryPageViewModel.cs
@@ -12,7 +12,6 @@ namespace Bit.App.Pages
    {
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly ICipherService _cipherService;
-        private readonly IClipboardService _clipboardService;

        private bool _showNoData;

@@ -20,7 +19,6 @@ namespace Bit.App.Pages
        {
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
-            _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");

            PageTitle = AppResources.PasswordHistory;
            History = new ExtendedObservableCollection<PasswordHistoryView>();
@@ -47,7 +45,7 @@ namespace Bit.App.Pages

        private async void CopyAsync(PasswordHistoryView ph)
        {
-            await _clipboardService.CopyTextAsync(ph.Password);
+            await _platformUtilsService.CopyToClipboardAsync(ph.Password);
            _platformUtilsService.ShowToast("info", null,
                string.Format(AppResources.ValueHasBeenCopied, AppResources.Password));
        }
--- a/src/App/Pages/Vault/SharePageViewModel.cs
+++ b/src/App/Pages/Vault/SharePageViewModel.cs
@@ -16,7 +16,7 @@ namespace Bit.App.Pages
        private readonly IDeviceActionService _deviceActionService;
        private readonly ICipherService _cipherService;
        private readonly ICollectionService _collectionService;
-        private readonly IOrganizationService _organizationService;
+        private readonly IUserService _userService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private CipherView _cipher;
        private int _organizationSelectedIndex;
@@ -28,7 +28,7 @@ namespace Bit.App.Pages
        {
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
-            _organizationService = ServiceContainer.Resolve<IOrganizationService>("organizationService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _collectionService = ServiceContainer.Resolve<ICollectionService>("collectionService");
            Collections = new ExtendedObservableCollection<CollectionViewModel>();
@@ -67,7 +67,7 @@ namespace Bit.App.Pages
            var allCollections = await _collectionService.GetAllDecryptedAsync();
            _writeableCollections = allCollections.Where(c => !c.ReadOnly).ToList();

-            var orgs = await _organizationService.GetAllAsync();
+            var orgs = await _userService.GetAllOrganizationAsync();
            OrganizationOptions = orgs.OrderBy(o => o.Name)
                .Where(o => o.Enabled && o.Status == OrganizationUserStatusType.Confirmed)
                .Select(o => new KeyValuePair<string, string>(o.Name, o.Id)).ToList();
@@ -110,7 +110,7 @@ namespace Bit.App.Pages
                await _cipherService.ShareWithServerAsync(cipherView, OrganizationId, checkedCollectionIds);
                await _deviceActionService.HideLoadingAsync();
                var movedItemToOrgText = string.Format(AppResources.MovedItemToOrg, cipherView.Name,
-                   (await _organizationService.GetAsync(OrganizationId)).Name);
+                   (await _userService.GetOrganizationAsync(OrganizationId)).Name);
                _platformUtilsService.ShowToast("success", null, movedItemToOrgText);
                await Page.Navigation.PopModalAsync();
                return true;
--- a/src/App/Pages/Vault/ViewPage.xaml
+++ b/src/App/Pages/Vault/ViewPage.xaml
@@ -561,12 +561,6 @@
                                                Grid.Row="1"
                                                Grid.Column="0"
                                                IsVisible="{Binding IsTextType}" />
-                                           <controls:FaLabel
-                                                Text="{Binding ValueText, Mode=OneWay}"
-                                                StyleClass="box-value"
-                                                Grid.Row="1"
-                                                Grid.Column="0"
-                                                IsVisible="{Binding IsLinkedType}" />
                                            <controls:FaLabel
                                                Text="{Binding ValueText, Mode=OneWay}"
                                                StyleClass="box-value"
--- a/src/App/Pages/Vault/ViewPageViewModel.cs
+++ b/src/App/Pages/Vault/ViewPageViewModel.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
@@ -10,6 +6,10 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Xamarin.Forms;

 namespace Bit.App.Pages
@@ -18,7 +18,7 @@ namespace Bit.App.Pages
    {
        private readonly IDeviceActionService _deviceActionService;
        private readonly ICipherService _cipherService;
-        private readonly IStateService _stateService;
+        private readonly IUserService _userService;
        private readonly ITotpService _totpService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly IAuditService _auditService;
@@ -26,8 +26,6 @@ namespace Bit.App.Pages
        private readonly IEventService _eventService;
        private readonly IPasswordRepromptService _passwordRepromptService;
        private readonly ILocalizeService _localizeService;
-        private readonly IClipboardService _clipboardService;
-
        private CipherView _cipher;
        private List<ViewPageFieldViewModel> _fields;
        private bool _canAccessPremium;
@@ -48,7 +46,7 @@ namespace Bit.App.Pages
        {
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _auditService = ServiceContainer.Resolve<IAuditService>("auditService");
@@ -56,8 +54,6 @@ namespace Bit.App.Pages
            _eventService = ServiceContainer.Resolve<IEventService>("eventService");
            _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
            _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");
-            _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
-
            CopyCommand = new Command<string>((id) => CopyAsync(id, null));
            CopyUriCommand = new Command<LoginUriView>(CopyUri);
            CopyFieldCommand = new Command<FieldView>(CopyField);
@@ -248,7 +244,7 @@ namespace Bit.App.Pages
                return false;
            }
            Cipher = await cipher.DecryptAsync();
-            CanAccessPremium = await _stateService.CanAccessPremiumAsync();
+            CanAccessPremium = await _userService.CanAccessPremiumAsync();
            Fields = Cipher.Fields?.Select(f => new ViewPageFieldViewModel(this, Cipher, f)).ToList();

            if (Cipher.Type == Core.Enums.CipherType.Login && !string.IsNullOrWhiteSpace(Cipher.Login.Totp) &&
@@ -657,7 +653,7 @@ namespace Bit.App.Pages

            if (text != null)
            {
-                await _clipboardService.CopyTextAsync(text);
+                await _platformUtilsService.CopyToClipboardAsync(text);
                if (!string.IsNullOrWhiteSpace(name))
                {
                    _platformUtilsService.ShowToast("info", null, string.Format(AppResources.ValueHasBeenCopied, name));
@@ -708,7 +704,6 @@ namespace Bit.App.Pages

    public class ViewPageFieldViewModel : ExtendedViewModel
    {
-        private II18nService _i18nService;
        private ViewPageViewModel _vm;
        private FieldView _field;
        private CipherView _cipher;
@@ -716,7 +711,6 @@ namespace Bit.App.Pages

        public ViewPageFieldViewModel(ViewPageViewModel vm, CipherView cipher, FieldView field)
        {
-            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
            _vm = vm;
            _cipher = cipher;
            Field = field;
@@ -747,38 +741,16 @@ namespace Bit.App.Pages
                });
        }

-        public string ValueText
-        {
-            get
-            {
-                if (IsBooleanType)
-                {
-                    return _field.Value == "true" ? "" : "";
-                }
-                else if (IsLinkedType)
-                {
-                    var i18nKey = _cipher.LinkedFieldI18nKey(Field.LinkedId.GetValueOrDefault());
-                    return " " + _i18nService.T(i18nKey);
-                }
-                else
-                {
-                    return _field.Value;
-                }
-            }
-        }
-
        public Command ToggleHiddenValueCommand { get; set; }

+        public string ValueText => IsBooleanType ? (_field.Value == "true" ? "" : "") : _field.Value;
        public string ShowHiddenValueIcon => _showHiddenValue ? "" : "";
        public bool IsTextType => _field.Type == Core.Enums.FieldType.Text;
        public bool IsBooleanType => _field.Type == Core.Enums.FieldType.Boolean;
        public bool IsHiddenType => _field.Type == Core.Enums.FieldType.Hidden;
-        public bool IsLinkedType => _field.Type == Core.Enums.FieldType.Linked;
        public bool ShowViewHidden => IsHiddenType && _cipher.ViewPassword;
        public bool ShowCopyButton => _field.Type != Core.Enums.FieldType.Boolean &&
-            !string.IsNullOrWhiteSpace(_field.Value) &&
-            !(IsHiddenType && !_cipher.ViewPassword) &&
-            _field.Type != FieldType.Linked;
+            !string.IsNullOrWhiteSpace(_field.Value) && !(IsHiddenType && !_cipher.ViewPassword);

        public async void ToggleHiddenValue()
        {
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -10,10 +9,9 @@

 namespace Bit.App.Resources {
    using System;
-    using System.Reflection;
    
    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    public class AppResources {
@@ -1781,12 +1779,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        public static string FullName {
-            get {
-                return ResourceManager.GetString("FullName", resourceCulture);
-            }
-        }
-        
        public static string LicenseNumber {
            get {
                return ResourceManager.GetString("LicenseNumber", resourceCulture);
@@ -2033,12 +2025,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        public static string FieldTypeLinked {
-            get {
-                return ResourceManager.GetString("FieldTypeLinked", resourceCulture);
-            }
-        }
-        
        public static string FieldTypeText {
            get {
                return ResourceManager.GetString("FieldTypeText", resourceCulture);
@@ -2543,12 +2529,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        public static string UnlockVault {
-            get {
-                return ResourceManager.GetString("UnlockVault", resourceCulture);
-            }
-        }
-        
        public static string ThirtyMinutes {
            get {
                return ResourceManager.GetString("ThirtyMinutes", resourceCulture);
@@ -2579,12 +2559,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        public static string VaultLockedIdentity {
-            get {
-                return ResourceManager.GetString("VaultLockedIdentity", resourceCulture);
-            }
-        }
-        
        public static string Dark {
            get {
                return ResourceManager.GetString("Dark", resourceCulture);
@@ -2849,24 +2823,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        public static string SendVerificationCodeToEmail {
-            get {
-                return ResourceManager.GetString("SendVerificationCodeToEmail", resourceCulture);
-            }
-        }
-        
-        public static string CodeSent {
-            get {
-                return ResourceManager.GetString("CodeSent", resourceCulture);
-            }
-        }
-        
-        public static string ConfirmYourIdentity {
-            get {
-                return ResourceManager.GetString("ConfirmYourIdentity", resourceCulture);
-            }
-        }
-        
        public static string ExportVaultWarning {
            get {
                return ResourceManager.GetString("ExportVaultWarning", resourceCulture);
@@ -3629,36 +3585,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        public static string RemoveMasterPassword {
-            get {
-                return ResourceManager.GetString("RemoveMasterPassword", resourceCulture);
-            }
-        }
-        
-        public static string RemoveMasterPasswordWarning {
-            get {
-                return ResourceManager.GetString("RemoveMasterPasswordWarning", resourceCulture);
-            }
-        }
-        
-        public static string RemoveMasterPasswordWarning2 {
-            get {
-                return ResourceManager.GetString("RemoveMasterPasswordWarning2", resourceCulture);
-            }
-        }
-        
-        public static string LeaveOrganization {
-            get {
-                return ResourceManager.GetString("LeaveOrganization", resourceCulture);
-            }
-        }
-        
-        public static string LeaveOrganizationName {
-            get {
-                return ResourceManager.GetString("LeaveOrganizationName", resourceCulture);
-            }
-        }
-        
        public static string Fido2Title {
            get {
                return ResourceManager.GetString("Fido2Title", resourceCulture);
@@ -3718,53 +3644,5 @@ namespace Bit.App.Resources {
                return ResourceManager.GetString("DisablePersonalVaultExportPolicyInEffect", resourceCulture);
            }
        }
-        
-        public static string DeleteAccount {
-            get {
-                return ResourceManager.GetString("DeleteAccount", resourceCulture);
-            }
-        }
-        
-        public static string DeletingYourAccountIsPermanent {
-            get {
-                return ResourceManager.GetString("DeletingYourAccountIsPermanent", resourceCulture);
-            }
-        }
-        
-        public static string DeleteAccountExplanation {
-            get {
-                return ResourceManager.GetString("DeleteAccountExplanation", resourceCulture);
-            }
-        }
-        
-        public static string DeletingYourAccount {
-            get {
-                return ResourceManager.GetString("DeletingYourAccount", resourceCulture);
-            }
-        }
-        
-        public static string YourAccountHasBeenPermanentlyDeleted {
-            get {
-                return ResourceManager.GetString("YourAccountHasBeenPermanentlyDeleted", resourceCulture);
-            }
-        }
-        
-        public static string InvalidVerificationCode {
-            get {
-                return ResourceManager.GetString("InvalidVerificationCode", resourceCulture);
-            }
-        }
-        
-        public static string SendCode {
-            get {
-                return ResourceManager.GetString("SendCode", resourceCulture);
-            }
-        }
-        
-        public static string Sending {
-            get {
-                return ResourceManager.GetString("Sending", resourceCulture);
-            }
-        }
    }
 }
--- a/src/App/Resources/AppResources.af.resx
+++ b/src/App/Resources/AppResources.af.resx
@@ -1059,9 +1059,6 @@
  <data name="LastName" xml:space="preserve">
    <value>Van</value>
  </data>
-  <data name="FullName" xml:space="preserve">
-    <value>Volle naam</value>
-  </data>
  <data name="LicenseNumber" xml:space="preserve">
    <value>Lisensienommer</value>
  </data>
@@ -1186,9 +1183,6 @@
  <data name="FieldTypeHidden" xml:space="preserve">
    <value>Versteek</value>
  </data>
-  <data name="FieldTypeLinked" xml:space="preserve">
-    <value>Gekoppel</value>
-  </data>
  <data name="FieldTypeText" xml:space="preserve">
    <value>Teks</value>
  </data>
@@ -1455,9 +1449,6 @@
  <data name="Unlock" xml:space="preserve">
    <value>Ontgrendel</value>
  </data>
-  <data name="UnlockVault" xml:space="preserve">
-    <value>Ontgrendel kluis</value>
-  </data>
  <data name="ThirtyMinutes" xml:space="preserve">
    <value>30 minute</value>
  </data>
@@ -1474,9 +1465,6 @@
  <data name="VaultLockedPIN" xml:space="preserve">
    <value>U kluis is vergrendel. Verifieer u PIN-kode om voort te gaan.</value>
  </data>
-  <data name="VaultLockedIdentity" xml:space="preserve">
-    <value>U kluis is vergrendel. Bevestig u identiteit om voort te gaan.</value>
-  </data>
  <data name="Dark" xml:space="preserve">
    <value>Donker</value>
    <comment>A dark color</comment>
@@ -1617,15 +1605,6 @@
  <data name="ExportVaultMasterPasswordDescription" xml:space="preserve">
    <value>Voer u hoofwagwoord in om u kluisdata uit te stuur.</value>
  </data>
-  <data name="SendVerificationCodeToEmail" xml:space="preserve">
-    <value>Stuur ’n bevestigingskode na u e-pos</value>
-  </data>
-  <data name="CodeSent" xml:space="preserve">
-    <value>Kode verstuur!</value>
-  </data>
-  <data name="ConfirmYourIdentity" xml:space="preserve">
-    <value>Bevestig u identiteit om voort te gaan.</value>
-  </data>
  <data name="ExportVaultWarning" xml:space="preserve">
    <value>Hierdie uitstuur bevat u kluisdata in ’n ongeënkripteerde formaat. U behoort dit nie oor onbeveiligde kanale (soos e-pos) te bewaar of verstuur nie. Skrap dit sodra u dit klaar gebruik het.</value>
  </data>
@@ -2047,21 +2026,6 @@
  <data name="UpdatePasswordError" xml:space="preserve">
    <value>Kan nie tans u wagwoord bywerk nie</value>
  </data>
-  <data name="RemoveMasterPassword" xml:space="preserve">
-    <value>Verwyder hoofwagwoord</value>
-  </data>
-  <data name="RemoveMasterPasswordWarning" xml:space="preserve">
-    <value>{0} gebruik SSO met klantbestuurde enkripsie. Deur voort te gaan word u hoofwagwoord van u rekening verwyder en word SSO vereis om aan te teken.</value>
-  </data>
-  <data name="RemoveMasterPasswordWarning2" xml:space="preserve">
-    <value>Indien u nie u hoofwagwoord wil verwyder nie, kan u hierdie organisasie verlaat.</value>
-  </data>
-  <data name="LeaveOrganization" xml:space="preserve">
-    <value>Verlaat organisasie</value>
-  </data>
-  <data name="LeaveOrganizationName" xml:space="preserve">
-    <value>Verlaat {0}?</value>
-  </data>
  <data name="Fido2Title" xml:space="preserve">
    <value>FIDO2 WebAuthn</value>
  </data>
@@ -2092,28 +2056,4 @@
  <data name="DisablePersonalVaultExportPolicyInEffect">
    <value>Een of meer organisasiebeleide verhoed u om u persoonlike kluis uit te stuur.</value>
  </data>
-  <data name="DeleteAccount" xml:space="preserve">
-    <value>Skrap rekening</value>
-  </data>
-  <data name="DeletingYourAccountIsPermanent" xml:space="preserve">
-    <value>Die skrap van u rekening is permanent</value>
-  </data>
-  <data name="DeleteAccountExplanation" xml:space="preserve">
-    <value>U rekening en alle bybehorende data sal geskrap en onherwinbaar word. Is u seker u wil voortgaan?</value>
-  </data>
-  <data name="DeletingYourAccount" xml:space="preserve">
-    <value>U rekening word geskrap</value>
-  </data>
-  <data name="YourAccountHasBeenPermanentlyDeleted" xml:space="preserve">
-    <value>U rekening is permanent geskrap</value>
-  </data>
-  <data name="InvalidVerificationCode" xml:space="preserve">
-    <value>Ongeldige bevestigingskode.</value>
-  </data>
-  <data name="SendCode" xml:space="preserve">
-    <value>Verstuur kode</value>
-  </data>
-  <data name="Sending" xml:space="preserve">
-    <value>Verstuur</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.az.resx
+++ b/src/App/Resources/AppResources.az.resx
@@ -1059,9 +1059,6 @@
  <data name="LastName" xml:space="preserve">
    <value>Soyad</value>
  </data>
-  <data name="FullName" xml:space="preserve">
-    <value>Tam ad</value>
-  </data>
  <data name="LicenseNumber" xml:space="preserve">
    <value>Lisenziya nömrəsi</value>
  </data>
@@ -1186,9 +1183,6 @@
  <data name="FieldTypeHidden" xml:space="preserve">
    <value>Gizli</value>
  </data>
-  <data name="FieldTypeLinked" xml:space="preserve">
-    <value>Əlaqə yaradıldı</value>
-  </data>
  <data name="FieldTypeText" xml:space="preserve">
    <value>Mətn</value>
  </data>
@@ -1455,9 +1449,6 @@
  <data name="Unlock" xml:space="preserve">
    <value>Kilidi aç</value>
  </data>
-  <data name="UnlockVault" xml:space="preserve">
-    <value>Anbar kilidini aç</value>
-  </data>
  <data name="ThirtyMinutes" xml:space="preserve">
    <value>30 dəqiqə</value>
  </data>
@@ -1474,9 +1465,6 @@
  <data name="VaultLockedPIN" xml:space="preserve">
    <value>Anbarınız kilidlənib. Davam etmək üçün PIN kodunuzu təsdiqləyin.</value>
  </data>
-  <data name="VaultLockedIdentity" xml:space="preserve">
-    <value>Anbarınız kilidlənib. Davam etmək üçün kimliyinizi təsdiqləyin.</value>
-  </data>
  <data name="Dark" xml:space="preserve">
    <value>Tünd</value>
    <comment>A dark color</comment>
@@ -1617,15 +1605,6 @@
  <data name="ExportVaultMasterPasswordDescription" xml:space="preserve">
    <value>Anbar verilənlərinizi ixrac etmək üçün ana parolunuzu daxil edin.</value>
  </data>
-  <data name="SendVerificationCodeToEmail" xml:space="preserve">
-    <value>E-poçtunuza bir təsdiqləmə kodu göndərin</value>
-  </data>
-  <data name="CodeSent" xml:space="preserve">
-    <value>Kod göndərildi!</value>
-  </data>
-  <data name="ConfirmYourIdentity" xml:space="preserve">
-    <value>Davam etmək üçün kimliyinizi təsdiqləyin.</value>
-  </data>
  <data name="ExportVaultWarning" xml:space="preserve">
    <value>Bu ixrac faylındakı anbar verilənləriniz şifrələnməmiş formatdadır. İxrac edilən faylı saxlamamalı və etibarsız yollarla (e-poçt kimi) göndərməməlisiniz. Bu faylı işiniz bitdikdən sonra dərhal silin.</value>
  </data>
@@ -2047,21 +2026,6 @@
  <data name="UpdatePasswordError" xml:space="preserve">
    <value>Hazırda parol yenilənə bilmir</value>
  </data>
-  <data name="RemoveMasterPassword" xml:space="preserve">
-    <value>Ana parolu sil</value>
-  </data>
-  <data name="RemoveMasterPasswordWarning" xml:space="preserve">
-    <value>{0} müştəri tərəfindən idarə edilən şifrələmə ilə SSO istifadə edir. Davam etsəniz, Ana Parol hesabınızdan silinəcək və giriş etmək üçün SSO tələb olunacaq.</value>
-  </data>
-  <data name="RemoveMasterPasswordWarning2" xml:space="preserve">
-    <value>Ana Parolu silmək istəmirsinizsə, bu təşkilatı tərk edə bilərsiniz.</value>
-  </data>
-  <data name="LeaveOrganization" xml:space="preserve">
-    <value>Təşkilatı tərk et</value>
-  </data>
-  <data name="LeaveOrganizationName" xml:space="preserve">
-    <value>{0} tərk edilsin?</value>
-  </data>
  <data name="Fido2Title" xml:space="preserve">
    <value>FIDO2 WebAuthn</value>
  </data>
@@ -2092,28 +2056,4 @@
  <data name="DisablePersonalVaultExportPolicyInEffect">
    <value>Bir və ya daha çox təşkilat siyasəti, fərdi anbarınızı ixrac etməyinizin qarşısını alır.</value>
  </data>
-  <data name="DeleteAccount" xml:space="preserve">
-    <value>Hesabı sil</value>
-  </data>
-  <data name="DeletingYourAccountIsPermanent" xml:space="preserve">
-    <value>Hesabınız birdəfəlik silinəcək</value>
-  </data>
-  <data name="DeleteAccountExplanation" xml:space="preserve">
-    <value>Hesabınız və əlaqəli bütün verilənlər silinəcək və bərpa oluna bilməyəcək. Davam etmək istədiyinizə əminsiniz?</value>
-  </data>
-  <data name="DeletingYourAccount" xml:space="preserve">
-    <value>Hesabınız silinir</value>
-  </data>
-  <data name="YourAccountHasBeenPermanentlyDeleted" xml:space="preserve">
-    <value>Hesabınız birdəfəlik silindi</value>
-  </data>
-  <data name="InvalidVerificationCode" xml:space="preserve">
-    <value>Etibarsız təsdiqləmə kodu</value>
-  </data>
-  <data name="SendCode" xml:space="preserve">
-    <value>Kod göndər</value>
-  </data>
-  <data name="Sending" xml:space="preserve">
-    <value>Göndərilir</value>
-  </data>
 </root>
--- a/Show More
+++ b/Show More