diff --git a/jslib b/jslib
index 54c6a4b3..b4f47525 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 54c6a4b3c3d34fe6adbbeba5d35a416a3fbc487d
+Subproject commit b4f475251aa6817403117b71fb5a8836cdae9c75
diff --git a/src/app/accounts/recover-two-factor.component.html b/src/app/accounts/recover-two-factor.component.html
index 4440dedd..a3943ac4 100644
--- 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
diff --git a/src/app/organizations/manage/bulk/bulk-confirm.component.html b/src/app/organizations/manage/bulk/bulk-confirm.component.html
index 209fa447..cca461f3 100644
--- a/src/app/organizations/manage/bulk/bulk-confirm.component.html
+++ b/src/app/organizations/manage/bulk/bulk-confirm.component.html
@@ -29,7 +29,7 @@
           <p>
             {{ "fingerprintEnsureIntegrityVerify" | i18n }}
             <a
-              href="https://help.bitwarden.com/article/fingerprint-phrase/"
+              href="https://bitwarden.com/help/fingerprint-phrase/"
               target="_blank"
               rel="noopener"
             >
diff --git a/src/app/organizations/manage/user-confirm.component.html b/src/app/organizations/manage/user-confirm.component.html
index 83e85ad8..d8c2f460 100644
--- a/src/app/organizations/manage/user-confirm.component.html
+++ b/src/app/organizations/manage/user-confirm.component.html
@@ -19,7 +19,7 @@
         <p>
           {{ "fingerprintEnsureIntegrityVerify" | i18n }}
           <a
-            href="https://help.bitwarden.com/article/fingerprint-phrase/"
+            href="https://bitwarden.com/help/fingerprint-phrase/"
             target="_blank"
             rel="noopener"
           >
diff --git a/src/app/organizations/settings/download-license.component.html b/src/app/organizations/settings/download-license.component.html
index dd27236c..9a2372b0 100644
--- a/src/app/organizations/settings/download-license.component.html
+++ b/src/app/organizations/settings/download-license.component.html
@@ -13,7 +13,7 @@
             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>
           </a>
diff --git a/src/app/settings/change-password.component.ts b/src/app/settings/change-password.component.ts
index ca0234c3..538625fb 100644
--- 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/#fixing-old-attachments"
           );
         }
         this.rotateEncKey = false;
diff --git a/src/app/settings/emergency-access-confirm.component.html b/src/app/settings/emergency-access-confirm.component.html
index 83e85ad8..d8c2f460 100644
--- a/src/app/settings/emergency-access-confirm.component.html
+++ b/src/app/settings/emergency-access-confirm.component.html
@@ -19,7 +19,7 @@
         <p>
           {{ "fingerprintEnsureIntegrityVerify" | i18n }}
           <a
-            href="https://help.bitwarden.com/article/fingerprint-phrase/"
+            href="https://bitwarden.com/help/fingerprint-phrase/"
             target="_blank"
             rel="noopener"
           >
diff --git a/src/app/settings/options.component.html b/src/app/settings/options.component.html
index 5a71f198..f1d3f124 100644
--- a/src/app/settings/options.component.html
+++ b/src/app/settings/options.component.html
@@ -52,7 +52,7 @@
           <label for="locale">{{ "language" | i18n }}</label>
           <a
             class="ml-auto"
-            href="https://help.bitwarden.com/article/localization/"
+            href="https://bitwarden.com/help/localization/"
             target="_blank"
             rel="noopener"
             appA11yTitle="{{ 'learnMore' | i18n }}"
@@ -80,7 +80,7 @@
         {{ "disableIcons" | i18n }}
       </label>
       <a
-        href="https://help.bitwarden.com/article/website-icons/"
+        href="https://bitwarden.com/help/website-icons/"
         target="_blank"
         rel="noopener"
         appA11yTitle="{{ 'learnMore' | i18n }}"
diff --git a/src/app/settings/profile.component.html b/src/app/settings/profile.component.html
index 83b7e016..fe7b0fe7 100644
--- a/src/app/settings/profile.component.html
+++ b/src/app/settings/profile.component.html
@@ -51,7 +51,7 @@
       <p *ngIf="fingerprint">
         {{ "yourAccountsFingerprint" | i18n }}:
         <a
-          href="https://help.bitwarden.com/article/fingerprint-phrase/"
+          href="https://bitwarden.com/help/fingerprint-phrase/"
           target="_blank"
           rel="noopener"
           appA11yTitle="{{ 'learnMore' | i18n }}"
diff --git a/src/app/settings/update-key.component.html b/src/app/settings/update-key.component.html
index 49f263b5..8fea7b65 100644
--- a/src/app/settings/update-key.component.html
+++ b/src/app/settings/update-key.component.html
@@ -22,7 +22,7 @@
         <p>
           {{ "updateEncryptionKeyShortDesc" | i18n }} {{ "updateEncryptionKeyDesc" | i18n }}
           <a
