Bump version to 2.26.0 (#1452 )

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit 3a0c34b934)
Bump version to 1.26.0 (#1450 )
2025-12-06 00:03:28 +00:00 · 2022-02-08 15:55:22 -07:00 · 2022-02-08 14:48:54 -07:00 · 2022-02-07 12:11:10 -05:00 · 2022-02-07 12:29:01 +01:00 · 2022-02-04 17:02:09 -05:00
233 changed files with 6970 additions and 2515 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
    outputs:
      release_version: ${{ steps.version.outputs.package }}
      tag_version: ${{ steps.version.outputs.tag }}
-      branch-name: ${{ steps.branch.outputs.branch-name }}
+      branch_name: ${{ steps.branch.outputs.branch_name }}
    steps:
      - name: Branch check
        run: |
@@ -55,14 +55,14 @@ jobs:
        id: branch
        run: |
          BRANCH_NAME=$(basename ${{ github.ref }})
-          echo "::set-output name=branch-name::$BRANCH_NAME"
+          echo "::set-output name=branch_name::$BRANCH_NAME"

  self-host:
    name: Release self-host docker
    runs-on: ubuntu-20.04
    needs: setup
    env:
-      _BRANCH_NAME: ${{ needs.setup.outputs.branch-name }}
+      _BRANCH_NAME: ${{ needs.setup.outputs.branch_name }}
      _RELEASE_VERSION: ${{ needs.setup.outputs.release_version }}
    steps:
      - name: Print environment
@@ -139,7 +139,7 @@ jobs:
        with:
          workflow: build.yml
          workflow_conclusion: success
-          branch: ${{ needs.setup.outputs.branch-name }}
+          branch: ${{ needs.setup.outputs.branch_name }}
          artifacts: web-*-cloud-COMMERCIAL.zip

      # This should result in a build directory in the current working directory
@@ -179,7 +179,7 @@ jobs:
        with:
          workflow: build.yml
          workflow_conclusion: success
-          branch: ${{ needs.setup.outputs.branch-name }}
+          branch: ${{ needs.setup.outputs.branch_name }}
          artifacts: "web-*-selfhosted-COMMERCIAL.zip,
            web-*-selfhosted-open-source.zip"

--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -27,13 +27,13 @@ jobs:
          ref: version_bump_${{ github.event.inputs.version_number }}

      - name: Bump Version - package.json
-        uses: bitwarden/gh-actions/version-bump@0c263b3963211ccaf5804313c3b3a0bcc52d4b19
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./package.json"

      - name: Bump Version - package-lock.json
-        uses: bitwarden/gh-actions/version-bump@0c263b3963211ccaf5804313c3b3a0bcc52d4b19
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./package-lock.json"
--- a/.prettierignore
+++ b/.prettierignore
@@ -7,7 +7,6 @@ jslib
 # External libraries / auto synced locales
 src/locales
 src/404/*.min.css
-src/scripts/u2f.js

 # Github Workflows
 .github/workflows
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM bitwarden/server
+FROM bitwarden/server:dev

 LABEL com.bitwarden.product="bitwarden"

--- a/bitwarden_license/src/app/organizations/manage/sso.component.html
+++ b/bitwarden_license/src/app/organizations/manage/sso.component.html
@@ -3,7 +3,11 @@
 </div>

 <ng-container *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>

@@ -67,9 +71,9 @@
          target="_blank"
          rel="noopener"
          appA11yTitle="{{ 'learnMore' | i18n }}"
-          href="https://bitwarden.com/help/article/about-key-connector/"
+          href="https://bitwarden.com/help/about-key-connector/"
        >
-          <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+          <i class="bwi bwi-question-circle" aria-hidden="true"></i>
        </a>
        <small>{{ "memberDecryptionKeyConnectorDesc" | i18n }}</small>
      </label>
@@ -98,7 +102,7 @@
            [disabled]="!enableTestKeyConnector"
          >
            <i
-              class="fa fa-spinner fa-spin"
+              class="bwi bwi-spinner bwi-spin"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
              *ngIf="keyConnectorUrl.pending"
@@ -111,11 +115,11 @@
      </div>
      <ng-container *ngIf="keyConnectorUrl.pristine && !keyConnectorUrl.pending">
        <div class="text-danger" *ngIf="keyConnectorUrl.hasError('invalidUrl')" role="alert">
-          <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+          <i class="bwi bwi-exclamation-circle" aria-hidden="true"></i>
          {{ "keyConnectorTestFail" | i18n }}
        </div>
        <div class="text-success" *ngIf="!keyConnectorUrl.hasError('invalidUrl')" role="alert">
-          <i class="fa fa-check-circle-o" aria-hidden="true"></i>
+          <i class="bwi bwi-check-circle" aria-hidden="true"></i>
          {{ "keyConnectorTestSuccess" | i18n }}
        </div>
      </ng-container>
@@ -146,7 +150,7 @@
              appA11yTitle="{{ 'copyValue' | i18n }}"
              (click)="copy(callbackPath)"
            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
            </button>
          </div>
        </div>
@@ -162,7 +166,7 @@
              appA11yTitle="{{ 'copyValue' | i18n }}"
              (click)="copy(signedOutCallbackPath)"
            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
            </button>
          </div>
        </div>
@@ -261,7 +265,7 @@
              appA11yTitle="{{ 'copyValue' | i18n }}"
              (click)="copy(spEntityId)"
            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
            </button>
          </div>
        </div>
@@ -277,7 +281,7 @@
              appA11yTitle="{{ 'launch' | i18n }}"
              (click)="launchUri(spMetadataUrl)"
            >
-              <i class="fa fa-lg fa-external-link" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-external-link" aria-hidden="true"></i>
            </button>
            <button
              type="button"
@@ -285,7 +289,7 @@
              appA11yTitle="{{ 'copyValue' | i18n }}"
              (click)="copy(spMetadataUrl)"
            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
            </button>
          </div>
        </div>
@@ -301,7 +305,7 @@
              appA11yTitle="{{ 'copyValue' | i18n }}"
              (click)="copy(spAcsUrl)"
            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
            </button>
          </div>
        </div>
@@ -309,15 +313,15 @@
      <div class="form-group">
        <label for="spNameIdFormat">{{ "spNameIdFormat" | i18n }}</label>
        <select class="form-control" formControlName="spNameIdFormat" id="spNameIdFormat">
-          <option value="0">Not Configured</option>
-          <option value="1">Unspecified</option>
-          <option value="2">Email Address</option>
-          <option value="3">X.509 Subject Name</option>
-          <option value="4">Windows Domain Qualified Name</option>
-          <option value="5">Kerberos Principal Name</option>
-          <option value="6">Entity Identifier</option>
-          <option value="7">Persistent</option>
-          <option value="8">Transient</option>
+          <option [ngValue]="0">Not Configured</option>
+          <option [ngValue]="1">Unspecified</option>
+          <option [ngValue]="2">Email Address</option>
+          <option [ngValue]="3">X.509 Subject Name</option>
+          <option [ngValue]="4">Windows Domain Qualified Name</option>
+          <option [ngValue]="5">Kerberos Principal Name</option>
+          <option [ngValue]="6">Entity Identifier</option>
+          <option [ngValue]="7">Persistent</option>
+          <option [ngValue]="8">Transient</option>
        </select>
      </div>
      <div class="form-group">
@@ -333,9 +337,9 @@
      <div class="form-group">
        <label for="spSigningBehavior">{{ "spSigningBehavior" | i18n }}</label>
        <select class="form-control" formControlName="spSigningBehavior" id="spSigningBehavior">
-          <option value="0">If IdP Wants Authn Requests Signed</option>
-          <option value="1">Always</option>
-          <option value="3">Never</option>
+          <option [ngValue]="0">If IdP Wants Authn Requests Signed</option>
+          <option [ngValue]="1">Always</option>
+          <option [ngValue]="3">Never</option>
        </select>
      </div>
      <div class="form-group">
@@ -389,9 +393,9 @@
      <div class="form-group">
        <label for="idpBindingType">{{ "idpBindingType" | i18n }}</label>
        <select class="form-control" formControlName="idpBindingType" id="idpBindingType">
-          <option value="1">Redirect</option>
-          <option value="2">HTTP POST</option>
-          <option value="4">Artifact</option>
+          <option [ngValue]="1">Redirect</option>
+          <option [ngValue]="2">HTTP POST</option>
+          <option [ngValue]="4">Artifact</option>
        </select>
      </div>
      <div class="form-group">
@@ -439,7 +443,8 @@
          <option *ngFor="let o of samlSigningAlgorithms" [ngValue]="o">{{ o }}</option>
        </select>
      </div>
-      <div class="form-group">
+      <div class="form-group" [hidden]="true">
+        <!--TODO: Unhide once Unsolicited IdP Response is supported-->
        <div class="form-check">
          <input
            class="form-check-input"
@@ -482,7 +487,7 @@
  </div>

  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "save" | i18n }}</span>
  </button>
 </form>
--- a/bitwarden_license/src/app/providers/clients/add-organization.component.html
+++ b/bitwarden_license/src/app/providers/clients/add-organization.component.html
@@ -16,7 +16,7 @@
      </div>
      <div class="modal-body">
        <div class="card-body text-center" *ngIf="loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          {{ "loading" | i18n }}
        </div>
        <ng-container *ngIf="!loading">
--- a/bitwarden_license/src/app/providers/clients/clients.component.html
+++ b/bitwarden_license/src/app/providers/clients/clients.component.html
@@ -13,7 +13,7 @@
      />
    </div>
    <a class="btn btn-sm btn-outline-primary ml-3" routerLink="create" *ngIf="manageOrganizations">
-      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
      {{ "newClientOrganization" | i18n }}
    </a>
    <button
@@ -21,14 +21,18 @@
      (click)="addExistingOrganization()"
      *ngIf="manageOrganizations && showAddExisting"
    >
-      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
      {{ "addExistingOrganization" | i18n }}
    </button>
  </div>
 </div>

 <ng-container *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>

@@ -67,11 +71,11 @@
                aria-expanded="false"
                appA11yTitle="{{ 'options' | i18n }}"
              >
-                <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
+                <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
              </button>
              <div class="dropdown-menu dropdown-menu-right">
                <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(o)">
-                  <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
                  {{ "remove" | i18n }}
                </a>
              </div>
--- a/bitwarden_license/src/app/providers/manage/accept-provider.component.html
+++ b/bitwarden_license/src/app/providers/manage/accept-provider.component.html
@@ -3,7 +3,7 @@
    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
--- a/bitwarden_license/src/app/providers/manage/events.component.html
+++ b/bitwarden_license/src/app/providers/manage/events.component.html
@@ -32,9 +32,9 @@
        [disabled]="loaded && refreshForm.loading"
      >
        <i
-          class="fa fa-refresh fa-fw"
+          class="bwi bwi-refresh bwi-fw"
          aria-hidden="true"
-          [ngClass]="{ 'fa-spin': loaded && refreshForm.loading }"
+          [ngClass]="{ 'bwi-spin': loaded && refreshForm.loading }"
        ></i>
        {{ "refresh" | i18n }}
      </button>
@@ -47,14 +47,18 @@
        (click)="exportEvents()"
        [disabled]="(loaded && exportForm.loading) || dirtyDates"
      >
-        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+        <i class="bwi bwi-spinner bwi-spin" aria-hidden="true"></i>
        <span>{{ "export" | i18n }}</span>
      </button>
    </form>
  </div>
 </div>
 <ng-container *ngIf="!loaded">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container *ngIf="loaded">
@@ -75,7 +79,7 @@
        <td>{{ e.date | date: "medium" }}</td>
        <td>
          <i
-            class="text-muted fa fa-lg {{ e.appIcon }}"
+            class="text-muted bwi bwi-lg {{ e.appIcon }}"
            title="{{ e.appName }}, {{ e.ip }}"
            aria-hidden="true"
          ></i>
@@ -97,7 +101,7 @@
    [disabled]="loaded && moreBtn.loading"
    *ngIf="continuationToken"
  >
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "loadMore" | i18n }}</span>
  </button>
 </ng-container>
--- a/bitwarden_license/src/app/providers/manage/people.component.html
+++ b/bitwarden_license/src/app/providers/manage/people.component.html
@@ -52,11 +52,11 @@
        aria-expanded="false"
        appA11yTitle="{{ 'options' | i18n }}"
      >
-        <i class="fa fa-cog" aria-hidden="true"></i>
+        <i class="bwi bwi-cog" aria-hidden="true"></i>
      </button>
      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bulkActionsButton">
        <button class="dropdown-item" appStopClick (click)="bulkReinvite()">
-          <i class="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
          {{ "reinviteSelected" | i18n }}
        </button>
        <button
@@ -65,32 +65,36 @@
          (click)="bulkConfirm()"
          *ngIf="showBulkConfirmUsers"
        >
-          <i class="fa fa-fw fa-check" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
          {{ "confirmSelected" | i18n }}
        </button>
        <button class="dropdown-item text-danger" appStopClick (click)="bulkRemove()">
-          <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
          {{ "remove" | i18n }}
        </button>
        <div class="dropdown-divider"></div>
        <button class="dropdown-item" appStopClick (click)="selectAll(true)">
-          <i class="fa fa-fw fa-check-square-o" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-check-square" aria-hidden="true"></i>
          {{ "selectAll" | i18n }}
        </button>
        <button class="dropdown-item" appStopClick (click)="selectAll(false)">
-          <i class="fa fa-fw fa-minus-square-o" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-minus-square" aria-hidden="true"></i>
          {{ "unselectAll" | i18n }}
        </button>
      </div>
    </div>
    <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="invite()">
-      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
      {{ "inviteUser" | i18n }}
    </button>
  </div>
 </div>
 <ng-container *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container
@@ -104,7 +108,7 @@
    <app-callout
      type="info"
      title="{{ 'confirmUsers' | i18n }}"
-      icon="fa-check-circle"
+      icon="bwi bwi-check-circle"
      *ngIf="showConfirmUsers"
    >
      {{ "providerUsersNeedConfirmed" | i18n }}
@@ -128,7 +132,8 @@
              size="25"
              [circle]="true"
              [fontSize]="14"
-            ></app-avatar>
+            >
+            </app-avatar>
          </td>
          <td>
            <a href="#" appStopClick (click)="edit(u)">{{ u.email }}</a>
@@ -142,7 +147,11 @@
          </td>
          <td>
            <ng-container *ngIf="u.twoFactorEnabled">
-              <i class="fa fa-lock" title="{{ 'userUsingTwoStep' | i18n }}" aria-hidden="true"></i>
+              <i
+                class="bwi bwi-lock"
+                title="{{ 'userUsingTwoStep' | i18n }}"
+                aria-hidden="true"
+              ></i>
              <span class="sr-only">{{ "userUsingTwoStep" | i18n }}</span>
            </ng-container>
          </td>
@@ -161,7 +170,7 @@
                aria-expanded="false"
                appA11yTitle="{{ 'options' | i18n }}"
              >
-                <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
+                <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
              </button>
              <div class="dropdown-menu dropdown-menu-right">
                <a
@@ -171,7 +180,7 @@
                  (click)="reinvite(u)"
                  *ngIf="u.status === userStatusType.Invited"
                >
-                  <i class="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
                  {{ "resendInvitation" | i18n }}
                </a>
                <a
@@ -181,7 +190,7 @@
                  (click)="confirm(u)"
                  *ngIf="u.status === userStatusType.Accepted"
                >
-                  <i class="fa fa-fw fa-check" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
                  {{ "confirm" | i18n }}
                </a>
                <a
@@ -191,7 +200,7 @@
                  (click)="groups(u)"
                  *ngIf="accessGroups"
                >
-                  <i class="fa fa-fw fa-sitemap" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-sitemap" aria-hidden="true"></i>
                  {{ "groups" | i18n }}
                </a>
                <a
@@ -201,11 +210,11 @@
                  (click)="events(u)"
                  *ngIf="accessEvents && u.status === userStatusType.Confirmed"
                >
-                  <i class="fa fa-fw fa-file-text-o" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
                  {{ "eventLogs" | i18n }}
                </a>
                <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(u)">
-                  <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-remove" aria-hidden="true"></i>
                  {{ "remove" | i18n }}
                </a>
              </div>
--- a/bitwarden_license/src/app/providers/manage/user-add-edit.component.html
+++ b/bitwarden_license/src/app/providers/manage/user-add-edit.component.html
@@ -23,7 +23,7 @@
      </div>
      <div class="modal-body" *ngIf="loading">
        <i
-          class="fa fa-spinner fa-spin text-muted"
+          class="bwi bwi-spinner bwi-spin text-muted"
          title="{{ 'loading' | i18n }}"
          aria-hidden="true"
        ></i>
@@ -52,9 +52,9 @@
            target="_blank"
            rel="noopener"
            appA11yTitle="{{ 'learnMore' | i18n }}"
-            href="https://bitwarden.com/help/article/user-types-access-control/#user-types"
+            href="https://bitwarden.com/help/provider-users/"
          >
-            <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+            <i class="bwi bwi-question-circle" aria-hidden="true"></i>
          </a>
        </h3>
        <div class="form-check mt-2 form-check-block">
@@ -88,7 +88,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "save" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
@@ -106,12 +106,12 @@
            [appApiAction]="deletePromise"
          >
            <i
-              class="fa fa-trash-o fa-lg fa-fw"
+              class="bwi bwi-trash bwi-lg bwi-fw"
              [hidden]="deleteBtn.loading"
              aria-hidden="true"
            ></i>
            <i
-              class="fa fa-spinner fa-spin fa-lg fa-fw"
+              class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
              [hidden]="!deleteBtn.loading"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
--- a/bitwarden_license/src/app/providers/providers-layout.component.html
+++ b/bitwarden_license/src/app/providers/providers-layout.component.html
@@ -10,7 +10,7 @@
        </div>
        <div class="ml-3 card border-danger text-danger bg-transparent" *ngIf="!provider.enabled">
          <div class="card-body py-2">
-            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+            <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
            {{ "providerIsDisabled" | i18n }}
          </div>
        </div>
@@ -18,19 +18,19 @@
      <ul class="nav nav-tabs" *ngIf="showMenuBar">
        <li class="nav-item">
          <a class="nav-link" routerLink="clients" routerLinkActive="active">
-            <i class="fa fa-university" aria-hidden="true"></i>
+            <i class="bwi bwi-bank" aria-hidden="true"></i>
            {{ "clients" | i18n }}
          </a>
        </li>
        <li class="nav-item" *ngIf="showManageTab">
          <a class="nav-link" [routerLink]="manageRoute" routerLinkActive="active">
-            <i class="fa fa-sliders" aria-hidden="true"></i>
+            <i class="bwi bwi-sliders" aria-hidden="true"></i>
            {{ "manage" | i18n }}
          </a>
        </li>
        <li class="nav-item" *ngIf="showSettingsTab">
          <a class="nav-link" routerLink="settings" routerLinkActive="active">
-            <i class="fa fa-cogs" aria-hidden="true"></i>
+            <i class="bwi bwi-cogs" aria-hidden="true"></i>
            {{ "settings" | i18n }}
          </a>
        </li>
--- a/bitwarden_license/src/app/providers/settings/account.component.html
+++ b/bitwarden_license/src/app/providers/settings/account.component.html
@@ -2,7 +2,11 @@
  <h1>{{ "myProvider" | i18n }}</h1>
 </div>
 <div *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </div>
 <form
@@ -42,7 +46,7 @@
    </div>
  </div>
  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "save" | i18n }}</span>
  </button>
 </form>
--- a/bitwarden_license/src/app/providers/setup/setup-provider.component.html
+++ b/bitwarden_license/src/app/providers/setup/setup-provider.component.html
@@ -3,7 +3,7 @@
    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
--- a/bitwarden_license/src/app/providers/setup/setup.component.html
+++ b/bitwarden_license/src/app/providers/setup/setup.component.html
@@ -27,7 +27,7 @@

    <div class="mt-4">
      <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+        <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
        <span>{{ "submit" | i18n }}</span>
      </button>
      <button type="button" class="btn btn-outline-secondary" (click)="cancel()" *ngIf="showCancel">
--- a/bitwarden_license/src/app/providers/setup/setup.component.ts
+++ b/bitwarden_license/src/app/providers/setup/setup.component.ts
@@ -48,9 +48,7 @@ export class SetupComponent implements OnInit {
          "error",
          null,
          this.i18nService.t("emergencyInviteAcceptFailed"),
-          {
-            timeout: 10000,
-          }
+          { timeout: 10000 }
        );
        this.router.navigate(["/"]);
        return;
--- a/2
+++ b/2
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
-  "name": "bitwarden-web",
-  "version": "2.25.1",
+  "name": "@bitwarden/web-vault",
+  "version": "2.26.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
-      "name": "bitwarden-web",
-      "version": "2.25.1",
+      "name": "@bitwarden/web-vault",
+      "version": "2.26.0",
      "hasInstallScript": true,
      "license": "GPL-3.0",
      "dependencies": {
@@ -26,7 +26,6 @@
        "browser-hrtime": "^1.1.8",
        "core-js": "^3.11.0",
        "date-input-polyfill": "^2.14.0",
-        "font-awesome": "4.7.0",
        "jquery": "3.6.0",
        "ngx-infinite-scroll": "^10.0.1",
        "ngx-toastr": "14.1.4",
@@ -3251,14 +3250,6 @@
        }
      }
    },
-    "node_modules/font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
-      "engines": {
-        "node": ">=0.10.3"
-      }
-    },
    "node_modules/foreach": {
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
@@ -10260,11 +10251,6 @@
      "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
      "dev": true
    },
-    "font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
-    },
    "foreach": {
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "bitwarden-web",
-  "version": "2.25.1",
+  "name": "@bitwarden/web-vault",
+  "version": "2.26.0",
  "license": "GPL-3.0",
  "repository": "https://github.com/bitwarden/web",
  "scripts": {
@@ -85,7 +85,6 @@
    "browser-hrtime": "^1.1.8",
    "core-js": "^3.11.0",
    "date-input-polyfill": "^2.14.0",
-    "font-awesome": "4.7.0",
    "jquery": "3.6.0",
    "ngx-infinite-scroll": "^10.0.1",
    "ngx-toastr": "14.1.4",
--- a/src/404.html
+++ b/src/404.html
@@ -9,13 +9,7 @@
      href="/404/bootstrap.min.css"
      rel="stylesheet"
      type="text/css"
-      integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l"
-    />
-    <link
-      href="/404/font-awesome.min.css"
-      rel="stylesheet"
-      type="text/css"
-      integrity="sha512-SfTiTlX6kk+qitfevl/7LibUOeJWlt9rbyDn92a1DqWOw9vWG2MFoays0sgObmWazO5BQPiFucnnEAjpAB+/Sw=="
+      integrity="sha384-hA/ESrxp2b05ywLtD9YwM6m+pNyLRY4+ruk6dWK00SM4k6SQs0bfrITJVSf6uZyH"
    />
    <link href="/404/styles.css" rel="stylesheet" type="text/css" />

@@ -33,7 +27,9 @@
    <div class="banner">
      <div class="container inner banner">
        <div class="row align-items-center">
-          <div class="col brand"><i class="fa fa-shield"></i>&nbsp; <strong>bit</strong>warden</div>
+          <div class="col brand">
+            <i class="bwi bwi-shield"></i>&nbsp; <strong>bit</strong>warden
+          </div>
        </div>
      </div>
    </div>
--- a/src/404/font-awesome.min.css
+++ b/src/404/font-awesome.min.css
--- a/src/404/styles.css
+++ b/src/404/styles.css
@@ -119,3 +119,33 @@ h2 {
  padding: 40px 0 40px 0;
  border-top: 1px solid #dee2e6;
 }
+
+/* Bitwarden icons, manually copied */
+
+@font-face {
+  font-family: "bwi-font";
+  src: url(../images/bwi-font.svg) format("svg"), url(../fonts/bwi-font.ttf) format("truetype"),
+    url(../fonts/bwi-font.woff) format("woff"), url(../fonts/bwi-font.woff2) format("woff2");
+  font-weight: normal;
+  font-style: normal;
+  font-display: block;
+}
+
+.bwi {
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: "bwi-font" !important;
+  speak: never;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+  display: inline-block;
+  /* Better Font Rendering */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.bwi-shield:before {
+  content: "\e932";
+}
--- a/src/abstractions/state.service.ts
+++ b/src/abstractions/state.service.ts
@@ -0,0 +1,10 @@
+import { StateService as BaseStateService } from "jslib-common/abstractions/state.service";
+
+import { StorageOptions } from "jslib-common/models/domain/storageOptions";
+
+import { Account } from "src/models/account";
+
+export abstract class StateService extends BaseStateService<Account> {
+  getRememberEmail: (options?: StorageOptions) => Promise<boolean>;
+  setRememberEmail: (value: boolean, options?: StorageOptions) => Promise<void>;
+}
--- a/src/app/accounts/accept-emergency.component.html
+++ b/src/app/accounts/accept-emergency.component.html
@@ -3,7 +3,7 @@
    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
--- a/src/app/accounts/accept-organization.component.html
+++ b/src/app/accounts/accept-organization.component.html
@@ -3,7 +3,7 @@
    <img src="../../images/logo-dark@2x.png" class="mb-4 logo" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
--- a/src/app/accounts/hint.component.html
+++ b/src/app/accounts/hint.component.html
@@ -28,7 +28,7 @@
            >
              <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -2,7 +2,7 @@
  <div class="row justify-content-md-center mt-5">
    <div class="col-5">
      <p class="text-center mb-4">
-        <i class="fa fa-lock fa-4x text-muted" aria-hidden="true"></i>
+        <i class="bwi bwi-lock bwi-4x text-muted" aria-hidden="true"></i>
      </p>
      <p class="lead text-center mx-4 mb-4">{{ "yourVaultIsLocked" | i18n }}</p>
      <div class="card d-block">
@@ -27,9 +27,9 @@
                (click)="togglePassword()"
              >
                <i
-                  class="fa fa-lg"
+                  class="bwi bwi-lg"
                  aria-hidden="true"
-                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                ></i>
              </button>
            </div>
@@ -44,11 +44,9 @@
              class="btn btn-primary btn-block btn-submit"
              [disabled]="form.loading"
            >
-              <span>
-                <i class="fa fa-unlock-alt" aria-hidden="true"></i> {{ "unlock" | i18n }}
-              </span>
+              <span> <i class="bwi bwi-unlock" aria-hidden="true"></i> {{ "unlock" | i18n }} </span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -44,9 +44,9 @@
                (click)="togglePassword()"
              >
                <i
-                  class="fa fa-lg"
+                  class="bwi bwi-lg"
                  aria-hidden="true"
-                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                ></i>
              </button>
            </div>
@@ -74,9 +74,9 @@
              class="btn btn-primary btn-block btn-submit"
              [disabled]="form.loading"
            >
-              <span> <i class="fa fa-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
+              <span> <i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
@@ -86,12 +86,13 @@
              [queryParams]="{ email: email }"
              class="btn btn-outline-secondary btn-block ml-2 mt-0"
            >
-              <i class="fa fa-pencil-square-o" aria-hidden="true"></i> {{ "createAccount" | i18n }}
+              <i class="bwi bwi-pencil-square" aria-hidden="true"></i>
+              {{ "createAccount" | i18n }}
            </a>
          </div>
          <div class="d-flex">
            <a routerLink="/sso" class="btn btn-outline-secondary btn-block mt-2">
-              <i class="fa fa-bank" aria-hidden="true"></i> {{ "enterpriseSingleSignOn" | i18n }}
+              <i class="bwi bwi-bank" aria-hidden="true"></i> {{ "enterpriseSingleSignOn" | i18n }}
            </a>
          </div>
        </div>
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -12,11 +12,16 @@ import { LogService } from "jslib-common/abstractions/log.service";
 import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { PolicyService } from "jslib-common/abstractions/policy.service";
-import { StateService } from "jslib-common/abstractions/state.service";
+
+import { StateService } from "../../abstractions/state.service";

 import { LoginComponent as BaseLoginComponent } from "jslib-angular/components/login.component";

+import { PolicyData } from "jslib-common/models/data/policyData";
+import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions";
 import { Policy } from "jslib-common/models/domain/policy";
+import { ListResponse } from "jslib-common/models/response/listResponse";
+import { PolicyResponse } from "jslib-common/models/response/policyResponse";

@Component({
  selector: "app-login",
@@ -24,13 +29,14 @@ import { Policy } from "jslib-common/models/domain/policy";
 })
 export class LoginComponent extends BaseLoginComponent {
  showResetPasswordAutoEnrollWarning = false;
+  enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions;
+  policies: ListResponse<PolicyResponse>;

  constructor(
    authService: AuthService,
    router: Router,
    i18nService: I18nService,
    private route: ActivatedRoute,
-    stateService: StateService,
    platformUtilsService: PlatformUtilsService,
    environmentService: EnvironmentService,
    passwordGenerationService: PasswordGenerationService,
@@ -38,7 +44,8 @@ export class LoginComponent extends BaseLoginComponent {
    private apiService: ApiService,
    private policyService: PolicyService,
    logService: LogService,
-    ngZone: NgZone
+    ngZone: NgZone,
+    protected stateService: StateService
  ) {
    super(
      authService,
@@ -78,35 +85,64 @@ export class LoginComponent extends BaseLoginComponent {
        });
      }
      await super.ngOnInit();
+      this.rememberEmail = await this.stateService.getRememberEmail();
    });

    const invite = await this.stateService.getOrganizationInvitation();
    if (invite != null) {
      let policyList: Policy[] = null;
      try {
-        const policies = await this.apiService.getPoliciesByToken(
+        this.policies = await this.apiService.getPoliciesByToken(
          invite.organizationId,
          invite.token,
          invite.email,
          invite.organizationUserId
        );
-        policyList = this.policyService.mapPoliciesFromToken(policies);
+        policyList = this.policyService.mapPoliciesFromToken(this.policies);
      } catch (e) {
        this.logService.error(e);
      }

      if (policyList != null) {
-        const result = this.policyService.getResetPasswordPolicyOptions(
+        const resetPasswordPolicy = this.policyService.getResetPasswordPolicyOptions(
          policyList,
          invite.organizationId
        );
        // Set to true if policy enabled and auto-enroll enabled
-        this.showResetPasswordAutoEnrollWarning = result[1] && result[0].autoEnrollEnabled;
+        this.showResetPasswordAutoEnrollWarning =
+          resetPasswordPolicy[1] && resetPasswordPolicy[0].autoEnrollEnabled;
+
+        this.enforcedPasswordPolicyOptions =
+          await this.policyService.getMasterPasswordPolicyOptions(policyList);
      }
    }
  }

  async goAfterLogIn() {
+    // Check master password against policy
+    if (this.enforcedPasswordPolicyOptions != null) {
+      const strengthResult = this.passwordGenerationService.passwordStrength(
+        this.masterPassword,
+        this.getPasswordStrengthUserInput()
+      );
+      const masterPasswordScore = strengthResult == null ? null : strengthResult.score;
+
+      // If invalid, save policies and require update
+      if (
+        !this.policyService.evaluateMasterPassword(
+          masterPasswordScore,
+          this.masterPassword,
+          this.enforcedPasswordPolicyOptions
+        )
+      ) {
+        const policiesData: { [id: string]: PolicyData } = {};
+        this.policies.data.map((p) => (policiesData[p.id] = new PolicyData(p)));
+        await this.policyService.replace(policiesData);
+        this.router.navigate(["update-password"]);
+        return;
+      }
+    }
+
    const loginRedirect = await this.stateService.getLoginRedirect();
    if (loginRedirect != null) {
      this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
@@ -115,4 +151,27 @@ export class LoginComponent extends BaseLoginComponent {
      this.router.navigate([this.successRoute]);
    }
  }
+
+  async submit() {
+    await this.stateService.setRememberEmail(this.rememberEmail);
+    if (!this.rememberEmail) {
+      await this.stateService.setRememberedEmail(null);
+    }
+    await super.submit();
+  }
+
+  private getPasswordStrengthUserInput() {
+    let userInput: string[] = [];
+    const atPosition = this.email.indexOf("@");
+    if (atPosition > -1) {
+      userInput = userInput.concat(
+        this.email
+          .substr(0, atPosition)
+          .trim()
+          .toLowerCase()
+          .split(/[^A-Za-z0-9]/)
+      );
+    }
+    return userInput;
+  }
 }
--- a/src/app/accounts/recover-delete.component.html
+++ b/src/app/accounts/recover-delete.component.html
@@ -28,7 +28,7 @@
            >
              <span>{{ "submit" | i18n }}</span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/recover-two-factor.component.html
+++ b/src/app/accounts/recover-two-factor.component.html
@@ -7,7 +7,7 @@
          <p>
            {{ "recoverAccountTwoStepDesc" | i18n }}
            <a
-              href="https://help.bitwarden.com/article/lost-two-step-device/"
+              href="https://bitwarden.com/help/lost-two-step-device/"
              target="_blank"
              rel="noopener"
              >{{ "learnMore" | i18n }}</a
@@ -60,7 +60,7 @@
            >
              <span>{{ "submit" | i18n }}</span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/register.component.html
+++ b/src/app/accounts/register.component.html
@@ -1,44 +1,100 @@
 <div class="layout" [ngClass]="['layout', layout]">
-  <header class="header" *ngIf="layout === 'enterprise2'">
+  <!-- TEAMS 1 Header -->
+  <header
+    class="header"
+    *ngIf="
+      layout === 'default' ||
+      layout === 'teams' ||
+      layout === 'teams1' ||
+      layout === 'teams2' ||
+      layout === 'enterprise' ||
+      layout === 'enterprise1' ||
+      layout === 'enterprise2' ||
+      layout === 'cnetcmpgnent' ||
+      layout === 'cnetcmpgnteams' ||
+      layout === 'cnetcmpgnind'
+    "
+  >
    <div class="container">
      <div class="row">
        <div class="col-7">
          <img
            alt="Bitwarden"
            class="logo mb-2"
-            src="../../images/register-layout/logo-horizontal-white.png"
+            src="../../images/register-layout/logo-horizontal-white.svg"
          />
        </div>
      </div>
    </div>
  </header>
+
  <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
    <div class="row">
      <div class="col-7" *ngIf="layout">
        <div class="mt-5">
-          <div *ngIf="layout === 'enterprise2'">
-            <h2>Companies globally trust Bitwarden for password management.</h2>
-            <p>Start your 7-day free trial!</p>
-            <p class="highlight">Quickly deploy your <b>organization</b></p>
-            <p>Use Bitwarden across all platforms</p>
+          <!-- Default Body -->
+          <div
+            *ngIf="
+              layout === 'teams' ||
+              layout === 'enterprise' ||
+              layout === 'enterprise1' ||
+              layout === 'default'
+            "
+          >
+            <h1>The Bitwarden Password Manager</h1>
+            <h2>
+              Trusted by millions of individuals, teams, and organizations worldwide for secure
+              password storage and sharing.
+            </h2>
+            <p>Store logins, secure notes, and more</p>
            <p>Collaborate and share securely</p>
-            <figure>
-              <figcaption>
-                <cite>
-                  <img src="../../images/register-layout/wired-logo.png" alt="Wired" />
-                </cite>
-              </figcaption>
-              <blockquote>
-                "Bitwarden has become a popular choice among open-source software advocates. After
-                using it for a few months, I can see why." - February 2020
-              </blockquote>
-            </figure>
+            <p>Access anywhere on any device</p>
+            <p>Create your account to get started</p>
          </div>
-          <div *ngIf="layout === 'enterprise3'">
-            <p>Enterprise 3 layout</p>
+
+          <!-- Teams & Enterprise Body -->
+          <div *ngIf="layout === 'teams1' || layout === 'teams2' || layout === 'enterprise2'">
+            <h1>
+              Start Your <span *ngIf="layout === 'teams1' || layout === 'teams1'">Teams<br /></span
+              ><span *ngIf="layout === 'enterprise2'">Enterprise</span> Free Trial Now
+            </h1>
+            <h2>
+              Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure
+              password storage and sharing.
+            </h2>
+            <p>Collaborate and share securely</p>
+            <p>Deploy and manage quickly and easily</p>
+            <p>Access anywhere on any device</p>
+            <p>Create your account to get started</p>
          </div>
-          <div *ngIf="layout === 'enterprise4'">
-            <p>Enterprise 4 layout</p>
+
+          <!-- CNET Campaign Teams & Enterprise Body -->
+          <div *ngIf="layout === 'cnetcmpgnteams' || layout === 'cnetcmpgnent'">
+            <h1>
+              Start Your <span *ngIf="layout === 'cnetcmpgnteams'">Teams<br /></span
+              ><span *ngIf="layout === 'cnetcmpgnent'">Enterprise</span> Free Trial Now
+            </h1>
+            <h2>
+              Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure
+              password storage and sharing.
+            </h2>
+            <p>Collaborate and share securely</p>
+            <p>Deploy and manage quickly and easily</p>
+            <p>Access anywhere on any device</p>
+            <p>Create your account to get started</p>
+          </div>
+
+          <!-- CNET Campaign Premium Body -->
+          <div *ngIf="layout === 'cnetcmpgnind'">
+            <h1>Start Your Premium Account Now</h1>
+            <h2>
+              Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure
+              password storage and sharing.
+            </h2>
+            <p>Store logins, secure notes, and more</p>
+            <p>Secure your account with advanced two-step login</p>
+            <p>Access anywhere on any device</p>
+            <p>Create your account to get started</p>
          </div>
        </div>
      </div>
@@ -51,7 +107,7 @@
                <app-callout
                  title="{{ 'createOrganizationStep1' | i18n }}"
                  type="info"
-                  icon="fa-thumb-tack"
+                  icon="bwi bwi-thumb-tack"
                  *ngIf="showCreateOrgMessage"
                >
                  {{ "createOrganizationCreatePersonalAccount" | i18n }}
@@ -114,11 +170,11 @@
                        (click)="togglePassword(false)"
                      >
                        <i
-                          class="fa fa-lg"
+                          class="bwi bwi-lg"
                          aria-hidden="true"
                          [ngClass]="{
-                            'fa-eye': !showPassword,
-                            'fa-eye-slash': showPassword
+                            'bwi-eye': !showPassword,
+                            'bwi-eye-slash': showPassword
                          }"
                        ></i>
                      </button>
@@ -146,9 +202,9 @@
                      (click)="togglePassword(true)"
                    >
                      <i
-                        class="fa fa-lg"
+                        class="bwi bwi-lg"
                        aria-hidden="true"
-                        [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                        [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                      ></i>
                    </button>
                  </div>
@@ -197,7 +253,7 @@
                  >
                    <span>{{ "submit" | i18n }}</span>
                    <i
-                      class="fa fa-spinner fa-spin"
+                      class="bwi bwi-spinner bwi-spin"
                      title="{{ 'loading' | i18n }}"
                      aria-hidden="true"
                    ></i>
@@ -212,5 +268,88 @@
        </div>
      </div>
    </div>
+    <div class="row">
+      <div class="col-7 d-flex align-items-center">
+        <div
+          *ngIf="
+            layout === 'cnetcmpgnent' || layout === 'cnetcmpgnteams' || layout === 'cnetcmpgnind'
+          "
+        >
+          <figure>
+            <figcaption>
+              <cite>
+                <img
+                  src="../../images/register-layout/cnet-logo.svg"
+                  class="w-25 d-block mx-auto"
+                  alt="cnet logo"
+                />
+              </cite>
+            </figcaption>
+            <blockquote class="mx-auto text-center px-4">
+              "No more excuses; start using Bitwarden today. The identity you save could be your
+              own. The money definitely will be."
+            </blockquote>
+          </figure>
+        </div>
+
+        <div
+          *ngIf="
+            layout === 'teams' ||
+            layout === 'teams1' ||
+            layout === 'teams2' ||
+            layout === 'enterprise' ||
+            layout === 'enterprise1' ||
+            layout === 'enterprise2' ||
+            layout === 'default'
+          "
+        >
+          <figure>
+            <figcaption>
+              <cite>
+                <img
+                  src="../../images/register-layout/forbes-logo.svg"
+                  class="w-25 d-block mx-auto"
+                  alt="Forbes Logo"
+                />
+              </cite>
+            </figcaption>
+            <blockquote class="mx-auto text-center px-4">
+              “Bitwarden boasts the backing of some of the world's best security experts and an
+              attractive, easy-to-use interface”
+            </blockquote>
+          </figure>
+        </div>
+      </div>
+      <div
+        *ngIf="
+          layout === 'cnetcmpgnent' || layout === 'cnetcmpgnteams' || layout === 'cnetcmpgnind'
+        "
+        class="col-5 d-flex align-items-center justify-content-center"
+      >
+        <img
+          src="../../images/register-layout/usnews-360-badge.svg"
+          class="w-50 d-block"
+          alt="US News 360 Reviews Best Password Manager"
+        />
+      </div>
+      <div
+        *ngIf="
+          layout === 'teams' ||
+          layout === 'teams1' ||
+          layout === 'teams2' ||
+          layout === 'enterprise' ||
+          layout === 'enterprise1' ||
+          layout === 'enterprise2' ||
+          layout === 'default'
+        "
+        class="col-5 d-flex align-items-center justify-content-center"
+      >
+        <img
+          src="../../images/register-layout/usnews-360-badge.svg"
+          class="w-50 d-block"
+          alt="US News 360 Reviews Best Password Manager"
+        />
+      </div>
+    </div>
  </form>
 </div>
--- a/src/app/accounts/remove-password.component.html
+++ b/src/app/accounts/remove-password.component.html
@@ -3,7 +3,7 @@
    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
@@ -27,7 +27,7 @@
            [disabled]="actionPromise"
          >
            <i
-              class="fa fa-spinner fa-spin"
+              class="bwi bwi-spinner bwi-spin"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
              *ngIf="continuing"
@@ -41,7 +41,7 @@
            [disabled]="actionPromise"
          >
            <i
-              class="fa fa-spinner fa-spin"
+              class="bwi bwi-spinner bwi-spin"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
              *ngIf="leaving"
--- a/src/app/accounts/set-password.component.html
+++ b/src/app/accounts/set-password.component.html
@@ -4,7 +4,7 @@
      <p class="lead text-center mb-4">{{ "setMasterPassword" | i18n }}</p>
      <div class="card d-block">
        <div class="card-body text-center" *ngIf="syncLoading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          {{ "loading" | i18n }}
        </div>
        <div class="card-body" *ngIf="!syncLoading">
@@ -47,9 +47,9 @@
                  (click)="togglePassword(false)"
                >
                  <i
-                    class="fa fa-lg"
+                    class="bwi bwi-lg"
                    aria-hidden="true"
-                    [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                    [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                  ></i>
                </button>
                <div class="progress-bar invisible"></div>
@@ -76,9 +76,9 @@
                (click)="togglePassword(true)"
              >
                <i
-                  class="fa fa-lg"
+                  class="bwi bwi-lg"
                  aria-hidden="true"
-                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                ></i>
              </button>
            </div>
@@ -96,7 +96,7 @@
              [disabled]="form.loading"
            >
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/sso.component.html
+++ b/src/app/accounts/sso.component.html
@@ -10,7 +10,7 @@
      <img class="logo mb-2 logo-themed" alt="Bitwarden" />
      <div class="card d-block mt-4">
        <div class="card-body" *ngIf="loggingIn">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          {{ "loading" | i18n }}
        </div>
        <div class="card-body" *ngIf="!loggingIn">
@@ -34,9 +34,9 @@
              class="btn btn-primary btn-block btn-submit"
              [disabled]="form.loading"
            >
-              <span> <i class="fa fa-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
+              <span> <i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -94,7 +94,7 @@
            </div>
          </ng-container>
          <i
-            class="fa fa-spinner text-muted fa-spin pull-right"
+            class="bwi bwi-spinner text-muted bwi-spin pull-right"
            title="{{ 'loading' | i18n }}"
            *ngIf="form.loading && selectedProviderType === providerType.WebAuthn"
            aria-hidden="true"
@@ -127,10 +127,10 @@
              "
            >
              <span>
-                <i class="fa fa-sign-in" aria-hidden="true"></i> {{ "continue" | i18n }}
+                <i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "continue" | i18n }}
              </span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/update-password.component.html
+++ b/src/app/accounts/update-password.component.html
@@ -0,0 +1,90 @@
+<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate autocomplete="off">
+  <div class="row justify-content-md-center mt-5">
+    <div class="col-4">
+      <p class="lead text-center mb-4">{{ "updateMasterPassword" | i18n }}</p>
+      <div class="card d-block">
+        <div class="card-body">
+          <app-callout type="warning">{{ "masterPasswordInvalidWarning" | i18n }} </app-callout>
+          <app-callout
+            type="info"
+            [enforcedPolicyOptions]="enforcedPolicyOptions"
+            *ngIf="enforcedPolicyOptions"
+          ></app-callout>
+
+          <form
+            #form
+            (ngSubmit)="submit()"
+            [appApiAction]="formPromise"
+            ngNativeValidate
+            autocomplete="off"
+          >
+            <div class="row">
+              <div class="col-6">
+                <div class="form-group">
+                  <label for="currentMasterPassword">{{ "currentMasterPass" | i18n }}</label>
+                  <input
+                    id="currentMasterPassword"
+                    type="password"
+                    name="MasterPasswordHash"
+                    class="form-control"
+                    [(ngModel)]="currentMasterPassword"
+                    required
+                    appInputVerbatim
+                  />
+                </div>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-6">
+                <div class="form-group">
+                  <label for="newMasterPassword">{{ "newMasterPass" | i18n }}</label>
+                  <input
+                    id="newMasterPassword"
+                    type="password"
+                    name="NewMasterPasswordHash"
+                    class="form-control mb-1"
+                    [(ngModel)]="masterPassword"
+                    (input)="updatePasswordStrength()"
+                    required
+                    appInputVerbatim
+                    autocomplete="new-password"
+                  />
+                  <app-password-strength
+                    [score]="masterPasswordScore"
+                    [showText]="true"
+                  ></app-password-strength>
+                </div>
+              </div>
+              <div class="col-6">
+                <div class="form-group">
+                  <label for="masterPasswordRetype">{{ "confirmNewMasterPass" | i18n }}</label>
+                  <input
+                    id="masterPasswordRetype"
+                    type="password"
+                    name="MasterPasswordRetype"
+                    class="form-control"
+                    [(ngModel)]="masterPasswordRetype"
+                    required
+                    appInputVerbatim
+                    autocomplete="new-password"
+                  />
+                </div>
+              </div>
+            </div>
+            <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+              <i
+                class="fa fa-spinner fa-spin"
+                title="{{ 'loading' | i18n }}"
+                aria-hidden="true"
+              ></i>
+              <span>{{ "changeMasterPassword" | i18n }}</span>
+            </button>
+            <button (click)="cancel()" type="button" class="btn btn-outline-secondary">
+              <span>{{ "cancel" | i18n }}</span>
+            </button>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+</form>
--- a/src/app/accounts/update-password.component.ts
+++ b/src/app/accounts/update-password.component.ts
@@ -0,0 +1,52 @@
+import { Component } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+
+import { first } from "rxjs/operators";
+
+import { ApiService } from "jslib-common/abstractions/api.service";
+import { CryptoService } from "jslib-common/abstractions/crypto.service";
+import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { LogService } from "jslib-common/abstractions/log.service";
+import { MessagingService } from "jslib-common/abstractions/messaging.service";
+import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
+import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
+import { PolicyService } from "jslib-common/abstractions/policy.service";
+import { SyncService } from "jslib-common/abstractions/sync.service";
+
+import { UpdatePasswordComponent as BaseUpdatePasswordComponent } from "jslib-angular/components/update-password.component";
+import { StateService } from "jslib-common/abstractions/state.service";
+import { UserVerificationService } from "jslib-common/abstractions/userVerification.service";
+
+@Component({
+  selector: "app-update-password",
+  templateUrl: "update-password.component.html",
+})
+export class UpdatePasswordComponent extends BaseUpdatePasswordComponent {
+  constructor(
+    router: Router,
+    i18nService: I18nService,
+    platformUtilsService: PlatformUtilsService,
+    passwordGenerationService: PasswordGenerationService,
+    policyService: PolicyService,
+    cryptoService: CryptoService,
+    messagingService: MessagingService,
+    apiService: ApiService,
+    logService: LogService,
+    stateService: StateService,
+    userVerificationService: UserVerificationService
+  ) {
+    super(
+      router,
+      i18nService,
+      platformUtilsService,
+      passwordGenerationService,
+      policyService,
+      cryptoService,
+      messagingService,
+      apiService,
+      stateService,
+      userVerificationService,
+      logService
+    );
+  }
+}
--- a/src/app/accounts/update-temp-password.component.html
+++ b/src/app/accounts/update-temp-password.component.html
@@ -36,9 +36,9 @@
                  (click)="togglePassword(false)"
                >
                  <i
-                    class="fa fa-lg"
+                    class="bwi bwi-lg"
                    aria-hidden="true"
-                    [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                    [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                  ></i>
                </button>
                <div class="progress-bar invisible"></div>
@@ -64,9 +64,9 @@
                (click)="togglePassword(true)"
              >
                <i
-                  class="fa fa-lg"
+                  class="bwi bwi-lg"
                  aria-hidden="true"
-                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                ></i>
              </button>
            </div>
@@ -84,7 +84,7 @@
              [disabled]="form.loading"
            >
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/verify-email-token.component.html
+++ b/src/app/accounts/verify-email-token.component.html
@@ -3,7 +3,7 @@
    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
--- a/src/app/accounts/verify-recover-delete.component.html
+++ b/src/app/accounts/verify-recover-delete.component.html
@@ -18,7 +18,7 @@
            >
              <span>{{ "deleteAccount" | i18n }}</span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -153,7 +153,7 @@ export class AppComponent implements OnDestroy, OnInit {
            );
            if (emailVerificationConfirmed) {
              this.platformUtilsService.launchUri(
-                "https://bitwarden.com/help/article/create-bitwarden-account/"
+                "https://bitwarden.com/help/create-bitwarden-account/"
              );
            }
            break;
@@ -164,7 +164,6 @@ export class AppComponent implements OnDestroy, OnInit {
            this.setFullWidth();
            break;
          case "convertAccountToKeyConnector":
-            this.keyConnectorService.setConvertAccountRequired(true);
            this.router.navigate(["/remove-password"]);
            break;
          default:
--- a/src/app/common/base.accept.component.ts
+++ b/src/app/common/base.accept.component.ts
@@ -60,9 +60,7 @@ export abstract class BaseAcceptComponent implements OnInit {
          errorMessage != null
            ? this.i18nService.t(this.failedShortMessage, errorMessage)
            : this.i18nService.t(this.failedMessage);
-        this.platformUtilService.showToast("error", null, message, {
-          timeout: 10000,
-        });
+        this.platformUtilService.showToast("error", null, message, { timeout: 10000 });
        this.router.navigate(["/"]);
      }

--- a/src/app/common/base.events.component.ts
+++ b/src/app/common/base.events.component.ts
@@ -110,13 +110,7 @@ export abstract class BaseEventsComponent {
    endDate: string,
    continuationToken: string
  ): Promise<ListResponse<EventResponse>>;
-  protected abstract getUserName(
-    r: EventResponse,
-    userId: string
-  ): {
-    name: string;
-    email: string;
-  };
+  protected abstract getUserName(r: EventResponse, userId: string): { name: string; email: string };

  protected async loadAndParseEvents(
    startDate: string,
@@ -144,10 +138,7 @@ export abstract class BaseEventsComponent {
        });
      })
    );
-    return {
-      continuationToken: response.continuationToken,
-      events: events,
-    };
+    return { continuationToken: response.continuationToken, events: events };
  }

  protected parseDates() {
@@ -181,13 +172,6 @@ export abstract class BaseEventsComponent {

    const data = await this.exportService.getEventExport(events);
    const fileName = this.exportService.getFileName(this.exportFileName, "csv");
-    this.platformUtilsService.saveFile(
-      window,
-      data,
-      {
-        type: "text/plain",
-      },
-      fileName
-    );
+    this.platformUtilsService.saveFile(window, data, { type: "text/plain" }, fileName);
  }
 }
--- a/src/app/common/base.people.component.ts
+++ b/src/app/common/base.people.component.ts
@@ -35,10 +35,7 @@ const MaxCheckedCount = 500;
 export abstract class BasePeopleComponent<
  UserType extends ProviderUserUserDetailsResponse | OrganizationUserUserDetailsResponse
 > {
-  @ViewChild("confirmTemplate", {
-    read: ViewContainerRef,
-    static: true,
-  })
+  @ViewChild("confirmTemplate", { read: ViewContainerRef, static: true })
  confirmModalRef: ViewContainerRef;

  get allCount() {
--- a/src/app/components/nested-checkbox.component.ts
+++ b/src/app/components/nested-checkbox.component.ts
@@ -6,18 +6,10 @@ import { Utils } from "jslib-common/misc/utils";
  templateUrl: "nested-checkbox.component.html",
 })
 export class NestedCheckboxComponent {
-  @Input()
-  parentId: string;
-  @Input()
-  checkboxes: {
-    id: string;
-    get: () => boolean;
-    set: (v: boolean) => void;
-  }[];
-  @Output()
-  onSavedUser = new EventEmitter();
-  @Output()
-  onDeletedUser = new EventEmitter();
+  @Input() parentId: string;
+  @Input() checkboxes: { id: string; get: () => boolean; set: (v: boolean) => void }[];
+  @Output() onSavedUser = new EventEmitter();
+  @Output() onDeletedUser = new EventEmitter();

  get parentIndeterminate() {
    return !this.parentChecked && this.checkboxes.some((c) => c.get());
--- a/src/app/components/password-reprompt.component.html
+++ b/src/app/components/password-reprompt.component.html
@@ -32,12 +32,9 @@
              (click)="togglePassword()"
            >
              <i
-                class="fa fa-lg"
+                class="bwi bwi-lg"
                aria-hidden="true"
-                [ngClass]="{
-                  'fa-eye': !showPassword,
-                  'fa-eye-slash': showPassword
-                }"
+                [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
              ></i>
            </button>
          </div>
--- a/src/app/components/password-strength.component.html
+++ b/src/app/components/password-strength.component.html
@@ -2,9 +2,7 @@
  <div
    class="progress-bar {{ color }}"
    role="progressbar"
-    [ngStyle]="{
-      width: scoreWidth + '%'
-    }"
+    [ngStyle]="{ width: scoreWidth + '%' }"
    attr.aria-valuenow="{{ scoreWidth }}"
    aria-valuemin="0"
    aria-valuemax="100"
--- a/src/app/components/password-strength.component.ts
+++ b/src/app/components/password-strength.component.ts
@@ -7,10 +7,8 @@ import { I18nService } from "jslib-common/abstractions/i18n.service";
  templateUrl: "password-strength.component.html",
 })
 export class PasswordStrengthComponent implements OnChanges {
-  @Input()
-  score?: number;
-  @Input()
-  showText = false;
+  @Input() score?: number;
+  @Input() showText = false;

  scoreWidth = 0;
  color = "bg-danger";
--- a/src/app/layouts/footer.component.html
+++ b/src/app/layouts/footer.component.html
@@ -1,9 +1,6 @@
 <div class="container footer text-muted">
  <div class="row">
-    <div class="col">
-      &copy;
-      {{ year }}, Bitwarden Inc.
-    </div>
+    <div class="col">&copy; {{ year }}, Bitwarden Inc.</div>
    <div class="col text-center"></div>
    <div class="col text-right">
      {{ "versionNumber" | i18n: version }}
--- a/src/app/layouts/frontend-layout.component.html
+++ b/src/app/layouts/frontend-layout.component.html
@@ -1,7 +1,5 @@
 <router-outlet></router-outlet>
 <div class="container my-5 text-muted text-center">
-  &copy;
-  {{ year }}, Bitwarden Inc.
-  <br />
+  &copy; {{ year }}, Bitwarden Inc. <br />
  {{ "versionNumber" | i18n: version }}
 </div>
--- a/src/app/layouts/navbar.component.html
+++ b/src/app/layouts/navbar.component.html
@@ -1,12 +1,7 @@
-<nav
-  class="navbar navbar-expand navbar-dark"
-  [ngClass]="{
-    'nav-background-alt': selfHosted
-  }"
->
+<nav class="navbar navbar-expand navbar-dark" [ngClass]="{ 'nav-background-alt': selfHosted }">
  <div class="container">
    <a class="navbar-brand" routerLink="/" appA11yTitle="{{ 'pageTitle' | i18n: 'Bitwarden' }}">
-      <i class="fa fa-shield" aria-hidden="true"></i>
+      <i class="bwi bwi-shield" aria-hidden="true"></i>
    </a>
    <div class="collapse navbar-collapse">
      <ul class="navbar-nav">
@@ -44,7 +39,7 @@
          aria-haspopup="true"
          aria-expanded="false"
        >
-          <i class="fa fa-user-circle fa-lg" aria-hidden="true"></i>
+          <i class="bwi bwi-user-circle bwi-lg" aria-hidden="true"></i>
        </a>
        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-profile">
          <div class="dropdown-item-text d-flex align-items-center" *ngIf="name" appStopProp>
@@ -62,11 +57,11 @@
          </div>
          <div class="dropdown-divider"></div>
          <a class="dropdown-item" href="#" routerLink="/settings/account">
-            <i class="fa fa-fw fa-user" aria-hidden="true"></i>
+            <i class="bwi bwi-fw bwi-user" aria-hidden="true"></i>
            {{ "myAccount" | i18n }}
          </a>
          <a class="dropdown-item" href="https://help.bitwarden.com" target="_blank" rel="noopener">
-            <i class="fa fa-fw fa-question-circle" aria-hidden="true"></i>
+            <i class="bwi bwi-fw bwi-question-circle" aria-hidden="true"></i>
            {{ "getHelp" | i18n }}
          </a>
          <a
@@ -75,16 +70,16 @@
            target="_blank"
            rel="noopener"
          >
-            <i class="fa fa-fw fa-download" aria-hidden="true"></i>
+            <i class="bwi bwi-fw bwi-download" aria-hidden="true"></i>
            {{ "getApps" | i18n }}
          </a>
          <div class="dropdown-divider"></div>
          <button type="button" class="dropdown-item" (click)="lock()">
-            <i class="fa fa-fw fa-lock" aria-hidden="true"></i>
+            <i class="bwi bwi-fw bwi-lock" aria-hidden="true"></i>
            {{ "lockNow" | i18n }}
          </button>
          <button type="button" class="dropdown-item" (click)="logOut()">
-            <i class="fa fa-fw fa-sign-out" aria-hidden="true"></i>
+            <i class="bwi bwi-fw bwi-sign-out" aria-hidden="true"></i>
            {{ "logOut" | i18n }}
          </button>
        </div>
--- a/src/app/layouts/organization-layout.component.html
+++ b/src/app/layouts/organization-layout.component.html
@@ -13,7 +13,7 @@
          *ngIf="!organization.enabled"
        >
          <div class="card-body py-2">
-            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+            <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
            {{ "organizationIsDisabled" | i18n }}
          </div>
        </div>
@@ -22,7 +22,7 @@
          *ngIf="organization.isProviderUser"
        >
          <div class="card-body py-2">
-            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+            <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
            {{ "accessingUsingProvider" | i18n: organization.providerName }}
          </div>
        </div>
@@ -30,25 +30,25 @@
      <ul class="nav nav-tabs" *ngIf="showMenuBar">
        <li class="nav-item">
          <a class="nav-link" routerLink="vault" routerLinkActive="active">
-            <i class="fa fa-lock" aria-hidden="true"></i>
+            <i class="bwi bwi-lock" aria-hidden="true"></i>
            {{ "vault" | i18n }}
          </a>
        </li>
        <li class="nav-item" *ngIf="showManageTab">
          <a class="nav-link" [routerLink]="manageRoute" routerLinkActive="active">
-            <i class="fa fa-sliders" aria-hidden="true"></i>
+            <i class="bwi bwi-sliders" aria-hidden="true"></i>
            {{ "manage" | i18n }}
          </a>
        </li>
        <li class="nav-item" *ngIf="showToolsTab">
          <a class="nav-link" [routerLink]="toolsRoute" routerLinkActive="active">
-            <i class="fa fa-wrench" aria-hidden="true"></i>
+            <i class="bwi bwi-wrench" aria-hidden="true"></i>
            {{ "tools" | i18n }}
          </a>
        </li>
        <li class="nav-item" *ngIf="organization.isOwner">
          <a class="nav-link" routerLink="settings" routerLinkActive="active">
-            <i class="fa fa-cogs" aria-hidden="true"></i>
+            <i class="bwi bwi-cogs" aria-hidden="true"></i>
            {{ "settings" | i18n }}
          </a>
        </li>
--- a/src/app/organizations/manage/bulk/bulk-confirm.component.html
+++ b/src/app/organizations/manage/bulk/bulk-confirm.component.html
@@ -16,7 +16,7 @@
      </div>
      <div class="modal-body">
        <div class="card-body text-center" *ngIf="loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          {{ "loading" | i18n }}
        </div>
        <app-callout type="danger" *ngIf="filteredUsers.length <= 0">
@@ -28,11 +28,7 @@
        <ng-container *ngIf="!loading && !done">
          <p>
            {{ "fingerprintEnsureIntegrityVerify" | i18n }}
-            <a
-              href="https://help.bitwarden.com/article/fingerprint-phrase/"
-              target="_blank"
-              rel="noopener"
-            >
+            <a href="https://bitwarden.com/help/fingerprint-phrase/" target="_blank" rel="noopener">
              {{ "learnMore" | i18n }}</a
            >
          </p>
@@ -51,7 +47,8 @@
                  size="25"
                  [circle]="true"
                  [fontSize]="14"
-                ></app-avatar>
+                >
+                </app-avatar>
              </td>
              <td>
                {{ user.email }}
@@ -69,7 +66,8 @@
                  size="25"
                  [circle]="true"
                  [fontSize]="14"
-                ></app-avatar>
+                >
+                </app-avatar>
              </td>
              <td>
                {{ user.email }}
@@ -97,7 +95,8 @@
                  size="25"
                  [circle]="true"
                  [fontSize]="14"
-                ></app-avatar>
+                >
+                </app-avatar>
              </td>
              <td>
                {{ user.email }}
@@ -121,7 +120,7 @@
          [disabled]="loading"
          (click)="submit()"
        >
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "confirm" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/organizations/manage/bulk/bulk-remove.component.html
+++ b/src/app/organizations/manage/bulk/bulk-remove.component.html
@@ -39,7 +39,8 @@
                  size="25"
                  [circle]="true"
                  [fontSize]="14"
-                ></app-avatar>
+                >
+                </app-avatar>
              </td>
              <td>
                {{ user.email }}
@@ -64,7 +65,8 @@
                  size="25"
                  [circle]="true"
                  [fontSize]="14"
-                ></app-avatar>
+                >
+                </app-avatar>
              </td>
              <td>
                {{ user.email }}
@@ -88,7 +90,7 @@
          [disabled]="loading"
          (click)="submit()"
        >
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "removeUsers" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/organizations/manage/bulk/bulk-status.component.html
+++ b/src/app/organizations/manage/bulk/bulk-status.component.html
@@ -16,7 +16,7 @@
      </div>
      <div class="modal-body">
        <div class="card-body text-center" *ngIf="loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          {{ "loading" | i18n }}
        </div>
        <table class="table table-hover table-list" *ngIf="!loading">
--- a/src/app/organizations/manage/collection-add-edit.component.html
+++ b/src/app/organizations/manage/collection-add-edit.component.html
@@ -20,7 +20,7 @@
      </div>
      <div class="modal-body" *ngIf="loading">
        <i
-          class="fa fa-spinner fa-spin text-muted"
+          class="bwi bwi-spinner bwi-spin text-muted"
          title="{{ 'loading' | i18n }}"
          aria-hidden="true"
        ></i>
@@ -91,7 +91,7 @@
                  {{ g.name }}
                  <ng-container *ngIf="g.accessAll">
                    <i
-                      class="fa fa-th text-muted fa-fw"
+                      class="bwi bwi-filter text-muted bwi-fw"
                      title="{{ 'groupAccessAllItems' | i18n }}"
                      aria-hidden="true"
                    ></i>
@@ -126,7 +126,7 @@
          [disabled]="form.loading"
          *ngIf="this.canSave"
        >
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "save" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
@@ -144,12 +144,12 @@
            [appApiAction]="deletePromise"
          >
            <i
-              class="fa fa-trash-o fa-lg fa-fw"
+              class="bwi bwi-trash bwi-lg bwi-fw"
              [hidden]="deleteBtn.loading"
              aria-hidden="true"
            ></i>
            <i
-              class="fa fa-spinner fa-spin fa-lg fa-fw"
+              class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
              [hidden]="!deleteBtn.loading"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
--- a/src/app/organizations/manage/collections.component.html
+++ b/src/app/organizations/manage/collections.component.html
@@ -17,13 +17,17 @@
      class="btn btn-sm btn-outline-primary ml-3"
      (click)="add()"
    >
-      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
      {{ "newCollection" | i18n }}
    </button>
  </div>
 </div>
 <ng-container *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container
@@ -58,7 +62,7 @@
              aria-expanded="false"
              appA11yTitle="{{ 'options' | i18n }}"
            >
-              <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
+              <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
            </button>
            <div class="dropdown-menu dropdown-menu-right">
              <a
@@ -68,7 +72,7 @@
                *ngIf="this.canEdit(c)"
                (click)="users(c)"
              >
-                <i class="fa fa-fw fa-users" aria-hidden="true"></i>
+                <i class="bwi bwi-fw bwi-users" aria-hidden="true"></i>
                {{ "users" | i18n }}
              </a>
              <a
@@ -78,7 +82,7 @@
                *ngIf="this.canDelete(c)"
                (click)="delete(c)"
              >
-                <i class="fa fa-fw fa-trash-o" aria-hidden="true"></i>
+                <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
                {{ "delete" | i18n }}
              </a>
            </div>
--- a/src/app/organizations/manage/entity-events.component.html
+++ b/src/app/organizations/manage/entity-events.component.html
@@ -17,7 +17,7 @@
      </div>
      <div class="modal-body" *ngIf="!loaded">
        <i
-          class="fa fa-spinner fa-spin text-muted"
+          class="bwi bwi-spinner bwi-spin text-muted"
          title="{{ 'loading' | i18n }}"
          aria-hidden="true"
        ></i>
@@ -55,8 +55,8 @@
            [disabled]="loaded && refreshBtn.loading"
          >
            <i
-              class="fa fa-refresh fa-fw"
-              [ngClass]="{ 'fa-spin': loaded && refreshBtn.loading }"
+              class="bwi bwi-refresh bwi-fw"
+              [ngClass]="{ 'bwi-spin': loaded && refreshBtn.loading }"
              aria-hidden="true"
            ></i>
            {{ "refresh" | i18n }}
@@ -82,7 +82,7 @@
              <td>{{ e.date | date: "medium" }}</td>
              <td>
                <i
-                  class="text-muted fa fa-lg {{ e.appIcon }}"
+                  class="text-muted bwi bwi-lg {{ e.appIcon }}"
                  title="{{ e.appName }}, {{ e.ip }}"
                  aria-hidden="true"
                ></i>
@@ -104,7 +104,7 @@
          [disabled]="loaded && moreBtn.loading"
          *ngIf="continuationToken"
        >
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "loadMore" | i18n }}</span>
        </button>
      </div>