-            href="https://help.bitwarden.com/article/update-encryption-key/"
+            href="https://bitwarden.com/help/account-encryption-key/#rotate-your-encryption-key"
             target="_blank"
             rel="noopener"
             >{{ "learnMore" | i18n }}</a
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index d564910a..c7fb5c6b 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -29,8 +29,8 @@
   <app-callout type="info" title="{{ getFormatInstructionTitle() }}" *ngIf="format">
     <ng-container *ngIf="format === 'bitwardencsv' || format === 'bitwardenjson'">
       See detailed instructions on our help site at
-      <a target="_blank" rel="noopener" href="https://help.bitwarden.com/article/export-your-data/">
-        https://help.bitwarden.com/article/export-your-data/</a
+      <a target="_blank" rel="noopener" href="https://bitwarden.com/help/export-your-data/">
+        https://bitwarden.com/help/export-your-data/</a
       >
     </ng-container>
     <ng-container *ngIf="format === 'lastpasscsv'">
@@ -38,9 +38,9 @@
       <a
         target="_blank"
         rel="noopener"
-        href="https://help.bitwarden.com/article/import-from-lastpass/"
+        href="https://bitwarden.com/help/import-from-lastpass/"
       >
-        https://help.bitwarden.com/article/import-from-lastpass/</a
+        https://bitwarden.com/help/import-from-lastpass/</a
       >
     </ng-container>
     <ng-container *ngIf="format === 'keepassxcsv'">
@@ -93,9 +93,9 @@
       <a
         target="_blank"
         rel="noopener"
-        href="https://help.bitwarden.com/article/import-from-chrome/"
+        href="https://bitwarden.com/help/import-from-chrome/"
       >
-        https://help.bitwarden.com/article/import-from-chrome/</a
+        https://bitwarden.com/help/import-from-chrome/</a
       >
     </ng-container>
     <ng-container *ngIf="format === 'firefoxcsv'">
@@ -127,9 +127,9 @@
       <a
         target="_blank"
         rel="noopener"
-        href="https://help.bitwarden.com/article/import-from-1password/"
+        href="https://bitwarden.com/help/import-from-1password/"
       >
-        https://help.bitwarden.com/article/import-from-1password/</a
+        https://bitwarden.com/help/import-from-1password/</a
       >.
     </ng-container>
     <ng-container *ngIf="format === 'passworddragonxml'">
diff --git a/src/app/vault/add-edit-custom-fields.component.html b/src/app/vault/add-edit-custom-fields.component.html
index 246da4e7..bda29bfa 100644
--- a/src/app/vault/add-edit-custom-fields.component.html
+++ b/src/app/vault/add-edit-custom-fields.component.html
@@ -11,7 +11,7 @@
           <label for="fieldName{{ i }}">{{ "name" | i18n }}</label>
           <a
             class="ml-auto"
-            href="https://help.bitwarden.com/article/custom-fields/"
+            href="https://bitwarden.com/help/custom-fields/"
             target="_blank"
             rel="noopener"
             appA11yTitle="{{ 'learnMore' | i18n }}"
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 51f2bde2..b594fd79 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -288,7 +288,7 @@
                   </label>
                   <a
                     class="ml-auto"
-                    href="https://help.bitwarden.com/article/uri-match-detection/"
+                    href="https://bitwarden.com/help/uri-match-detection/"
                     target="_blank"
                     rel="noopener"
                     appA11yTitle="{{ 'learnMore' | i18n }}"
diff --git a/src/app/vault/attachments.component.html b/src/app/vault/attachments.component.html
index 3b4fce42..09fdcce1 100644
--- a/src/app/vault/attachments.component.html
+++ b/src/app/vault/attachments.component.html
@@ -38,7 +38,7 @@
                   <a href="#" appStopClick (click)="download(a)">{{ a.fileName }}</a>
                   <div *ngIf="showFixOldAttachments(a)" class="ml-2">
                     <a
-                      href="https://help.bitwarden.com/article/attachments/#fixing-old-attachments"
+                      href="https://bitwarden.com/help/attachments/#fixing-old-attachments"
                       target="_blank"
                       rel="noopener"
                     >
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html
index c290095f..d280f03b 100644
--- a/src/app/vault/groupings.component.html
+++ b/src/app/vault/groupings.component.html
@@ -3,7 +3,7 @@
     {{ "filters" | i18n }}
     <a
       class="ml-auto"
-      href="https://help.bitwarden.com/article/searching-vault/"
+      href="https://bitwarden.com/help/searching-vault/"
       target="_blank"
       rel="noopener"
       appA11yTitle="{{ 'learnMore' | i18n }}"
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index ce33bab5..8033a21f 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -100,7 +100,7 @@
           {{ "organizations" | i18n }}
           <a
             class="ml-auto"
-            href="https://help.bitwarden.com/article/what-is-an-organization/"
+            href="https://bitwarden.com/help/about-organizations/"
             target="_blank"
             rel="noopener"
             appA11yTitle="{{ 'learnMore' | i18n }}"