--- a/src/app/organizations/manage/entity-users.component.html
+++ b/src/app/organizations/manage/entity-users.component.html
@@ -23,7 +23,7 @@
      </div>
      <div class="modal-body" *ngIf="loading || !users">
        <i
-          class="fa fa-spinner fa-spin text-muted"
+          class="bwi bwi-spinner bwi-spin text-muted"
          title="{{ 'loading' | i18n }}"
          aria-hidden="true"
        ></i>
@@ -109,7 +109,8 @@
                    size="25"
                    [circle]="true"
                    [fontSize]="14"
-                  ></app-avatar>
+                  >
+                  </app-avatar>
                </td>
                <td>
                  {{ u.email }}
@@ -128,7 +129,7 @@
                <td *ngIf="entity === 'collection'">
                  <ng-container *ngIf="u.accessAll">
                    <i
-                      class="fa fa-th"
+                      class="bwi bwi-filter"
                      title="{{ 'userAccessAllItems' | i18n }}"
                      aria-hidden="true"
                    ></i>
@@ -167,7 +168,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "save" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/organizations/manage/events.component.html
+++ b/src/app/organizations/manage/events.component.html
@@ -32,9 +32,9 @@
        [disabled]="loaded && refreshForm.loading"
      >
        <i
-          class="fa fa-refresh fa-fw"
+          class="bwi bwi-refresh bwi-fw"
          aria-hidden="true"
-          [ngClass]="{ 'fa-spin': loaded && refreshForm.loading }"
+          [ngClass]="{ 'bwi-spin': loaded && refreshForm.loading }"
        ></i>
        {{ "refresh" | i18n }}
      </button>
@@ -47,14 +47,18 @@
        (click)="exportEvents()"
        [disabled]="(loaded && exportForm.loading) || dirtyDates"
      >
-        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+        <i class="bwi bwi-spinner bwi-spin" aria-hidden="true"></i>
        <span>{{ "export" | i18n }}</span>
      </button>
    </form>
  </div>
 </div>
 <ng-container *ngIf="!loaded">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container *ngIf="loaded">
@@ -75,7 +79,7 @@
        <td>{{ e.date | date: "medium" }}</td>
        <td>
          <i
-            class="text-muted fa fa-lg {{ e.appIcon }}"
+            class="text-muted bwi bwi-lg {{ e.appIcon }}"
            title="{{ e.appName }}, {{ e.ip }}"
            aria-hidden="true"
          ></i>
@@ -97,7 +101,7 @@
    [disabled]="loaded && moreBtn.loading"
    *ngIf="continuationToken"
  >
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "loadMore" | i18n }}</span>
  </button>
 </ng-container>
--- a/src/app/organizations/manage/group-add-edit.component.html
+++ b/src/app/organizations/manage/group-add-edit.component.html
@@ -20,7 +20,7 @@
      </div>
      <div class="modal-body" *ngIf="loading">
        <i
-          class="fa fa-spinner fa-spin text-muted"
+          class="bwi bwi-spinner bwi-spin text-muted"
          title="{{ 'loading' | i18n }}"
          aria-hidden="true"
        ></i>
@@ -56,9 +56,9 @@
              target="_blank"
              rel="noopener"
              appA11yTitle="{{ 'learnMore' | i18n }}"
-              href="https://bitwarden.com/help/article/user-types-access-control/#access-control"
+              href="https://bitwarden.com/help/user-types-access-control/#access-control"
            >
-              <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+              <i class="bwi bwi-question-circle" aria-hidden="true"></i>
            </a>
          </div>
          <div class="ml-auto" *ngIf="access === 'selected' && collections && collections.length">
@@ -150,7 +150,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "save" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
@@ -168,12 +168,12 @@
            [appApiAction]="deletePromise"
          >
            <i
-              class="fa fa-trash-o fa-lg fa-fw"
+              class="bwi bwi-trash bwi-lg bwi-fw"
              [hidden]="deleteBtn.loading"
              aria-hidden="true"
            ></i>
            <i
-              class="fa fa-spinner fa-spin fa-lg fa-fw"
+              class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
              [hidden]="!deleteBtn.loading"
              aria-hidden="true"
              title="{{ 'loading' | i18n }}"
--- a/src/app/organizations/manage/groups.component.html
+++ b/src/app/organizations/manage/groups.component.html
@@ -12,13 +12,17 @@
      />
    </div>
    <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="add()">
-      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
      {{ "newGroup" | i18n }}
    </button>
  </div>
 </div>
 <ng-container *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container
@@ -51,15 +55,15 @@
              aria-expanded="false"
              appA11yTitle="{{ 'options' | i18n }}"
            >
-              <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
+              <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
            </button>
            <div class="dropdown-menu dropdown-menu-right">
              <a class="dropdown-item" href="#" appStopClick (click)="users(g)">
-                <i class="fa fa-fw fa-users" aria-hidden="true"></i>
+                <i class="bwi bwi-fw bwi-users" aria-hidden="true"></i>
                {{ "users" | i18n }}
              </a>
              <a class="dropdown-item text-danger" href="#" appStopClick (click)="delete(g)">
-                <i class="fa fa-fw fa-trash-o" aria-hidden="true"></i>
+                <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
                {{ "delete" | i18n }}
              </a>
            </div>
--- a/src/app/organizations/manage/people.component.html
+++ b/src/app/organizations/manage/people.component.html
@@ -52,11 +52,11 @@
        aria-expanded="false"
        appA11yTitle="{{ 'options' | i18n }}"
      >
-        <i class="fa fa-cog" aria-hidden="true"></i>
+        <i class="bwi bwi-cog" aria-hidden="true"></i>
      </button>
      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bulkActionsButton">
        <button class="dropdown-item" appStopClick (click)="bulkReinvite()">
-          <i class="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
          {{ "reinviteSelected" | i18n }}
        </button>
        <button
@@ -65,32 +65,36 @@
          (click)="bulkConfirm()"
          *ngIf="showBulkConfirmUsers"
        >
-          <i class="fa fa-fw fa-check" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
          {{ "confirmSelected" | i18n }}
        </button>
        <button class="dropdown-item text-danger" appStopClick (click)="bulkRemove()">
-          <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
          {{ "remove" | i18n }}
        </button>
        <div class="dropdown-divider"></div>
        <button class="dropdown-item" appStopClick (click)="selectAll(true)">
-          <i class="fa fa-fw fa-check-square-o" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-check-square" aria-hidden="true"></i>
          {{ "selectAll" | i18n }}
        </button>
        <button class="dropdown-item" appStopClick (click)="selectAll(false)">
-          <i class="fa fa-fw fa-minus-square-o" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-minus-square" aria-hidden="true"></i>
          {{ "unselectAll" | i18n }}
        </button>
      </div>
    </div>
    <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="invite()">
-      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
      {{ "inviteUser" | i18n }}
    </button>
  </div>
 </div>
 <ng-container *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container
@@ -104,7 +108,7 @@
    <app-callout
      type="info"
      title="{{ 'confirmUsers' | i18n }}"
-      icon="fa-check-circle"
+      icon="bwi bwi-check-circle"
      *ngIf="showConfirmUsers"
    >
      {{ "usersNeedConfirmed" | i18n }}
@@ -128,7 +132,8 @@
              size="25"
              [circle]="true"
              [fontSize]="14"
-            ></app-avatar>
+            >
+            </app-avatar>
          </td>
          <td>
            <a href="#" appStopClick (click)="edit(u)">{{ u.email }}</a>
@@ -142,12 +147,16 @@
          </td>
          <td>
            <ng-container *ngIf="u.twoFactorEnabled">
-              <i class="fa fa-lock" title="{{ 'userUsingTwoStep' | i18n }}" aria-hidden="true"></i>
+              <i
+                class="bwi bwi-lock"
+                title="{{ 'userUsingTwoStep' | i18n }}"
+                aria-hidden="true"
+              ></i>
              <span class="sr-only">{{ "userUsingTwoStep" | i18n }}</span>
            </ng-container>
            <ng-container *ngIf="showEnrolledStatus(u)">
              <i
-                class="fa fa-key"
+                class="bwi bwi-key"
                title="{{ 'enrolledPasswordReset' | i18n }}"
                aria-hidden="true"
              ></i>
@@ -171,7 +180,7 @@
                aria-expanded="false"
                appA11yTitle="{{ 'options' | i18n }}"
              >
-                <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
+                <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
              </button>
              <div class="dropdown-menu dropdown-menu-right">
                <a
@@ -181,7 +190,7 @@
                  (click)="reinvite(u)"
                  *ngIf="u.status === userStatusType.Invited"
                >
-                  <i class="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
                  {{ "resendInvitation" | i18n }}
                </a>
                <a
@@ -191,7 +200,7 @@
                  (click)="confirm(u)"
                  *ngIf="u.status === userStatusType.Accepted"
                >
-                  <i class="fa fa-fw fa-check" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
                  {{ "confirm" | i18n }}
                </a>
                <a
@@ -201,7 +210,7 @@
                  (click)="groups(u)"
                  *ngIf="accessGroups"
                >
-                  <i class="fa fa-fw fa-sitemap" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-sitemap" aria-hidden="true"></i>
                  {{ "groups" | i18n }}
                </a>
                <a
@@ -211,7 +220,7 @@
                  (click)="events(u)"
                  *ngIf="accessEvents && u.status === userStatusType.Confirmed"
                >
-                  <i class="fa fa-fw fa-file-text-o" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
                  {{ "eventLogs" | i18n }}
                </a>
                <a
@@ -221,11 +230,11 @@
                  (click)="resetPassword(u)"
                  *ngIf="allowResetPassword(u)"
                >
-                  <i class="fa fa-fw fa-key" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-key" aria-hidden="true"></i>
                  {{ "resetPassword" | i18n }}
                </a>
                <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(u)">
-                  <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
                  {{ "remove" | i18n }}
                </a>
              </div>
--- a/src/app/organizations/manage/policies.component.html
+++ b/src/app/organizations/manage/policies.component.html
@@ -2,7 +2,11 @@
  <h1>{{ "policies" | i18n }}</h1>
 </div>
 <ng-container *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <table class="table table-hover table-list" *ngIf="!loading">
--- a/src/app/organizations/manage/policy-edit.component.html
+++ b/src/app/organizations/manage/policy-edit.component.html
@@ -24,7 +24,7 @@
      <div class="modal-body">
        <div class="modal-body" *ngIf="loading">
          <i
-            class="fa fa-spinner fa-spin text-muted"
+            class="bwi bwi-spinner bwi-spin text-muted"
            title="{{ 'loading' | i18n }}"
            aria-hidden="true"
          ></i>
@@ -37,7 +37,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "save" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/organizations/manage/reset-password.component.html
+++ b/src/app/organizations/manage/reset-password.component.html
@@ -33,12 +33,12 @@
              <div class="ml-auto d-flex">
                <a
                  href="#"
-                  class="d-block mr-2 fa-icon-above-input"
+                  class="d-block mr-2 bwi-icon-above-input"
                  appStopClick
                  appA11yTitle="{{ 'generatePassword' | i18n }}"
                  (click)="generatePassword()"
                >
-                  <i class="fa fa-lg fa-fw fa-refresh" aria-hidden="true"></i>
+                  <i class="bwi bwi-lg bwi-fw bwi-refresh" aria-hidden="true"></i>
                </a>
              </div>
            </div>
@@ -63,9 +63,9 @@
                  (click)="togglePassword()"
                >
                  <i
-                    class="fa fa-lg"
+                    class="bwi bwi-lg"
                    aria-hidden="true"
-                    [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                    [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                  ></i>
                </button>
                <button
@@ -74,7 +74,7 @@
                  appA11yTitle="{{ 'copyPassword' | i18n }}"
                  (click)="copy(newPassword)"
                >
-                  <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+                  <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
                </button>
              </div>
            </div>
@@ -85,7 +85,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "save" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/organizations/manage/user-add-edit.component.html
+++ b/src/app/organizations/manage/user-add-edit.component.html
@@ -23,7 +23,7 @@
      </div>
      <div class="modal-body" *ngIf="loading">
        <i
-          class="fa fa-spinner fa-spin text-muted"
+          class="bwi bwi-spinner bwi-spin text-muted"
          title="{{ 'loading' | i18n }}"
          aria-hidden="true"
        ></i>
@@ -52,9 +52,9 @@
            target="_blank"
            rel="noopener"
            appA11yTitle="{{ 'learnMore' | i18n }}"
-            href="https://bitwarden.com/help/article/user-types-access-control/#user-types"
+            href="https://bitwarden.com/help/provider-users/"
          >
-            <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+            <i class="bwi bwi-question-circle" aria-hidden="true"></i>
          </a>
        </h3>
        <div class="form-check mt-2 form-check-block">
@@ -277,9 +277,9 @@
              target="_blank"
              rel="noopener"
              appA11yTitle="{{ 'learnMore' | i18n }}"
-              href="https://bitwarden.com/help/article/user-types-access-control/#access-control"
+              href="https://bitwarden.com/help/user-types-access-control/#access-control"
            >
-              <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+              <i class="bwi bwi-question-circle" aria-hidden="true"></i>
            </a>
          </div>
          <div class="ml-auto" *ngIf="access === 'selected' && collections && collections.length">
@@ -371,7 +371,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "save" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
@@ -389,12 +389,12 @@
            [appApiAction]="deletePromise"
          >
            <i
-              class="fa fa-trash-o fa-lg fa-fw"
+              class="bwi bwi-trash bwi-lg bwi-fw"
              [hidden]="deleteBtn.loading"
              aria-hidden="true"
            ></i>
            <i
-              class="fa fa-spinner fa-spin fa-lg fa-fw"
+              class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
              [hidden]="!deleteBtn.loading"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
--- a/src/app/organizations/manage/user-confirm.component.html
+++ b/src/app/organizations/manage/user-confirm.component.html
@@ -18,11 +18,7 @@
      <div class="modal-body">
        <p>
          {{ "fingerprintEnsureIntegrityVerify" | i18n }}
-          <a
-            href="https://help.bitwarden.com/article/fingerprint-phrase/"
-            target="_blank"
-            rel="noopener"
-          >
+          <a href="https://bitwarden.com/help/fingerprint-phrase/" target="_blank" rel="noopener">
            {{ "learnMore" | i18n }}</a
          >
        </p>
@@ -44,7 +40,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "confirm" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/organizations/manage/user-groups.component.html
+++ b/src/app/organizations/manage/user-groups.component.html
@@ -17,7 +17,7 @@
      </div>
      <div class="modal-body" *ngIf="loading">
        <i
-          class="fa fa-spinner fa-spin text-muted"
+          class="bwi bwi-spinner bwi-spin text-muted"
          title="{{ 'loading' | i18n }}"
          aria-hidden="true"
        ></i>
@@ -48,7 +48,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "save" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/organizations/settings/account.component.html
+++ b/src/app/organizations/settings/account.component.html
@@ -2,7 +2,11 @@
  <h1>{{ "myOrganization" | i18n }}</h1>
 </div>
 <div *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </div>
 <form
@@ -63,7 +67,7 @@
    </div>
  </div>
  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "save" | i18n }}</span>
  </button>
 </form>
@@ -89,7 +93,11 @@
 </div>
 <p>{{ "taxInformationDesc" | i18n }}</p>
 <div *ngIf="!org || loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </div>
 <form
@@ -101,7 +109,7 @@
 >
  <app-tax-info></app-tax-info>
  <button type="submit" class="btn btn-primary btn-submit" [disabled]="formTax.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "save" | i18n }}</span>
  </button>
 </form>
--- a/src/app/organizations/settings/adjust-subscription.component.html
+++ b/src/app/organizations/settings/adjust-subscription.component.html
@@ -57,7 +57,7 @@
      </div>
    </div>
    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-      <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+      <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
      <span>{{ "save" | i18n }}</span>
    </button>
  </div>
--- a/src/app/organizations/settings/delete-organization.component.html
+++ b/src/app/organizations/settings/delete-organization.component.html
@@ -26,7 +26,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "deleteOrganization" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/organizations/settings/download-license.component.html
+++ b/src/app/organizations/settings/download-license.component.html
@@ -13,9 +13,9 @@
            target="_blank"
            rel="noopener"
            appA11yTitle="{{ 'learnMore' | i18n }}"
-            href="https://help.bitwarden.com/article/licensing-on-premise/#organization-account-sharing"
+            href="https://bitwarden.com/help/licensing-on-premise/#organization-account-sharing"
          >
-            <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+            <i class="bwi bwi-question-circle" aria-hidden="true"></i>
          </a>
        </div>
        <input
@@ -29,7 +29,7 @@
      </div>
    </div>
    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-      <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+      <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
      <span>{{ "submit" | i18n }}</span>
    </button>
    <button type="button" class="btn btn-outline-secondary" (click)="cancel()">
--- a/src/app/organizations/settings/organization-subscription.component.html
+++ b/src/app/organizations/settings/organization-subscription.component.html
@@ -3,7 +3,7 @@
    {{ "subscription" | i18n }}
    <small *ngIf="firstLoaded && loading">
      <i
-        class="fa fa-spinner fa-spin text-muted"
+        class="bwi bwi-spinner bwi-spin text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
@@ -12,7 +12,7 @@
  </h1>
 </div>
 <ng-container *ngIf="!firstLoaded && loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}"></i>
+  <i class="bwi bwi-spinner bwi-spin text-muted" title="{{ 'loading' | i18n }}"></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>

@@ -38,7 +38,7 @@
      [appApiAction]="reinstatePromise"
      [disabled]="reinstateBtn.loading"
    >
-      <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+      <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
      <span>{{ "reinstateSubscription" | i18n }}</span>
    </button>
  </app-callout>
@@ -138,7 +138,7 @@
      [disabled]="removeSponsorshipBtn.loading"
      *ngIf="isSponsoredSubscription"
    >
-      <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+      <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
      <span>{{ "removeSponsorship" | i18n }}</span>
    </button>
    <h2 class="spaced-header">{{ "storage" | i18n }}</h2>
@@ -204,7 +204,7 @@
        [disabled]="cancelBtn.loading"
        *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel"
      >
-        <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+        <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
        <span>{{ "cancelSubscription" | i18n }}</span>
      </button>
    </div>
@@ -224,7 +224,7 @@
      <dd *ngIf="sub.expiration">
        {{ sub.expiration | date: "mediumDate" }}
        <span *ngIf="isExpired" class="text-danger ml-2">
-          <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+          <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
          {{ "licenseIsExpired" | i18n }}
        </span>
      </dd>
--- a/src/app/organizations/sponsorships/families-for-enterprise-setup.component.html
+++ b/src/app/organizations/sponsorships/families-for-enterprise-setup.component.html
@@ -4,7 +4,7 @@
  </div>
  <div *ngIf="loading" class="mt-5 d-flex justify-content-center">
    <i
-      class="fa fa-spinner fa-spin fa-2x text-muted"
+      class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
      title="{{ 'loading' | i18n }}"
      aria-hidden="true"
    ></i>
@@ -42,7 +42,7 @@
    </div>
    <div class="form-group col-6" *ngIf="!showNewOrganization">
      <button class="btn btn-primary mt-2 btn-submit" [disabled]="form.loading" type="submit">
-        <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+        <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
        <span>{{ "acceptOffer" | i18n }}</span>
      </button>
    </div>
--- a/src/app/organizations/tools/tools.component.html
+++ b/src/app/organizations/tools/tools.component.html
@@ -1,7 +1,7 @@
 <div class="container page-content">
  <ng-container *ngIf="loading">
    <i
-      class="fa fa-spinner fa-spin text-muted"
+      class="bwi bwi-spinner bwi-spin text-muted"
      title="{{ 'loading' | i18n }}"
      aria-hidden="true"
    ></i>
--- a/src/app/organizations/vault/vault.component.html
+++ b/src/app/organizations/vault/vault.component.html
@@ -20,7 +20,7 @@
          <small #actionSpinner [appApiAction]="ciphersComponent.actionPromise">
            <ng-container *ngIf="actionSpinner.loading">
              <i
-                class="fa fa-spinner fa-spin text-muted"
+                class="bwi bwi-spinner bwi-spin text-muted"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
@@ -41,11 +41,11 @@
            (click)="addCipher()"
            *ngIf="!deleted"
          >
-            <i class="fa fa-plus fa-fw" aria-hidden="true"></i>{{ "addItem" | i18n }}
+            <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>{{ "addItem" | i18n }}
          </button>
        </div>
      </div>
-      <app-callout type="warning" *ngIf="deleted" icon="fa-warning">
+      <app-callout type="warning" *ngIf="deleted" icon="bwi bwi-exclamation-triangle">
        {{ trashCleanupWarning }}
      </app-callout>
      <app-org-vault-ciphers
--- a/src/app/oss-routing.module.ts
+++ b/src/app/oss-routing.module.ts
@@ -17,6 +17,7 @@ import { RemovePasswordComponent } from "./accounts/remove-password.component";
 import { SetPasswordComponent } from "./accounts/set-password.component";
 import { SsoComponent } from "./accounts/sso.component";
 import { TwoFactorComponent } from "./accounts/two-factor.component";
+import { UpdatePasswordComponent } from "./accounts/update-password.component";
 import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
 import { VerifyEmailTokenComponent } from "./accounts/verify-email-token.component";
 import { VerifyRecoverDeleteComponent } from "./accounts/verify-recover-delete.component";
@@ -162,6 +163,12 @@ const routes: Routes = [
        canActivate: [AuthGuardService],
        data: { titleId: "updateTempPassword" },
      },
+      {
+        path: "update-password",
+        component: UpdatePasswordComponent,
+        canActivate: [AuthGuardService],
+        data: { titleId: "updatePassword" },
+      },
      {
        path: "remove-password",
        component: RemovePasswordComponent,
--- a/src/app/oss.module.ts
+++ b/src/app/oss.module.ts
@@ -30,6 +30,7 @@ import { SetPasswordComponent } from "./accounts/set-password.component";
 import { SsoComponent } from "./accounts/sso.component";
 import { TwoFactorOptionsComponent } from "./accounts/two-factor-options.component";
 import { TwoFactorComponent } from "./accounts/two-factor.component";
+import { UpdatePasswordComponent } from "./accounts/update-password.component";
 import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
 import { VerifyEmailTokenComponent } from "./accounts/verify-email-token.component";
 import { VerifyRecoverDeleteComponent } from "./accounts/verify-recover-delete.component";
@@ -431,6 +432,7 @@ registerLocaleData(localeZhTw, "zh-TW");
    UpdateKeyComponent,
    UpdateLicenseComponent,
    UpdateTempPasswordComponent,
+    UpdatePasswordComponent,
    UserBillingComponent,
    UserLayoutComponent,
    UserSubscriptionComponent,
--- a/src/app/providers/providers.component.html
+++ b/src/app/providers/providers.component.html
@@ -1,16 +1,16 @@
 <ng-container *ngIf="vault">
  <p *ngIf="!loaded" class="text-muted">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span class="sr-only">{{ "loading" | i18n }}</span>
  </p>
  <ng-container *ngIf="loaded">
-    <ul class="fa-ul card-ul carets" *ngIf="providers && providers.length">
+    <ul class="bwi-ul card-ul carets" *ngIf="providers && providers.length">
      <li *ngFor="let p of providers">
        <a [routerLink]="['/providers', p.id]" class="text-body">
-          <i class="fa-li fa fa-caret-right" aria-hidden="true"></i> {{ p.name }}
+          <i class="bwi bwi-li bwi-caret-right" aria-hidden="true"></i> {{ p.name }}
          <ng-container *ngIf="!p.enabled">
            <i
-              class="fa fa-exclamation-triangle text-danger"
+              class="bwi bwi-exclamation-triangle text-danger"
              title="{{ 'providerIsDisabled' | i18n }}"
              aria-hidden="true"
            ></i>
@@ -28,7 +28,7 @@
      <h1>{{ "providers" | i18n }}</h1>
    </div>
    <p *ngIf="!loaded" class="text-muted">
-      <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+      <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
      <span class="sr-only">{{ "loading" | i18n }}</span>
    </p>
    <ng-container *ngIf="loaded">
@@ -42,7 +42,7 @@
              <a href="#" [routerLink]="['/providers', p.id]">{{ p.name }}</a>
              <ng-container *ngIf="!p.enabled">
                <i
-                  class="fa fa-exclamation-triangle text-danger"
+                  class="bwi bwi-exclamation-triangle text-danger"
                  title="{{ 'providerIsDisabled' | i18n }}"
                  aria-hidden="true"
                ></i>
--- a/src/app/send/access.component.html
+++ b/src/app/send/access.component.html
@@ -9,7 +9,7 @@
    <div class="col-8" *ngIf="hideEmail">
      <app-callout type="warning" title="{{ 'warning' | i18n }}">
        {{ "viewSendHiddenEmailWarning" | i18n }}
-        <a href="https://bitwarden.com/help/article/receive-send/" target="_blank">{{
+        <a href="https://bitwarden.com/help/receive-send/" target="_blank">{{
          "learnMore" | i18n
        }}</a
        >.
@@ -21,7 +21,7 @@
      <div class="card d-block">
        <div class="card-body" *ngIf="loading" class="text-center">
          <i
-            class="fa fa-spinner fa-spin fa-2x text-muted"
+            class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
            title="{{ 'loading' | i18n }}"
            aria-hidden="true"
          ></i>
@@ -50,10 +50,10 @@
              [disabled]="form.loading"
            >
              <span>
-                <i class="fa fa-sign-in" aria-hidden="true"></i> {{ "continue" | i18n }}
+                <i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "continue" | i18n }}
              </span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
@@ -93,14 +93,14 @@
              *ngIf="send.text.hidden"
            >
              <i
-                class="fa fa-lg"
+                class="bwi bwi-lg"
                aria-hidden="true"
-                [ngClass]="{ 'fa-eye': !showText, 'fa-eye-slash': showText }"
+                [ngClass]="{ 'bwi-eye': !showText, 'bwi-eye-slash': showText }"
              ></i>
              {{ "toggleVisibility" | i18n }}
            </button>
            <button class="btn btn-block btn-link" type="button" (click)="copyText()">
-              <i class="fa fa-copy" aria-hidden="true"></i> {{ "copyValue" | i18n }}
+              <i class="bwi bwi-copy" aria-hidden="true"></i> {{ "copyValue" | i18n }}
            </button>
          </ng-container>
          <!-- File -->
@@ -112,7 +112,7 @@
              (click)="download()"
              *ngIf="!downloading"
            >
-              <i class="fa fa-download" aria-hidden="true"></i>
+              <i class="bwi bwi-download" aria-hidden="true"></i>
              {{ "downloadFile" | i18n }} ({{ send.file.sizeName }})
            </button>
            <button
@@ -122,7 +122,7 @@
              disabled="true"
            >
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/send/add-edit.component.html
+++ b/src/app/send/add-edit.component.html
@@ -151,9 +151,9 @@
          <h3 class="mb-0 mr-2">{{ "options" | i18n }}</h3>
          <a class="mb-1" href="#" appStopClick role="button">
            <i
-              class="fa"
+              class="bwi"
              aria-hidden="true"
-              [ngClass]="{ 'fa-chevron-down': !showOptions, 'fa-chevron-up': showOptions }"
+              [ngClass]="{ 'bwi-angle-down': !showOptions, 'bwi-chevron-up': showOptions }"
            ></i>
          </a>
        </div>
@@ -213,9 +213,9 @@
                    (click)="togglePasswordVisible()"
                  >
                    <i
-                      class="fa fa-lg"
+                      class="bwi bwi-lg"
                      aria-hidden="true"
-                      [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                      [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                    ></i>
                  </button>
                </div>
@@ -272,7 +272,7 @@
          [ngClass]="{ loading: form.loading }"
          [disabled]="form.loading || disableSend"
        >
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "save" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
@@ -290,12 +290,12 @@
            [appApiAction]="deletePromise"
          >
            <i
-              class="fa fa-trash-o fa-lg fa-fw"
+              class="bwi bwi-trash bwi-lg bwi-fw"
              [hidden]="deleteBtn.loading"
              aria-hidden="true"
            ></i>
            <i
-              class="fa fa-spinner fa-spin fa-lg fa-fw"
+              class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
              [hidden]="!deleteBtn.loading"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
--- a/src/app/send/send.component.html
+++ b/src/app/send/send.component.html
@@ -19,23 +19,23 @@
            autocomplete="off"
            appAutofocus
          />
-          <ul class="fa-ul card-ul">
+          <ul class="bwi-ul card-ul">
            <li [ngClass]="{ active: selectedAll }">
              <a href="#" appStopClick (click)="selectAll()">
-                <i class="fa-li fa fa-fw fa-th"></i>{{ "allSends" | i18n }}
+                <i class="bwi bwi-li bwi-fw bwi-filter"></i>{{ "allSends" | i18n }}
              </a>
            </li>
          </ul>
          <h3>{{ "types" | i18n }}</h3>
-          <ul class="fa-ul card-ul">
+          <ul class="bwi-ul card-ul">
            <li [ngClass]="{ active: selectedType === sendType.Text }">
              <a href="#" appStopClick (click)="selectType(sendType.Text)">
-                <i class="fa-li fa fa-fw fa-file-text-o"></i>{{ "sendTypeText" | i18n }}
+                <i class="bwi bwi-li bwi-fw bwi-file-text"></i>{{ "sendTypeText" | i18n }}
              </a>
            </li>
            <li [ngClass]="{ active: selectedType === sendType.File }">
              <a href="#" appStopClick (click)="selectType(sendType.File)">
-                <i class="fa-li fa fa-fw fa-file-o"></i>{{ "sendTypeFile" | i18n }}
+                <i class="bwi bwi-li bwi-fw bwi-file"></i>{{ "sendTypeFile" | i18n }}
              </a>
            </li>
          </ul>
@@ -49,7 +49,7 @@
          <small #actionSpinner [appApiAction]="actionPromise">
            <ng-container *ngIf="actionSpinner.loading">
              <i
-                class="fa fa-spinner fa-spin text-muted"
+                class="bwi bwi-spinner bwi-spin text-muted"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
@@ -64,7 +64,7 @@
            (click)="addSend()"
            [disabled]="disableSend"
          >
-            <i class="fa fa-plus fa-fw" aria-hidden="true"></i>{{ "createSend" | i18n }}
+            <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>{{ "createSend" | i18n }}
          </button>
        </div>
      </div>
@@ -74,15 +74,15 @@
          <tr *ngFor="let s of filteredSends">
            <td class="table-list-icon">
              <div class="icon" aria-hidden="true">
-                <i class="fa fa-fw fa-lg fa-file-o" *ngIf="s.type == sendType.File"></i>
-                <i class="fa fa-fw fa-lg fa-file-text-o" *ngIf="s.type == sendType.Text"></i>
+                <i class="bwi bwi-fw bwi-lg bwi-file" *ngIf="s.type == sendType.File"></i>
+                <i class="bwi bwi-fw bwi-lg bwi-file-text" *ngIf="s.type == sendType.Text"></i>
              </div>
            </td>
            <td class="reduced-lh wrap">
              <a href="#" appStopClick appStopProp (click)="editSend(s)">{{ s.name }}</a>
              <ng-container *ngIf="s.disabled">
                <i
-                  class="fa fa-warning"
+                  class="bwi bwi-exclamation-triangle"
                  appStopProp
                  title="{{ 'disabled' | i18n }}"
                  aria-hidden="true"
@@ -91,7 +91,7 @@
              </ng-container>
              <ng-container *ngIf="s.password">
                <i
-                  class="fa fa-key"
+                  class="bwi bwi-key"
                  appStopProp
                  title="{{ 'password' | i18n }}"
                  aria-hidden="true"
@@ -100,7 +100,7 @@
              </ng-container>
              <ng-container *ngIf="s.maxAccessCountReached">
                <i
-                  class="fa fa-ban"
+                  class="bwi bwi-ban"
                  appStopProp
                  title="{{ 'maxAccessCountReached' | i18n }}"
                  aria-hidden="true"
@@ -109,7 +109,7 @@
              </ng-container>
              <ng-container *ngIf="s.expired">
                <i
-                  class="fa fa-clock-o"
+                  class="bwi bwi-clock"
                  appStopProp
                  title="{{ 'expired' | i18n }}"
                  aria-hidden="true"
@@ -118,7 +118,7 @@
              </ng-container>
              <ng-container *ngIf="s.pendingDelete">
                <i
-                  class="fa fa-trash"
+                  class="bwi bwi-trash"
                  appStopProp
                  title="{{ 'pendingDeletion' | i18n }}"
                  aria-hidden="true"
@@ -139,11 +139,11 @@
                  aria-expanded="false"
                  appA11yTitle="{{ 'options' | i18n }}"
                >
-                  <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
+                  <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
                </button>
                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
                  <a class="dropdown-item" href="#" appStopClick (click)="copy(s)">
-                    <i class="fa fa-fw fa-copy" aria-hidden="true"></i>
+                    <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
                    {{ "copySendLink" | i18n }}
                  </a>
                  <a
@@ -153,11 +153,11 @@
                    (click)="removePassword(s)"
                    *ngIf="s.password && !disableSend"
                  >
-                    <i class="fa fa-fw fa-undo" aria-hidden="true"></i>
+                    <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
                    {{ "removePassword" | i18n }}
                  </a>
                  <a class="dropdown-item text-danger" href="#" appStopClick (click)="delete(s)">
-                    <i class="fa fa-fw fa-trash-o" aria-hidden="true"></i>
+                    <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
                    {{ "delete" | i18n }}
                  </a>
                </div>
@@ -169,7 +169,7 @@
      <div class="no-items" *ngIf="filteredSends && !filteredSends.length">
        <ng-container *ngIf="!loaded">
          <i
-            class="fa fa-spinner fa-spin text-muted"
+            class="bwi bwi-spinner bwi-spin text-muted"
            title="{{ 'loading' | i18n }}"
            aria-hidden="true"
          ></i>
@@ -178,7 +178,7 @@
        <ng-container *ngIf="loaded">
          <p>{{ "noSendsInList" | i18n }}</p>
          <button (click)="addSend()" class="btn btn-outline-primary" [disabled]="disableSend">
-            <i class="fa fa-plus fa-fw"></i>{{ "createSend" | i18n }}
+            <i class="bwi bwi-plus bwi-fw"></i>{{ "createSend" | i18n }}
          </button>
        </ng-container>
      </div>
--- a/src/app/services/event.service.ts
+++ b/src/app/services/event.service.ts
@@ -382,47 +382,50 @@ export class EventService {
  private getAppInfo(deviceType: DeviceType): [string, string] {
    switch (deviceType) {
      case DeviceType.Android:
-        return ["fa-android", this.i18nService.t("mobile") + " - Android"];
+        return ["bwi-android", this.i18nService.t("mobile") + " - Android"];
      case DeviceType.iOS:
-        return ["fa-apple", this.i18nService.t("mobile") + " - iOS"];
+        return ["bwi-apple", this.i18nService.t("mobile") + " - iOS"];
      case DeviceType.UWP:
-        return ["fa-windows", this.i18nService.t("mobile") + " - Windows"];
+        return ["bwi-windows", this.i18nService.t("mobile") + " - Windows"];
      case DeviceType.ChromeExtension:
-        return ["fa-chrome", this.i18nService.t("extension") + " - Chrome"];
+        return ["bwi-chrome", this.i18nService.t("extension") + " - Chrome"];
      case DeviceType.FirefoxExtension:
-        return ["fa-firefox", this.i18nService.t("extension") + " - Firefox"];
+        return ["bwi-firefox", this.i18nService.t("extension") + " - Firefox"];
      case DeviceType.OperaExtension:
-        return ["fa-opera", this.i18nService.t("extension") + " - Opera"];
+        return ["bwi-opera", this.i18nService.t("extension") + " - Opera"];
      case DeviceType.EdgeExtension:
-        return ["fa-edge", this.i18nService.t("extension") + " - Edge"];
+        return ["bwi-edge", this.i18nService.t("extension") + " - Edge"];
      case DeviceType.VivaldiExtension:
-        return ["fa-puzzle-piece", this.i18nService.t("extension") + " - Vivaldi"];
+        return ["bwi-puzzle", this.i18nService.t("extension") + " - Vivaldi"];
      case DeviceType.SafariExtension:
-        return ["fa-safari", this.i18nService.t("extension") + " - Safari"];
+        return ["bwi-safari", this.i18nService.t("extension") + " - Safari"];
      case DeviceType.WindowsDesktop:
-        return ["fa-windows", this.i18nService.t("desktop") + " - Windows"];
+        return ["bwi-windows", this.i18nService.t("desktop") + " - Windows"];
      case DeviceType.MacOsDesktop:
-        return ["fa-apple", this.i18nService.t("desktop") + " - macOS"];
+        return ["bwi-apple", this.i18nService.t("desktop") + " - macOS"];
      case DeviceType.LinuxDesktop:
-        return ["fa-linux", this.i18nService.t("desktop") + " - Linux"];
+        return ["bwi-linux", this.i18nService.t("desktop") + " - Linux"];
      case DeviceType.ChromeBrowser:
-        return ["fa-globe", this.i18nService.t("webVault") + " - Chrome"];
+        return ["bwi-globe", this.i18nService.t("webVault") + " - Chrome"];
      case DeviceType.FirefoxBrowser:
-        return ["fa-globe", this.i18nService.t("webVault") + " - Firefox"];
+        return ["bwi-globe", this.i18nService.t("webVault") + " - Firefox"];
      case DeviceType.OperaBrowser:
-        return ["fa-globe", this.i18nService.t("webVault") + " - Opera"];
+        return ["bwi-globe", this.i18nService.t("webVault") + " - Opera"];
      case DeviceType.SafariBrowser:
-        return ["fa-globe", this.i18nService.t("webVault") + " - Safari"];
+        return ["bwi-globe", this.i18nService.t("webVault") + " - Safari"];
      case DeviceType.VivaldiBrowser:
-        return ["fa-globe", this.i18nService.t("webVault") + " - Vivaldi"];
+        return ["bwi-globe", this.i18nService.t("webVault") + " - Vivaldi"];
      case DeviceType.EdgeBrowser:
-        return ["fa-globe", this.i18nService.t("webVault") + " - Edge"];
+        return ["bwi-globe", this.i18nService.t("webVault") + " - Edge"];
      case DeviceType.IEBrowser:
-        return ["fa-globe", this.i18nService.t("webVault") + " - IE"];
+        return ["bwi-globe", this.i18nService.t("webVault") + " - IE"];
      case DeviceType.UnknownBrowser:
-        return ["fa-globe", this.i18nService.t("webVault") + " - " + this.i18nService.t("unknown")];
+        return [
+          "bwi-globe",
+          this.i18nService.t("webVault") + " - " + this.i18nService.t("unknown"),
+        ];
      default:
-        return ["fa-globe", this.i18nService.t("unknown")];
+        return ["bwi-globe", this.i18nService.t("unknown")];
    }
  }

--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -7,6 +7,7 @@ import { I18nService } from "../../services/i18n.service";
 import { MemoryStorageService } from "../../services/memoryStorage.service";
 import { PasswordRepromptService } from "../../services/passwordReprompt.service";
 import { StateService } from "../../services/state.service";
+import { StateMigrationService } from "../../services/stateMigration.service";
 import { WebPlatformUtilsService } from "../../services/webPlatformUtils.service";

 import { EventService } from "./event.service";
@@ -45,16 +46,23 @@ import { MessagingService as MessagingServiceAbstraction } from "jslib-common/ab
 import { NotificationsService as NotificationsServiceAbstraction } from "jslib-common/abstractions/notifications.service";
 import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "jslib-common/abstractions/platformUtils.service";
-import { StateService as StateServiceAbstraction } from "jslib-common/abstractions/state.service";
+import { StateService as BaseStateServiceAbstraction } from "jslib-common/abstractions/state.service";
 import { StateMigrationService as StateMigrationServiceAbstraction } from "jslib-common/abstractions/stateMigration.service";
 import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "jslib-common/abstractions/vaultTimeout.service";

 import { ThemeType } from "jslib-common/enums/themeType";

+import { Account } from "../../models/account";
+import { GlobalState } from "../../models/globalState";
+
+import { GlobalStateFactory } from "jslib-common/factories/globalStateFactory";
+import { StateFactory } from "jslib-common/factories/stateFactory";
+
+import { StateService as StateServiceAbstraction } from "../../abstractions/state.service";
+
 export function initFactory(
  window: Window,
-  storageService: StorageServiceAbstraction,
  environmentService: EnvironmentServiceAbstraction,
  notificationsService: NotificationsServiceAbstraction,
  vaultTimeoutService: VaultTimeoutService,
@@ -66,12 +74,11 @@ export function initFactory(
  cryptoService: CryptoServiceAbstraction
 ): Function {
  return async () => {
-    await (storageService as HtmlStorageService).init();
    await stateService.init();

    const urls = process.env.URLS as Urls;
    urls.base ??= window.location.origin;
-    environmentService.setUrls(urls, false);
+    environmentService.setUrls(urls);

    setTimeout(() => notificationsService.init(), 3000);

@@ -106,7 +113,6 @@ export function initFactory(
      useFactory: initFactory,
      deps: [
        "WINDOW",
-        StorageServiceAbstraction,
        EnvironmentServiceAbstraction,
        NotificationsServiceAbstraction,
        VaultTimeoutServiceAbstraction,
@@ -176,9 +182,34 @@ export function initFactory(
        StateServiceAbstraction,
      ],
    },
+    {
+      provide: StateMigrationServiceAbstraction,
+      useFactory: (
+        storageService: StorageServiceAbstraction,
+        secureStorageService: StorageServiceAbstraction
+      ) =>
+        new StateMigrationService(
+          storageService,
+          secureStorageService,
+          new StateFactory(GlobalState, Account)
+        ),
+      deps: [StorageServiceAbstraction, "SECURE_STORAGE"],
+    },
    {
      provide: StateServiceAbstraction,
-      useClass: StateService,
+      useFactory: (
+        storageService: StorageServiceAbstraction,
+        secureStorageService: StorageServiceAbstraction,
+        logService: LogService,
+        stateMigrationService: StateMigrationServiceAbstraction
+      ) =>
+        new StateService(
+          storageService,
+          secureStorageService,
+          logService,
+          stateMigrationService,
+          new StateFactory(GlobalState, Account)
+        ),
      deps: [
        StorageServiceAbstraction,
        "SECURE_STORAGE",
@@ -186,6 +217,10 @@ export function initFactory(
        StateMigrationServiceAbstraction,
      ],
    },
+    {
+      provide: BaseStateServiceAbstraction,
+      useExisting: StateServiceAbstraction,
+    },
    {
      provide: PasswordRepromptServiceAbstraction,
      useClass: PasswordRepromptService,
--- a/src/app/settings/add-credit.component.html
+++ b/src/app/settings/add-credit.component.html
@@ -15,7 +15,7 @@
          [(ngModel)]="method"
        />
        <label class="form-check-label" for="credit-method-paypal">
-          <i class="fa fa-fw fa-paypal" aria-hidden="true"></i> PayPal</label
+          <i class="bwi bwi-fw bwi-paypal" aria-hidden="true"></i> PayPal</label
        >
      </div>
      <div class="form-check form-check-inline">
@@ -28,7 +28,7 @@
          [(ngModel)]="method"
        />
        <label class="form-check-label" for="credit-method-bitcoin">
-          <i class="fa fa-fw fa-bitcoin" aria-hidden="true"></i> Bitcoin</label
+          <i class="bwi bwi-fw bwi-bitcoin" aria-hidden="true"></i> Bitcoin</label
        >
      </div>
    </div>
@@ -53,7 +53,7 @@
      <small class="form-text text-muted">{{ "creditDelayed" | i18n }}</small>
    </div>
    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading || ppLoading">
-      <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+      <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
      <span>{{ "submit" | i18n }}</span>
    </button>
    <button type="button" class="btn btn-outline-secondary" (click)="cancel()">
--- a/src/app/settings/adjust-payment.component.html
+++ b/src/app/settings/adjust-payment.component.html
@@ -9,7 +9,7 @@
    <app-payment [hideBank]="!organizationId" [hideCredit]="true"></app-payment>
    <app-tax-info (onCountryChanged)="changeCountry()"></app-tax-info>
    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-      <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+      <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
      <span>{{ "submit" | i18n }}</span>
    </button>
    <button type="button" class="btn btn-outline-secondary" (click)="cancel()">
--- a/src/app/settings/adjust-storage.component.html
+++ b/src/app/settings/adjust-storage.component.html
@@ -29,7 +29,7 @@
      }}
    </div>
    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-      <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+      <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
      <span>{{ "submit" | i18n }}</span>
    </button>
    <button type="button" class="btn btn-outline-secondary" (click)="cancel()">
--- a/src/app/settings/api-key.component.html
+++ b/src/app/settings/api-key.component.html
@@ -32,7 +32,7 @@
        <app-callout
          type="info"
          title="{{ 'oauth2ClientCredentials' | i18n }}"
-          icon="fa-key"
+          icon="bwi bwi-key"
          *ngIf="clientSecret"
        >
          <p class="mb-1">
@@ -60,7 +60,7 @@
          [disabled]="form.loading"
          *ngIf="!clientSecret"
        >
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ (isRotation ? "rotateApiKey" : "viewApiKey") | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/settings/change-email.component.html
+++ b/src/app/settings/change-email.component.html
@@ -55,7 +55,7 @@
    </div>
  </ng-container>
  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span *ngIf="!tokenSent">{{ "continue" | i18n }}</span>
    <span *ngIf="tokenSent">{{ "changeEmail" | i18n }}</span>
  </button>
--- a/src/app/settings/change-kdf.component.html
+++ b/src/app/settings/change-kdf.component.html
@@ -27,7 +27,7 @@
          rel="noopener"
          appA11yTitle="{{ 'learnMore' | i18n }}"
        >
-          <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+          <i class="bwi bwi-question-circle" aria-hidden="true"></i>
        </a>
        <select id="kdf" name="Kdf" [(ngModel)]="kdf" class="form-control" required>
          <option *ngFor="let o of kdfOptions" [ngValue]="o.value">{{ o.name }}</option>
@@ -39,12 +39,12 @@
        <label for="kdfIterations">{{ "kdfIterations" | i18n }}</label>
        <a
          class="ml-auto"
-          href="https://bitwarden.com/help/article/what-encryption-is-used/#pbkdf2"
+          href="https://bitwarden.com/help/what-encryption-is-used/#pbkdf2"
          target="_blank"
          rel="noopener"
          appA11yTitle="{{ 'learnMore' | i18n }}"
        >
-          <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+          <i class="bwi bwi-question-circle" aria-hidden="true"></i>
        </a>
        <input
          id="kdfIterations"
@@ -69,7 +69,7 @@
    </div>
  </div>
  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "changeKdf" | i18n }}</span>
  </button>
 </form>
--- a/src/app/settings/change-password.component.html
+++ b/src/app/settings/change-password.component.html
@@ -74,17 +74,17 @@
        {{ "rotateAccountEncKey" | i18n }}
      </label>
      <a
-        href="https://bitwarden.com/help/article/account-encryption-key/#rotate-your-encryption-key"
+        href="https://bitwarden.com/help/account-encryption-key/#rotate-your-encryption-key"
        target="_blank"
        rel="noopener"
        appA11yTitle="{{ 'learnMore' | i18n }}"
      >
-        <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+        <i class="bwi bwi-question-circle" aria-hidden="true"></i>
      </a>
    </div>
  </div>
  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "changeMasterPassword" | i18n }}</span>
  </button>
 </form>
--- a/src/app/settings/change-password.component.ts
+++ b/src/app/settings/change-password.component.ts
@@ -87,7 +87,7 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
        );
        if (learnMore) {
          this.platformUtilsService.launchUri(
-            "https://help.bitwarden.com/article/attachments/#fixing-old-attachments"
+            "https://bitwarden.com/help/attachments/#add-storage-space"
          );
        }
        this.rotateEncKey = false;
--- a/src/app/settings/deauthorize-sessions.component.html
+++ b/src/app/settings/deauthorize-sessions.component.html
@@ -26,7 +26,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "deauthorizeSessions" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/settings/delete-account.component.html
+++ b/src/app/settings/delete-account.component.html
@@ -26,7 +26,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "deleteAccount" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/settings/domain-rules.component.html
+++ b/src/app/settings/domain-rules.component.html
@@ -6,7 +6,7 @@
  <h2>{{ "customEqDomains" | i18n }}</h2>
  <p *ngIf="loading">
    <i
-      class="fa fa-spinner fa-spin text-muted"
+      class="bwi bwi-spinner bwi-spin text-muted"
      title="{{ 'loading' | i18n }}"
      aria-hidden="true"
    ></i>
@@ -33,22 +33,22 @@
        (click)="remove(i)"
        appA11yTitle="{{ 'remove' | i18n }}"
      >
-        <i class="fa fa-minus-circle fa-lg" aria-hidden="true"></i>
+        <i class="bwi bwi-minus-circle bwi-lg" aria-hidden="true"></i>
      </button>
    </div>
    <button type="button" (click)="add()" class="btn btn-outline-secondary btn-sm mb-2">
-      <i class="fa fa-plus fa-fw" aria-hidden="true"></i> {{ "newCustomDomain" | i18n }}
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i> {{ "newCustomDomain" | i18n }}
    </button>
    <small class="text-muted d-block mb-3">{{ "newCustomDomainDesc" | i18n }}</small>
  </ng-container>
  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "save" | i18n }}</span>
  </button>
  <h2 class="spaced-header">{{ "globalEqDomains" | i18n }}</h2>
  <p *ngIf="loading">
    <i
-      class="fa fa-spinner fa-spin text-muted"
+      class="bwi bwi-spinner bwi-spin text-muted"
      title="{{ 'loading' | i18n }}"
      aria-hidden="true"
    ></i>
@@ -68,7 +68,7 @@
              aria-expanded="false"
              appA11yTitle="{{ 'options' | i18n }}"
            >
-              <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
+              <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
            </button>
            <div class="dropdown-menu dropdown-menu-right">
              <a
@@ -78,7 +78,7 @@
                (click)="toggleExcluded(d)"
                *ngIf="!d.excluded"
              >
-                <i class="fa fa-fw fa-close" aria-hidden="true"></i>
+                <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
                {{ "exclude" | i18n }}
              </a>
              <a
@@ -88,11 +88,11 @@
                (click)="toggleExcluded(d)"
                *ngIf="d.excluded"
              >
-                <i class="fa fa-fw fa-plus" aria-hidden="true"></i>
+                <i class="bwi bwi-fw bwi-plus" aria-hidden="true"></i>
                {{ "include" | i18n }}
              </a>
              <a class="dropdown-item" href="#" appStopClick (click)="customize(d)">
-                <i class="fa fa-fw fa-scissors" aria-hidden="true"></i>
+                <i class="bwi bwi-fw bwi-cut" aria-hidden="true"></i>
                {{ "customize" | i18n }}
              </a>
            </div>
@@ -102,7 +102,7 @@
    </tbody>
  </table>
  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "save" | i18n }}</span>
  </button>
 </form>
--- a/src/app/settings/emergency-access-add-edit.component.html
+++ b/src/app/settings/emergency-access-add-edit.component.html
@@ -24,7 +24,7 @@
      </div>
      <div class="modal-body" *ngIf="loading">
        <i
-          class="fa fa-spinner fa-spin text-muted"
+          class="bwi bwi-spinner bwi-spin text-muted"
          title="{{ 'loading' | i18n }}"
          aria-hidden="true"
        ></i>
@@ -51,9 +51,9 @@
            target="_blank"
            rel="noopener"
            appA11yTitle="{{ 'learnMore' | i18n }}"
-            href="https://bitwarden.com/help/article/emergency-access/#user-access"
+            href="https://bitwarden.com/help/emergency-access/#user-access"
          >
-            <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+            <i class="bwi bwi-question-circle" aria-hidden="true"></i>
          </a>
        </h3>
        <div class="form-check mt-2 form-check-block">
@@ -107,7 +107,7 @@
          [disabled]="loading || submitBtn.loading || readOnly"
        >
          <i
-            class="fa fa-spinner fa-spin"
+            class="bwi bwi-spinner bwi-spin"
            title="{{ 'loading' | i18n }}"
            aria-hidden="true"
            *ngIf="loading || submitBtn.loading"
@@ -128,12 +128,12 @@
            [disabled]="deleteBtn.loading"
          >
            <i
-              class="fa fa-trash-o fa-lg fa-fw"
+              class="bwi bwi-trash bwi-lg bwi-fw"
              [hidden]="deleteBtn.loading"
              aria-hidden="true"
            ></i>
            <i
-              class="fa fa-spinner fa-spin fa-lg fa-fw"
+              class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
              [hidden]="!deleteBtn.loading"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
--- a/src/app/settings/emergency-access-confirm.component.html
+++ b/src/app/settings/emergency-access-confirm.component.html
@@ -18,11 +18,7 @@
      <div class="modal-body">
        <p>
          {{ "fingerprintEnsureIntegrityVerify" | i18n }}
-          <a
-            href="https://help.bitwarden.com/article/fingerprint-phrase/"
-            target="_blank"
-            rel="noopener"
-          >
+          <a href="https://bitwarden.com/help/fingerprint-phrase/" target="_blank" rel="noopener">
            {{ "learnMore" | i18n }}</a
          >
        </p>
@@ -44,7 +40,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "confirm" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/src/app/settings/emergency-access-takeover.component.html
+++ b/src/app/settings/emergency-access-takeover.component.html
@@ -67,7 +67,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "save" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
github-actions[bot]	4bdcccb82d	Bump version to 2.26.0 (#1452 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit `3a0c34b934`)	2022-02-08 15:55:22 -07:00
github-actions[bot]	a7c5c7eaf6	Bump version to 1.26.0 (#1450 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit `e09df347f4`)	2022-02-08 14:48:54 -07:00
Addison Beck	9577b62a20	[chore] Update jslib (#1447 )	2022-02-07 12:11:10 -05:00
Oscar Hinton	d51dcdd781	Fix register button using wrong icon (#1446 ) (cherry picked from commit `bfd5f3e564`)	2022-02-07 12:29:01 +01:00
Justin Baur	c2f09bec1c	Switch option values to be a number (#1444 )	2022-02-04 17:02:09 -05:00
Vincent Salucci	f65add8518	[Icons] Fix button icon/text margins (#1443 )	2022-02-04 13:53:27 -06:00
github-actions[bot]	c2efafe600	Autosync the updated translations (#1441 ) Co-authored-by: github-actions <> (cherry picked from commit `e975056c21`)	2022-02-04 12:50:28 +01:00
Thomas Rittson	cd828d7c6a	Update jslib to fix password history	2022-02-04 15:27:22 +10:00
Daniel James Smith	1f55dc36db	Pull jslib for https://github.com/bitwarden/jslib/pull/654 (#1439 ) (cherry picked from commit `be21167ef8`)	2022-02-03 23:45:52 +01:00
Addison Beck	098874f787	Update jslib (#1436 )	2022-02-03 14:12:19 -05:00
Vincent Salucci	ebcb4375b6	[Icons] FF - requested icon changes (#1435 ) * [Icons] Removed FA * Icon changes // Webpack correction // Padding updates	2022-02-03 10:24:21 -06:00
Jake Fink	7b258b88a3	Master password policy is not checked when accepting invite from an existing account (#1371 ) * validate password against org policy and create update-password component * linting and prettier * [bug] Default rememberEmail to true (#1429) * switching the dashes to underscores for the branch name (#1433) (cherry picked from commit `8910430dfb`) * fix merge conflicts * Update src/app/accounts/update-password.component.html Co-authored-by: Justin Baur <admin@justinbaur.com> * Update src/locales/en/messages.json Co-authored-by: Justin Baur <admin@justinbaur.com> * update jslib * prettier Co-authored-by: Addison Beck <abeck@bitwarden.com> Co-authored-by: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Co-authored-by: Justin Baur <admin@justinbaur.com>	2022-02-03 00:01:33 -05:00
Joseph Flinn	243ee6897c	switching the dashes to underscores for the branch name (#1433 ) (cherry picked from commit `8910430dfb`)	2022-02-02 08:36:28 -08:00
Addison Beck	d68dcd10e0	[bug] Default rememberEmail to true (#1429 )	2022-02-02 11:22:06 -05:00
Oscar Hinton	ca199a398e	Fix captcha and webauthn-fallback not using theme_light (#1427 )	2022-02-01 15:46:16 +01:00
Chad Scharf	61ab2fbda3	Hide unsolicited SSO option in config (#1425 )	2022-01-31 17:43:56 -05:00
Addison Beck	d79f074825	[bug] Extend GlobalState to supply correct default theme (#1422 ) * [bug] Extend GlobalState to supply correct default theme The default theme for most clients is System, but web uses Light. We need to extend GlobalState in web to reflect this. * [chore] Update jslib	2022-01-31 14:53:55 -05:00
Oscar Hinton	e3b962a779	Apply prettier on help pr (#1423 )	2022-01-31 20:31:50 +01:00
DanHillesheim	cc657eb853	Update help site URLs (#1409 )	2022-01-31 20:11:27 +01:00
DanHillesheim	e14a266ee0	Registration page updates (#1390 ) Co-authored-by: Hinton <oscar@oscarhinton.com>	2022-01-31 20:10:35 +01:00
Thomas Rittson	e1732cfa10	Fix various bugs in Options page (#1418 ) * Remove duplicate message in toast * Set starting variables properly	2022-01-31 09:11:25 -05:00
Addison Beck	ce1ae208d1	[bug] Update theme.js to refelect new storage structure (#1416 ) * [bug] Update theme.js to refelect new storage structure * [bug] Remove unecassary defaults	2022-01-28 11:30:45 -05:00
Addison Beck	6996b06fa2	[chore] Update jslib (#1415 )	2022-01-28 09:07:33 -05:00
github-actions[bot]	dc503d3461	Autosync the updated translations (#1414 ) Co-authored-by: github-actions <>	2022-01-28 11:06:25 +01:00
Daniel James Smith	d95db8fb74	BEEEP: Add importer for Keeper in json format (#1392 ) * Updated instructions to export a csv file from Keeper * Add instructions to export a json file from Keeper * Bump jslib to include Keeper json importer * Revert change to README.md * Pull in jslib	2022-01-27 21:51:56 +01:00
Justin Baur	1a219daa12	Remove F4E vault card (#1413 ) * Remove F4E card from vault page * Remove unneeded property	2022-01-27 15:47:56 -05:00
Vincent Salucci	2ae98887b7	[Icons] Update Font Sheet (#1343 ) * [Icons] Update to new font sheet * Rebased - updated all icon remaining icon references * Temporarily Updating gitmodules branch * Fixed class reference * Revert temporary gitmodule branch * Icon updates/changes * Pull jslib m-icon-updates latest * Prettier * Update jslib to master * Reset jslib to master * Removed obsolete variable reference, replaced bolt references * Removed all instances of base class - maps create automatically * Updated toast icon references * Imported styles to reference variable/map * Reverted to using base class * Update jslib * Rename eye-2 to eye and eye-slash-2 to eye-slash * Bump jslib * Remove duplicate scss * Remove old fa * Update fallback image * Bump jslib * Rename eye-2 to eye, and eye-slash-2 to eye-slash * Fix 404 * Fix integrity of bootstrap.min.css * Fix callout missing bwi * Add bwi to change-kdf * Remove bwi from callout again * Bump jslib Co-authored-by: Hinton <oscar@oscarhinton.com>	2022-01-27 11:25:58 -06:00
Joseph Flinn	f0c47252e4	Updating the base Docker image for testing purposes (#1411 )	2022-01-27 07:25:13 -08:00
Danny Murphy	2ffe3bd6ad	Cleanup of the SCSS Variables (#1255 ) * Clean up variable names and comments * Fix Option Colour - issue #1338 * Update old scss variable name Co-authored-by: Thomas Rittson <trittson@bitwarden.com>	2022-01-26 14:54:15 +10:00
Oscar Hinton	f387a4d469	Remove old u2f connector (#1406 )	2022-01-21 15:00:53 +01:00
github-actions[bot]	a0f1b4dd0d	Autosync the updated translations (#1404 ) Co-authored-by: github-actions <>	2022-01-21 11:53:09 +01:00
Thomas Rittson	84a65edc08	Move keyConnectorService call to syncService (#1405 )	2022-01-21 19:33:09 +10:00
Addison Beck	caad11c571	[chore] Update jslib (#1403 )	2022-01-20 09:38:34 -05:00
Daniel James Smith	b73449159d	Update copy on fingerprint phrase prompt (#1399 )	2022-01-20 10:07:47 +01:00
Oscar Hinton	bf48434d0f	Rename package to @bitwarden/web-vault (#1396 )	2022-01-17 17:23:14 +01:00
Oscar Hinton	b6d2d5bf71	[BEEEP] Use shared tsconfig (#1393 )	2022-01-17 15:53:19 +01:00
Oscar Hinton	dfd62c7c3a	Fix webpack assets using wrong name (#1391 )	2022-01-14 13:35:44 +01:00
github-actions[bot]	41d3bd8cf2	Autosync the updated translations (#1389 ) Co-authored-by: github-actions <>	2022-01-14 11:21:40 +01:00
Vince Grassia	3292d119fe	Update Version Bump action (#1388 )	2022-01-12 16:06:50 -05:00
Christian Oliff	b8de92435b	Add Inputmode for tel and email (identities) (#1384 )	2022-01-12 10:07:56 +01:00