diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 2f663cabc6..b507b2b8e9 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -229,6 +229,18 @@
   "length": {
     "message": "Length"
   },
+  "uppercase": {
+    "message": "Uppercase (A-Z)"
+  },
+  "lowercase": {
+    "message": "Lowercase (a-z)"
+  },
+  "numbers": {
+    "message": "Numbers (0-9)"
+  },
+  "specialCharacters": {
+    "message": "Special Characters (!@#$%^&*)"
+  },
   "numWords": {
     "message": "Number of Words"
   },
diff --git a/src/_locales/et/messages.json b/src/_locales/et/messages.json
index e11e2ff3f1..6556ecafd3 100644
--- a/src/_locales/et/messages.json
+++ b/src/_locales/et/messages.json
@@ -789,7 +789,7 @@
     "message": "Kui sinu sisselogimise andmetele on juurde lisatud autentimise võti, kopeeritakse TOTP kood automaatse täitmise kasutamisel lõikelauale."
   },
   "disableAutoBiometricsPrompt": {
-    "message": "Ära küsi käivitudes biomeetrilist kinnitamist."
+    "message": "Ära küsi käivitudes biomeetrilist kinnitamist"
   },
   "premiumRequired": {
     "message": "Vajalik on Premium versioon"
diff --git a/src/_locales/hr/messages.json b/src/_locales/hr/messages.json
index ab5d3230da..763e1ea61c 100644
--- a/src/_locales/hr/messages.json
+++ b/src/_locales/hr/messages.json
@@ -122,19 +122,19 @@
     "message": "Nastavi"
   },
   "sendVerificationCode": {
-    "message": "Send a verification code to your email"
+    "message": "Slanje verifikacijskog kôda e-poštom"
   },
   "sendCode": {
-    "message": "Send Code"
+    "message": "Pošalji kôd"
   },
   "codeSent": {
-    "message": "Code Sent"
+    "message": "Kôd poslan"
   },
   "verificationCode": {
     "message": "Kôd za provjeru"
   },
   "confirmIdentity": {
-    "message": "Confirm your identity to continue."
+    "message": "Potvrdite lozinku za nastavak."
   },
   "account": {
     "message": "Račun"
@@ -321,7 +321,7 @@
     "message": "Web preglednik ne podržava jednostavno kopiranje međuspremnika. Umjesto toga ručno kopirajte."
   },
   "verifyIdentity": {
-    "message": "Verify Identity"
+    "message": "Potvrdi identitet"
   },
   "yourVaultIsLocked": {
     "message": "Tvoj trezor je zaključan. Potvrdi glavnu lozinku za nastavak."
@@ -424,7 +424,7 @@
     "message": "Potvrdni kôd je obavezan."
   },
   "invalidVerificationCode": {
-    "message": "Invalid verification code"
+    "message": "Nevažeći kôd za provjeru"
   },
   "valueCopied": {
     "message": " kopirano",
@@ -573,7 +573,7 @@
     "message": "Treba li Bitwarden zapamtiti ovu lozinku?"
   },
   "notificationAddSave": {
-    "message": "Da, spremi sad"
+    "message": "Spremi"
   },
   "disableChangedPasswordNotification": {
     "message": "Onemogući upit za spremanje ažurirane lozinke"
@@ -585,7 +585,7 @@
     "message": "Želiš li ovu lozinku ažurirati u Bitwarden-u?"
   },
   "notificationChangeSave": {
-    "message": "Da, ažuriraj sada"
+    "message": "Ažuriraj"
   },
   "disableContextMenuItem": {
     "message": "Onemogući kontekstualni izbornik u pregledniku"
@@ -996,11 +996,11 @@
     "message": "Boolean"
   },
   "cfTypeLinked": {
-    "message": "Linked",
+    "message": "Povezano",
     "description": "This describes a field that is 'linked' (tied) to another field."
   },
   "linkedValue": {
-    "message": "Linked value",
+    "message": "Povezana vrijednost",
     "description": "This describes a value that is 'linked' (tied) to another value."
   },
   "popup2faCloseMessage": {
@@ -1106,7 +1106,7 @@
     "message": "Prezime"
   },
   "fullName": {
-    "message": "Full Name"
+    "message": "Ime i prezime"
   },
   "identityName": {
     "message": "Ime identiteta"
@@ -1832,7 +1832,7 @@
     "message": "Nije nađen jedinstveni identifikator."
   },
   "convertOrganizationEncryptionDesc": {
-    "message": "$ORGANIZATION$ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organization.",
+    "message": "$ORGANIZATION$ koristi jedinstvenu prijavu SSO s vlastitim poslužiteljem. Članovima organizacije glavna lozinka više nije potrebna.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -1841,18 +1841,18 @@
     }
   },
   "leaveOrganization": {
-    "message": "Leave Organization"
+    "message": "Napusti organizaciju"
   },
   "removeMasterPassword": {
-    "message": "Remove Master Password"
+    "message": "Ukloni glavnu lozinku"
   },
   "removedMasterPassword": {
-    "message": "Master password removed."
+    "message": "Glavna lozinka uklonjena."
   },
   "leaveOrganizationConfirmation": {
-    "message": "Are you sure you want to leave this organization?"
+    "message": "Sigurno želiš napustiti ovu organizaciju?"
   },
   "leftOrganization": {
-    "message": "You have left the organization."
+    "message": "Organizacija napuštena."
   }
 }
diff --git a/src/_locales/pl/messages.json b/src/_locales/pl/messages.json
index 471add7031..f642cac9e1 100644
--- a/src/_locales/pl/messages.json
+++ b/src/_locales/pl/messages.json
@@ -324,7 +324,7 @@
     "message": "Zweryfikuj tożsamość"
   },
   "yourVaultIsLocked": {
-    "message": "Twój sejf jest zablokowany. Wprowadź swoje hasło główne, aby kontynuować."
+    "message": "Sejf jest zablokowany. Zweryfikuj swoją tożsamość, aby kontynuować."
   },
   "unlock": {
     "message": "Odblokuj"
diff --git a/src/_locales/sr/messages.json b/src/_locales/sr/messages.json
index 4f661bb10e..9c310adfaf 100644
--- a/src/_locales/sr/messages.json
+++ b/src/_locales/sr/messages.json
@@ -321,7 +321,7 @@
     "message": "Ваш прегледач не подржава једноставно копирање у привремену меморију. Уместо тога копирајте га ручно."
   },
   "verifyIdentity": {
-    "message": "Verify Identity"
+    "message": "Проверити идентитет"
   },
   "yourVaultIsLocked": {
     "message": "Сеф је закључан. Унесите главну лозинку за наставак."
diff --git a/src/_locales/zh_TW/messages.json b/src/_locales/zh_TW/messages.json
index c798dedbb5..de01f65e25 100644
--- a/src/_locales/zh_TW/messages.json
+++ b/src/_locales/zh_TW/messages.json
@@ -987,16 +987,16 @@
     "message": "透過拖曳來排序"
   },
   "cfTypeText": {
-    "message": "文字"
+    "message": "文字型"
   },
   "cfTypeHidden": {
-    "message": "隱藏"
+    "message": "隱藏型"
   },
   "cfTypeBoolean": {
     "message": "布林值"
   },
   "cfTypeLinked": {
-    "message": "已連結",
+    "message": "連結型",
     "description": "This describes a field that is 'linked' (tied) to another field."
   },
   "linkedValue": {
diff --git a/src/background/notification.background.ts b/src/background/notification.background.ts
index 6a5ac80d34..d7f319fb57 100644
--- a/src/background/notification.background.ts
+++ b/src/background/notification.background.ts
@@ -198,7 +198,12 @@ export default class NotificationBackground {
             normalizedUsername = normalizedUsername.toLowerCase();
         }
 
+        const disabledAddLogin = await this.storageService.get<boolean>(ConstantsService.disableAddLoginNotificationKey);
         if (await this.vaultTimeoutService.isLocked()) {
+            if (disabledAddLogin) {
+                return;
+            }
+
             if (!await this.allowPersonalOwnership()) {
                 return;
             }
@@ -211,8 +216,6 @@ export default class NotificationBackground {
         const usernameMatches = ciphers.filter(c =>
             c.login.username != null && c.login.username.toLowerCase() === normalizedUsername);
         if (usernameMatches.length === 0) {
-            const disabledAddLogin = await this.storageService.get<boolean>(
-                ConstantsService.disableAddLoginNotificationKey);
             if (disabledAddLogin) {
                 return;
             }
diff --git a/src/popup/accounts/environment.component.html b/src/popup/accounts/environment.component.html
index dbacca585a..26bf1192c3 100644
--- a/src/popup/accounts/environment.component.html
+++ b/src/popup/accounts/environment.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <a routerLink="/home">{{'close' | i18n}}</a>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'appName' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
@@ -15,9 +15,9 @@
     </header>
     <content>
         <div class="box">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'selfHostedEnvironment' | i18n}}
-            </div>
+            </h2>
             <div class="box-content">
                 <div class="box-content-row" appBoxRow>
                     <label for="baseUrl">{{'baseUrl' | i18n}}</label>
@@ -30,9 +30,9 @@
             </div>
         </div>
         <div class="box">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'customEnvironment' | i18n}}
-            </div>
+            </h2>
             <div class="box-content" [hidden]="!showCustom">
                 <div class="box-content-row" appBoxRow>
                     <label for="webVaultUrl">{{'webVaultUrl' | i18n}}</label>
diff --git a/src/popup/accounts/hint.component.html b/src/popup/accounts/hint.component.html
index 97a7a41aa2..21796b96b2 100644
--- a/src/popup/accounts/hint.component.html
+++ b/src/popup/accounts/hint.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <a routerLink="/login">{{'cancel' | i18n}}</a>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'passwordHint' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'submit' | i18n}}</span>
diff --git a/src/popup/accounts/lock.component.html b/src/popup/accounts/lock.component.html
index 603b1ef389..be92ca3211 100644
--- a/src/popup/accounts/lock.component.html
+++ b/src/popup/accounts/lock.component.html
@@ -1,9 +1,9 @@
 <form (ngSubmit)="submit()">
     <header>
         <div class="left"></div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'verifyIdentity' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick *ngIf="!hideInput">{{'unlock' | i18n}}</button>
         </div>
@@ -24,7 +24,7 @@
                     </div>
                     <div class="action-buttons">
                         <button type="button" class="row-btn" appStopClick appBlurClick
-                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()" [attr.aria-pressed]="showPassword">
                             <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"
                                 aria-hidden="true"></i>
                         </button>
diff --git a/src/popup/accounts/login.component.html b/src/popup/accounts/login.component.html
index 6f0434b89f..68628ac3e7 100644
--- a/src/popup/accounts/login.component.html
+++ b/src/popup/accounts/login.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <a routerLink="/home">{{'cancel' | i18n}}</a>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'appName' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'login' | i18n}}</span>
@@ -29,7 +29,7 @@
                     </div>
                     <div class="action-buttons">
                         <button type="button" class="row-btn" appStopClick appBlurClick
-                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()" [attr.aria-pressed]="showPassword">
                             <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"
                                 aria-hidden="true"></i>
                         </button>
diff --git a/src/popup/accounts/register.component.html b/src/popup/accounts/register.component.html
index 4bc4ebc801..0ab0090f57 100644
--- a/src/popup/accounts/register.component.html
+++ b/src/popup/accounts/register.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <a routerLink="/home">{{'cancel' | i18n}}</a>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'createAccount' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'submit' | i18n}}</span>
@@ -37,7 +37,7 @@
                         </div>
                         <div class="action-buttons">
                             <button type="button" class="row-btn" appStopClick appBlurClick
-                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)">
+                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)" [attr.aria-pressed]="showPassword">
                                 <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </button>
@@ -65,7 +65,7 @@
                     </div>
                     <div class="action-buttons">
                         <button type="button" class="row-btn" appStopClick appBlurClick
-                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
+                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)" [attr.aria-pressed]="showPassword">
                             <i class="fa fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                         </button>
diff --git a/src/popup/accounts/set-password.component.html b/src/popup/accounts/set-password.component.html
index da26956a83..3452708e12 100644
--- a/src/popup/accounts/set-password.component.html
+++ b/src/popup/accounts/set-password.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <a routerLink="/home">{{'cancel' | i18n}}</a>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'setMasterPassword' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'submit' | i18n}}</span>
@@ -44,7 +44,7 @@
                             </div>
                             <div class="action-buttons">
                                 <button type="button" class="row-btn" appStopClick appBlurClick role="button"
-                                    appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)">
+                                    appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)" [attr.aria-pressed]="showPassword">
                                     <i class="fa fa-lg" aria-hidden="true"
                                         [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                                 </button>
@@ -75,7 +75,7 @@
                             </div>
                             <div class="action-buttons">
                                 <button type="button" class="row-btn" appStopClick appBlurClick role="button"
-                                    appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
+                                    appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)" [attr.aria-pressed]="showPassword">
                                     <i class="fa fa-lg" aria-hidden="true"
                                         [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                                 </button>
diff --git a/src/popup/accounts/two-factor-options.component.html b/src/popup/accounts/two-factor-options.component.html
index 15ad88013f..07ca6d1921 100644
--- a/src/popup/accounts/two-factor-options.component.html
+++ b/src/popup/accounts/two-factor-options.component.html
@@ -2,9 +2,9 @@
     <div class="left">
         <a routerLink="/2fa">{{'close' | i18n}}</a>
     </div>
-    <div class="center">
+    <h1 class="center">
         <span class="title">{{'twoStepOptions' | i18n}}</span>
-    </div>
+    </h1>
     <div class="right"></div>
 </header>
 <content>
diff --git a/src/popup/accounts/two-factor.component.html b/src/popup/accounts/two-factor.component.html
index 7026339ac3..94d7b1caf7 100644
--- a/src/popup/accounts/two-factor.component.html
+++ b/src/popup/accounts/two-factor.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <a routerLink="/login">{{'back' | i18n}}</a>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{title}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading" *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo &&
                         selectedProviderType !== providerType.OrganizationDuo &&
diff --git a/src/popup/accounts/update-temp-password.component.html b/src/popup/accounts/update-temp-password.component.html
index 19e698b8f5..45785088a9 100644
--- a/src/popup/accounts/update-temp-password.component.html
+++ b/src/popup/accounts/update-temp-password.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <a (click)="logOut()">{{'logOut' | i18n}}</a>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'updateMasterPassword' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'submit' | i18n}}</span>
@@ -37,7 +37,7 @@
                         </div>
                         <div class="action-buttons">
                             <button type="button" class="row-btn" appStopClick appBlurClick
-                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)">
+                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)" [attr.aria-pressed]="showPassword">
                                 <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </button>
@@ -63,7 +63,7 @@
                     </div>
                     <div class="action-buttons">
                         <button type="button" class="row-btn" appStopClick appBlurClick
-                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
+                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)" [attr.aria-pressed]="showPassword">
                             <i class="fa fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                         </button>
diff --git a/src/popup/components/password-reprompt.component.html b/src/popup/components/password-reprompt.component.html
index 3ef88b7bc7..da74320257 100644
--- a/src/popup/components/password-reprompt.component.html
+++ b/src/popup/components/password-reprompt.component.html
@@ -3,7 +3,7 @@
         <form class="modal-content" #form (ngSubmit)="submit()">
             <div class="modal-body">
                 <div class="box">
-                    <div class="box-header">{{'passwordConfirmation' | i18n}}</div>
+                    <h1 class="box-header">{{'passwordConfirmation' | i18n}}</h1>
                     <div class="box-content">
                         <div class="box-content-row box-content-row-flex" appBoxRow>
                             <div class="row-main">
@@ -13,7 +13,7 @@
                             </div>
                             <div class="action-buttons">
                                 <button type="button" class="row-btn" appStopClick appBlurClick role="button"
-                                    appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                                    appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()" [attr.aria-pressed]="showPassword">
                                     <i class="fa fa-lg" aria-hidden="true"
                                         [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                                 </button>
diff --git a/src/popup/components/set-pin.component.html b/src/popup/components/set-pin.component.html
index 06f3a5808b..60340a1d68 100644
--- a/src/popup/components/set-pin.component.html
+++ b/src/popup/components/set-pin.component.html
@@ -15,7 +15,7 @@
                             </div>
                             <div class="action-buttons">
                                 <button type="button" class="row-btn" appStopClick appBlurClick appA11yTitle="{{'toggleVisibility' | i18n}}"
-                                    (click)="toggleVisibility()">
+                                    (click)="toggleVisibility()" [attr.aria-pressed]="showPin">
                                     <i class="fa fa-lg" aria-hidden="true"
                                         [ngClass]="{'fa-eye': !showPin, 'fa-eye-slash': showPin}"></i>
                                 </button>
diff --git a/src/popup/generator/password-generator-history.component.html b/src/popup/generator/password-generator-history.component.html
index 26c9610888..67c6f61869 100644
--- a/src/popup/generator/password-generator-history.component.html
+++ b/src/popup/generator/password-generator-history.component.html
@@ -5,9 +5,9 @@
             <span>{{'back' | i18n}}</span>
         </button>
     </div>
-    <div class="center">
+    <h1 class="center">
         <span class="title">{{'passwordHistory' | i18n}}</span>
-    </div>
+    </h1>
     <div class="right">
         <button type="button" appBlurClick type="button" (click)="clear()">
             {{'clear' | i18n}}
diff --git a/src/popup/generator/password-generator.component.html b/src/popup/generator/password-generator.component.html
index b1fad03466..0c7e555f04 100644
--- a/src/popup/generator/password-generator.component.html
+++ b/src/popup/generator/password-generator.component.html
@@ -3,9 +3,9 @@
         <app-pop-out [show]="!showSelect"></app-pop-out>
         <button type="button" appBlurClick (click)="close()" *ngIf="showSelect">{{'cancel' | i18n}}</button>
     </div>
-    <div class="center">
+    <h1 class="center">
         <span class="title">{{'passGen' | i18n}}</span>
-    </div>
+    </h1>
     <div class="right">
         <button type="button" appBlurClick (click)="select()" *ngIf="showSelect">{{'select' | i18n}}</button>
     </div>
@@ -34,9 +34,9 @@
         </div>
     </div>
     <div class="box">
-        <div class="box-header">
+        <h2 class="box-header">
             {{'options' | i18n}}
-        </div>
+        </h2>
         <div class="box-content">
             <div class="box-content-row">
                 <label class="sr-only radio-header">{{'type' | i18n}}</label>
@@ -86,22 +86,22 @@
                 </div>
                 <div class="box-content-row box-content-row-checkbox" appBoxRow>
                     <label for="uppercase">A-Z</label>
-                    <input id="uppercase" type="checkbox" (change)="saveOptions()"
+                    <input id="uppercase" type="checkbox" (change)="saveOptions()" attr.aria-label="{{'uppercase' | i18n}}"
                         [disabled]="enforcedPolicyOptions.useUppercase" [(ngModel)]="options.uppercase">
                 </div>
                 <div class="box-content-row box-content-row-checkbox" appBoxRow>
                     <label for="lowercase">a-z</label>
-                    <input id="lowercase" type="checkbox" (change)="saveOptions()"
+                    <input id="lowercase" type="checkbox" (change)="saveOptions()" attr.aria-label="{{'lowercase' | i18n}}"
                         [disabled]="enforcedPolicyOptions.useLowercase" [(ngModel)]="options.lowercase">
                 </div>
                 <div class="box-content-row box-content-row-checkbox" appBoxRow>
                     <label for="numbers">0-9</label>
-                    <input id="numbers" type="checkbox" (change)="saveOptions()"
+                    <input id="numbers" type="checkbox" (change)="saveOptions()" attr.aria-label="{{'numbers' | i18n}}"
                         [disabled]="enforcedPolicyOptions.useNumbers" [(ngModel)]="options.number">
                 </div>
                 <div class="box-content-row box-content-row-checkbox" appBoxRow>
                     <label for="special">!@#$%^&*</label>
-                    <input id="special" type="checkbox" (change)="saveOptions()"
+                    <input id="special" type="checkbox" (change)="saveOptions()" attr.aria-label="{{'specialCharacters' | i18n}}"
                         [disabled]="enforcedPolicyOptions.useSpecial" [(ngModel)]="options.special">
                 </div>
             </div>
diff --git a/src/popup/scss/base.scss b/src/popup/scss/base.scss
index 17f1b28c7e..42abe64c09 100644
--- a/src/popup/scss/base.scss
+++ b/src/popup/scss/base.scss
@@ -43,10 +43,8 @@ body {
 
 h1, h2, h3, h4, h5, h6 {
     font-family: $font-family-sans-serif;
-    
-    @include themify($themes) {
-        color: themed('textColor');
-    }
+    font-size: $font-size-base;
+    font-weight: normal;
 }
 
 p {
diff --git a/src/popup/send/send-add-edit.component.html b/src/popup/send/send-add-edit.component.html
index 10499559e8..a297103efa 100644
--- a/src/popup/send/send-add-edit.component.html
+++ b/src/popup/send/send-add-edit.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <button type="button" appBlurClick (click)="cancel()">{{'cancel' | i18n}}</button>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{title}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading || disableSend">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
@@ -96,9 +96,9 @@
         </div>
         <!-- Share -->
         <div class="box">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'share' | i18n}}
-            </div>
+            </h2>
             <div class="box-content">
                 <!-- Copy Link on Save -->
                 <div class="box-content-row box-content-row-checkbox" appBoxRow>
@@ -110,11 +110,11 @@
         </div>
         <!-- Options -->
         <div class="box">
-            <div class="box-header-expandable" (click)="showOptions = !showOptions">
+            <h2 class="box-header-expandable" (click)="showOptions = !showOptions">
                 {{'options' | i18n}}
                 <i *ngIf="!showOptions" class="fa fa-chevron-down fa-sm icon"></i>
                 <i *ngIf="showOptions" class="fa fa-chevron-up fa-sm icon"></i>
-            </div>
+            </h2>
         </div>
         <div [hidden]="!showOptions">
             <app-send-efflux-dates
@@ -156,7 +156,7 @@
                         </div>
                         <div class="action-buttons" *ngIf="!disableSend">
                             <button type="button" class="row-btn" appStopClick appBlurClick
-                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePasswordVisible()">
+                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePasswordVisible()" [attr.aria-pressed]="showPassword">
                                 <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"
                                     aria-hidden="true"></i>
                             </button>
diff --git a/src/popup/send/send-groupings.component.html b/src/popup/send/send-groupings.component.html
index 34bc2f1bfe..9b9c7d4131 100644
--- a/src/popup/send/send-groupings.component.html
+++ b/src/popup/send/send-groupings.component.html
@@ -2,6 +2,7 @@
     <div class="left" *ngIf="showLeftHeader">
         <app-pop-out></app-pop-out>
     </div>
+    <h1 class="sr-only">{{'send' | i18n}}</h1>
     <div class="search">
         <input type="search" placeholder="{{'searchSends' | i18n}}" id="search" [(ngModel)]="searchText"
             (input)="search(200)" autocomplete="off" appAutofocus>
@@ -28,9 +29,9 @@
     </div>
     <ng-container *ngIf="sends && sends.length && !showSearching()">
         <div class="box list">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'types' | i18n}}
-            </div>
+            </h2>
             <div class="box-content single-line">
                 <button type="button" class="box-content-row" appStopClick appBlurClick (click)="selectType(sendType.Text)">
                     <div class="row-main">
@@ -51,10 +52,10 @@
             </div>
         </div>
         <div class="box list">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'allSends' | i18n}}
                 <div class="flex-right">{{sends.length}}</div>
-            </div>
+            </h2>
             <div class="box-content">
                 <app-send-list [sends]="sends" title="{{'editItem' | i18n}}" [disabledByPolicy]="disableSend"
                     (onSelected)="selectSend($event)" (onCopySendLink)="copy($event)"
diff --git a/src/popup/send/send-type.component.html b/src/popup/send/send-type.component.html
index d489e5f3a5..e25f7f1b64 100644
--- a/src/popup/send/send-type.component.html
+++ b/src/popup/send/send-type.component.html
@@ -5,6 +5,7 @@
             <span>{{'back' | i18n}}</span>
         </button>
     </div>
+    <h1 class="sr-only">{{'send' | i18n}}</h1>
     <div class="search">
         <input type="search" placeholder="{{'searchType' | i18n}}" id="search" [(ngModel)]="searchText"
             (input)="search(200)" autocomplete="off" appAutofocus>
@@ -30,10 +31,10 @@
         </ng-container>
     </div>
     <div class="box list only-list" *ngIf="filteredSends.length">
-        <div class="box-header">
+        <h2 class="box-header">
             {{groupingTitle}}
             <span class="flex-right">{{filteredSends.length}}</span>
-        </div>
+        </h2>
         <div class="box-content">
             <app-send-list [sends]="filteredSends" title="{{'editItem' | i18n}}" [disabledByPolicy]="disableSend"
                 (onSelected)="selectSend($event)" (onCopySendLink)="copy($event)"
diff --git a/src/popup/settings/excluded-domains.component.html b/src/popup/settings/excluded-domains.component.html
index 50bc0a856e..fd5b217f49 100644
--- a/src/popup/settings/excluded-domains.component.html
+++ b/src/popup/settings/excluded-domains.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <a routerLink="/tabs/settings">{{'cancel' | i18n}}</a>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'excludedDomains' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick>{{'save' | i18n}}</button>
         </div>
diff --git a/src/popup/settings/export.component.html b/src/popup/settings/export.component.html
index 8dfe5babdd..5e912107ef 100644
--- a/src/popup/settings/export.component.html
+++ b/src/popup/settings/export.component.html
@@ -6,9 +6,9 @@
                 <span>{{'back' | i18n}}</span>
             </a>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'exportVault' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button appBlurClick type="submit" [disabled]="!exportForm.enabled">{{'submit' | i18n}}</button>
         </div>
diff --git a/src/popup/settings/folder-add-edit.component.html b/src/popup/settings/folder-add-edit.component.html
index 9ebdeb7ab3..23d61026d4 100644
--- a/src/popup/settings/folder-add-edit.component.html
+++ b/src/popup/settings/folder-add-edit.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <a routerLink="/folders">{{'cancel' | i18n}}</a>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{title}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
diff --git a/src/popup/settings/folders.component.html b/src/popup/settings/folders.component.html
index 6becefcf38..a05a22b60d 100644
--- a/src/popup/settings/folders.component.html
+++ b/src/popup/settings/folders.component.html
@@ -5,9 +5,9 @@
             <span>{{'back' | i18n}}</span>
         </a>
     </div>
-    <div class="center">
+    <h1 class="center">
         <span class="title">{{'folders' | i18n}}</span>
-    </div>
+    </h1>
     <div class="right">
         <button type="button" appBlurClick (click)="addFolder()" appA11yTitle="{{'addFolder' | i18n}}">
             <i class="fa fa-plus fa-lg fa-fw" aria-hidden="true"></i>
diff --git a/src/popup/settings/options.component.html b/src/popup/settings/options.component.html
index 77161c2c90..440b023251 100644
--- a/src/popup/settings/options.component.html
+++ b/src/popup/settings/options.component.html
@@ -5,18 +5,18 @@
             <span>{{'back' | i18n}}</span>
         </a>
     </div>
-    <div class="center">
+    <h1 class="center">
         <span class="title">{{'options' | i18n}}</span>
-    </div>
+    </h1>
     <div class="right"></div>
 </header>
 <content>
     <div class="box">
-        <div class="box-header-expandable" (click)="showGeneral = !showGeneral">
+        <h2 class="box-header-expandable" (click)="showGeneral = !showGeneral">
             General
             <i *ngIf="!showGeneral" class="fa fa-chevron-down fa-sm icon"></i>
             <i *ngIf="showGeneral" class="fa fa-chevron-up fa-sm icon"></i>
-        </div>
+        </h2>
     </div>
     <ng-container *ngIf="showGeneral">
         <div class="box">
@@ -84,11 +84,11 @@
         </div>
     </ng-container>
     <div class="box box-section-divider">
-        <div class="box-header-expandable" (click)="showDisplay = !showDisplay">
+        <h2 class="box-header-expandable" (click)="showDisplay = !showDisplay">
             Display
             <i *ngIf="!showDisplay" class="fa fa-chevron-down fa-sm icon"></i>
             <i *ngIf="showDisplay" class="fa fa-chevron-up fa-sm icon"></i>
-        </div>
+        </h2>
     </div>
     <ng-container *ngIf="showDisplay">
         <div class="box">
@@ -141,11 +141,11 @@
         </div>
     </ng-container>
     <div class="box box-section-divider">
-        <div class="box-header-expandable" (click)="showAutofill = !showAutofill">
+        <h2 class="box-header-expandable" (click)="showAutofill = !showAutofill">
             Autofill
             <i *ngIf="!showAutofill" class="fa fa-chevron-down fa-sm icon"></i>
             <i *ngIf="showAutofill" class="fa fa-chevron-up fa-sm icon"></i>
-        </div>
+        </h2>
     </div>
     <ng-container *ngIf="showAutofill">
         <div class="box">
diff --git a/src/popup/settings/premium.component.html b/src/popup/settings/premium.component.html
index 3fbb32552e..3f82c6abd8 100644
--- a/src/popup/settings/premium.component.html
+++ b/src/popup/settings/premium.component.html
@@ -5,9 +5,9 @@
             <span>{{'back' | i18n}}</span>
         </a>
     </div>
-    <div class="center">
+    <h1 class="center">
         <span class="title">{{'premiumMembership' | i18n}}</span>
-    </div>
+    </h1>
     <div class="right"></div>
 </header>
 <content>
diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html
index 20908836e8..1ca91e9ef7 100644
--- a/src/popup/settings/settings.component.html
+++ b/src/popup/settings/settings.component.html
@@ -2,14 +2,14 @@
     <div class="left">
         <app-pop-out></app-pop-out>
     </div>
-    <div class="center">
+    <h1 class="center">
         <span class="title">{{'settings' | i18n}}</span>
-    </div>
+    </h1>
     <div class="right"></div>
 </header>
 <content>
     <div class="box list">
-        <div class="box-header">{{'manage' | i18n}}</div>
+        <h2 class="box-header">{{'manage' | i18n}}</h2>
         <div class="box-content single-line">
             <a class="box-content-row box-content-row-flex text-default" routerLink="/folders">
                 <div class="row-main">{{'folders' | i18n}}</div>
@@ -26,7 +26,7 @@
         </div>
     </div>
     <div class="box list">
-        <div class="box-header">{{'security' | i18n}}</div>
+        <h2 class="box-header">{{'security' | i18n}}</h2>
         <div class="box-content single-line">
             <app-vault-timeout-input [vaultTimeouts]="vaultTimeouts" [formControl]="vaultTimeout" ngDefaultControl></app-vault-timeout-input>
             <div class="box-content-row display-block" appBoxRow>
@@ -61,7 +61,7 @@
         </div>
     </div>
     <div class="box list">
-        <div class="box-header">{{'account' | i18n}}</div>
+        <h2 class="box-header">{{'account' | i18n}}</h2>
         <div class="box-content single-line">
             <a class="box-content-row" routerLink="/premium">
                 <div class="row-main">
@@ -88,7 +88,7 @@
         </div>
     </div>
     <div class="box list">
-        <div class="box-header">{{'tools' | i18n}}</div>
+        <h2 class="box-header">{{'tools' | i18n}}</h2>
         <div class="box-content single-line">
             <button type="button" class="box-content-row box-content-row-flex text-default" appStopClick appBlurClick
                 (click)="import()">
@@ -108,7 +108,7 @@
         </div>
     </div>
     <div class="box list">
-        <div class="box-header">{{'other' | i18n}}</div>
+        <h2 class="box-header">{{'other' | i18n}}</h2>
         <div class="box-content single-line">
             <a class="box-content-row box-content-row-flex text-default" routerLink="/options">
                 <div class="row-main">{{'options' | i18n}}</div>
diff --git a/src/popup/settings/sync.component.html b/src/popup/settings/sync.component.html
index 722a79f17a..2ec7c82548 100644
--- a/src/popup/settings/sync.component.html
+++ b/src/popup/settings/sync.component.html
@@ -5,9 +5,9 @@
             <span>{{'back' | i18n}}</span>
         </a>
     </div>
-    <div class="center">
+    <h1 class="center">
         <span class="title">{{'sync' | i18n}}</span>
-    </div>
+    </h1>
     <div class="right"></div>
 </header>
 <content>
diff --git a/src/popup/vault/add-edit-custom-fields.component.html b/src/popup/vault/add-edit-custom-fields.component.html
index aa8262e3f9..fe36ab0a4b 100644
--- a/src/popup/vault/add-edit-custom-fields.component.html
+++ b/src/popup/vault/add-edit-custom-fields.component.html
@@ -1,7 +1,7 @@
 <div class="box">
-    <div class="box-header">
+    <h2 class="box-header">
         {{'customFields' | i18n}}
-    </div>
+    </h2>
     <div class="box-content">
         <!-- Current custom fields -->
         <div cdkDropList (cdkDropListDropped)="drop($event)" *ngIf="cipher.hasFields">
@@ -34,7 +34,7 @@
                     *ngIf="f.type === fieldType.Boolean" appTrueFalseValue trueValue="true" falseValue="false">
                 <div class="action-buttons" *ngIf="f.type === fieldType.Hidden && (cipher.viewPassword || f.newField)">
                     <button type="button" class="row-btn" appStopClick appBlurClick appA11yTitle="{{'toggleVisibility' | i18n}}"
-                        (click)="toggleFieldValue(f)">
+                        (click)="toggleFieldValue(f)" [attr.aria-pressed]="f.showValue">
                         <i class="fa fa-lg" aria-hidden="true"
                             [ngClass]="{'fa-eye': !f.showValue, 'fa-eye-slash': f.showValue}"></i>
                     </button>
diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index 591886b993..971413f80e 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <button type="button" appBlurClick (click)="cancel()">{{'cancel' | i18n}}</button>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{title}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
@@ -18,9 +18,9 @@
             {{'personalOwnershipPolicyInEffect' | i18n}}
         </app-callout>
         <div class="box">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'itemInformation' | i18n}}
-            </div>
+            </h2>
             <div class="box-content">
                 <div class="box-content-row" *ngIf="!editMode" appBoxRow>
                     <label for="type">{{'type' | i18n}}</label>
@@ -58,7 +58,7 @@
                             </button>
                             <button type="button" class="row-btn" appStopClick appBlurClick
                                 appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()"
-                                *ngIf="cipher.viewPassword">
+                                *ngIf="cipher.viewPassword" [attr.aria-pressed]="showPassword">
                                 <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </button>
@@ -91,7 +91,7 @@
                         </div>
                         <div class="action-buttons">
                             <button type="button" class="row-btn" appStopClick appBlurClick
-                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleCardNumber()">
+                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleCardNumber()" [attr.aria-pressed]="showCardNumber">
                                 <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showCardNumber, 'fa-eye-slash': showCardNumber}"></i>
                             </button>
@@ -122,7 +122,7 @@
                         </div>
                         <div class="action-buttons">
                             <button type="button" class="row-btn" appStopClick appBlurClick
-                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleCardCode()">
+                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleCardCode()" [attr.aria-pressed]="showCardCode">
                                 <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
                             </button>
@@ -314,9 +314,9 @@
             </div>
         </div>
         <div class="box">
-            <div class="box-header">
+            <h2 class="box-header">
                 <label for="notes">{{'notes' | i18n}}</label>
-            </div>
+            </h2>
             <div class="box-content">
                 <div class="box-content-row" appBoxRow>
                     <textarea id="notes" name="Notes" rows="6" [(ngModel)]="cipher.notes"></textarea>
@@ -326,9 +326,9 @@
         <app-vault-add-edit-custom-fields [cipher]="cipher" [thisCipherType]="cipher.type" [editMode]="editMode">
         </app-vault-add-edit-custom-fields>
         <div class="box" *ngIf="allowOwnershipOptions()">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'ownership' | i18n}}
-            </div>
+            </h2>
             <div class="box-content">
                 <div class="box-content-row" appBoxRow>
                     <label for="organizationId">{{'whoOwnsThisItem' | i18n}}</label>
@@ -340,9 +340,9 @@
             </div>
         </div>
         <div class="box" *ngIf="(!editMode || cloneMode )&& cipher.organizationId">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'collections' | i18n}}
-            </div>
+            </h2>
             <div class="box-content" *ngIf="!collections || !collections.length">
                 <div class="box-content-row padded no-hover">
                     {{'noCollectionsInList' | i18n}}
diff --git a/src/popup/vault/attachments.component.html b/src/popup/vault/attachments.component.html
index a1fb60d8e4..8d709453c7 100644
--- a/src/popup/vault/attachments.component.html
+++ b/src/popup/vault/attachments.component.html
@@ -9,9 +9,9 @@
                 <span>{{'back' | i18n}}</span>
             </button>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'attachments' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
@@ -40,9 +40,9 @@
             </div>
         </div>
         <div class="box">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'newAttachment' | i18n}}
-            </div>
+            </h2>
             <div class="box-content no-hover">
                 <div class="box-content-row">
                     <label for="file">{{'file' | i18n}}</label>
diff --git a/src/popup/vault/ciphers.component.html b/src/popup/vault/ciphers.component.html
index 90f7c08832..d59462c09a 100644
--- a/src/popup/vault/ciphers.component.html
+++ b/src/popup/vault/ciphers.component.html
@@ -5,6 +5,7 @@
             <span>{{'back' | i18n}}</span>
         </button>
     </div>
+    <h1 class="sr-only">{{'myVault' | i18n}}</h1>
     <div class="search">
         <input type="{{searchTypeSearch ? 'search' : 'text'}}"
             placeholder="{{searchPlaceholder || ('searchVault' | i18n)}}" id="search" [(ngModel)]="searchText"
@@ -20,9 +21,9 @@
 <content [ngClass]="{'stacked-boxes': showGroupings()}">
     <ng-container *ngIf="showGroupings()">
         <div class="box list" *ngIf="nestedFolders && nestedFolders.length">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'folders' | i18n}}
-            </div>
+            </h2>
             <div class="box-content single-line">
                 <button type="button" *ngFor="let f of nestedFolders" class="box-content-row" appStopClick appBlurClick
                     (click)="selectFolder(f.node)">
@@ -38,9 +39,9 @@
             </div>
         </div>
         <div class="box list" *ngIf="nestedCollections && nestedCollections.length">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'collections' | i18n}}
-            </div>
+            </h2>
             <div class="box-content single-line">
                 <button type="button" *ngFor="let c of nestedCollections" class="box-content-row" appStopClick appBlurClick
                     (click)="selectCollection(c.node)">
@@ -66,10 +67,10 @@
         <cdk-virtual-scroll-viewport itemSize="46" minBufferPx="400" maxBufferPx="600" *ngIf="ciphers.length"
             #virtualScrollViewport>
             <div class="box list only-list">
-                <div class="box-header">
+                <h2 class="box-header">
                     {{groupingTitle}}
                     <span class="flex-right">{{isSearching() ? ciphers.length : ciphers.length}}</span>
-                </div>
+                </h2>
                 <div class="box-content">
                     <app-cipher-row *cdkVirtualFor="let c of ciphers" [cipher]="c" title="{{'viewItem' | i18n}}"
                         (onSelected)="selectCipher($event)" (launchEvent)="launchCipher($event)"></app-cipher-row>
diff --git a/src/popup/vault/collections.component.html b/src/popup/vault/collections.component.html
index a1265dc916..e96c3a5b67 100644
--- a/src/popup/vault/collections.component.html
+++ b/src/popup/vault/collections.component.html
@@ -6,9 +6,9 @@
                 <span>{{'back' | i18n}}</span>
             </button>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'collections' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
diff --git a/src/popup/vault/current-tab.component.html b/src/popup/vault/current-tab.component.html
index c4455992cd..d2a9ae9fc3 100644
--- a/src/popup/vault/current-tab.component.html
+++ b/src/popup/vault/current-tab.component.html
@@ -1,4 +1,5 @@
 <header>
+    <h1 class="sr-only">{{'currentTab' | i18n}}</h1>
     <div class="left">
         <app-pop-out [show]="!inSidebar"></app-pop-out>
         <button type="button" appBlurClick (click)="refresh()" appA11yTitle="{{'refresh' | i18n}}" *ngIf="inSidebar">
@@ -22,10 +23,10 @@
     </div>
     <ng-container *ngIf="loaded">
         <div class="box list" *ngIf="loginCiphers">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'typeLogins' | i18n}}
                 <span class="flex-right">{{loginCiphers.length}}</span>
-            </div>
+            </h2>
             <div class="box-content">
                 <app-cipher-row *ngFor="let loginCipher of loginCiphers" [cipher]="loginCipher" 
                     title="{{'autoFill' | i18n}}" [showView]="true" (onSelected)="fillCipher($event)" 
@@ -40,20 +41,20 @@
             </div>
         </div>
         <div class="box list" *ngIf="cardCiphers && cardCiphers.length">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'cards' | i18n}}
                 <span class="flex-right">{{cardCiphers.length}}</span>
-            </div>
+            </h2>
             <div class="box-content">
                 <app-cipher-row *ngFor="let cardCipher of cardCiphers" [cipher]="cardCipher" title="{{'autoFill' | i18n}}" [showView]="true"
                     (onSelected)="fillCipher($event)" (onView)="viewCipher($event)"></app-cipher-row>
             </div>
         </div>
         <div class="box list" *ngIf="identityCiphers && identityCiphers.length">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'identities' | i18n}}
                 <span class="flex-right">{{identityCiphers.length}}</span>
-            </div>
+            </h2>
             <div class="box-content">
                 <app-cipher-row *ngFor="let identityCipher of identityCiphers" [cipher]="identityCipher" title="{{'autoFill' | i18n}}" [showView]="true"
                     (onSelected)="fillCipher($event)" (onView)="viewCipher($event)"></app-cipher-row>
diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html
index 32cefbe75b..4f74ec7d02 100644
--- a/src/popup/vault/groupings.component.html
+++ b/src/popup/vault/groupings.component.html
@@ -2,6 +2,7 @@
     <div class="left">
         <app-pop-out></app-pop-out>
     </div>
+    <h1 class="sr-only">{{'myVault' | i18n}}</h1>
     <div class="search">
         <input type="{{searchTypeSearch ? 'search' : 'text'}}" placeholder="{{'searchVault' | i18n}}" id="search"
             [(ngModel)]="searchText" (input)="search(200)" autocomplete="off" appAutofocus (keydown)="closeOnEsc($event)">
@@ -24,10 +25,10 @@
     </div>
     <ng-container *ngIf="ciphers && ciphers.length && !showSearching()">
         <div class="box list" *ngIf="favoriteCiphers">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'favorites' | i18n}}
                 <span class="flex-right">{{favoriteCiphers.length}}</span>
-            </div>
+            </h2>
             <div class="box-content">
                 <app-cipher-row *ngFor="let favoriteCipher of favoriteCiphers" [cipher]="favoriteCipher"
                     title="{{'viewItem' | i18n}}" (onSelected)="selectCipher($event)"
@@ -35,10 +36,10 @@
             </div>
         </div>
         <div class="box list">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'types' | i18n}}
                 <span class="flex-right">4</span>
-            </div>
+            </h2>
             <div class="box-content single-line">
                 <button type="button" class="box-content-row" appStopClick appBlurClick (click)="selectType(cipherType.Login)">
                     <div class="row-main">
@@ -76,10 +77,10 @@
             </div>
         </div>
         <div class="box list" *ngIf="nestedFolders?.length">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'folders' | i18n}}
                 <span class="flex-right">{{folderCount}}</span>
-            </div>
+            </h2>
             <div class="box-content single-line">
                 <button type="button" *ngFor="let f of nestedFolders" class="box-content-row" appStopClick appBlurClick
                     (click)="selectFolder(f.node)">
@@ -96,10 +97,10 @@
             </div>
         </div>
         <div class="box list" *ngIf="nestedCollections && nestedCollections.length">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'collections' | i18n}}
                 <span class="flex-right">{{nestedCollections.length}}</span>
-            </div>
+            </h2>
             <div class="box-content single-line">
                 <button type="button" *ngFor="let nestedCollection of nestedCollections" class="box-content-row"
                     appStopClick appBlurClick (click)="selectCollection(nestedCollection.node)">
@@ -113,10 +114,10 @@
             </div>
         </div>
         <div class="box list" *ngIf="showNoFolderCiphers">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'noneFolder' | i18n}}
                 <div class="flex-right">{{noFolderCiphers.length}}</div>
-            </div>
+            </h2>
             <div class="box-content">
                 <app-cipher-row *ngFor="let noFolderCipher of noFolderCiphers" [cipher]="noFolderCipher"
                     title="{{'viewItem' | i18n}}" (onSelected)="selectCipher($event)"
@@ -124,10 +125,10 @@
             </div>
         </div>
         <div class="box list" *ngIf="deletedCount">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'trash' | i18n}}
                 <span class="flex-right">{{deletedCount}}</span>
-            </div>
+            </h2>
             <div class="box-content single-line">
                 <button type="button" class="box-content-row" appStopClick appBlurClick
                     (click)="selectTrash()">
diff --git a/src/popup/vault/password-history.component.html b/src/popup/vault/password-history.component.html
index 83eed5671c..25da87a609 100644
--- a/src/popup/vault/password-history.component.html
+++ b/src/popup/vault/password-history.component.html
@@ -2,9 +2,9 @@
     <div class="left">
         <button type="button" appBlurClick (click)="close()">{{'close' | i18n}}</button>
     </div>
-    <div class="center">
+    <h1 class="center">
         <span class="title">{{'passwordHistory' | i18n}}</span>
-    </div>
+    </h1>
     <div class="right"></div>
 </header>
 <content>
diff --git a/src/popup/vault/share.component.html b/src/popup/vault/share.component.html
index f6422ae634..a16dd91bc3 100644
--- a/src/popup/vault/share.component.html
+++ b/src/popup/vault/share.component.html
@@ -3,9 +3,9 @@
         <div class="left">
             <button type="button" appBlurClick (click)="cancel()">{{'cancel' | i18n}}</button>
         </div>
-        <div class="center">
+        <h1 class="center">
             <span class="title">{{'moveToOrganization' | i18n}}</span>
-        </div>
+        </h1>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading || !canSave"
                 *ngIf="organizations && organizations.length">
@@ -35,9 +35,9 @@
             </div>
         </div>
         <div class="box" *ngIf="organizations && organizations.length">
-            <div class="box-header">
+            <h2 class="box-header">
                 {{'collections' | i18n}}
-            </div>
+            </h2>
             <div class="box-content" *ngIf="!collections || !collections.length">
                 <div class="box-content-row padded no-hover">
                     {{'noCollectionsInList' | i18n}}
diff --git a/src/popup/vault/view-custom-fields.component.html b/src/popup/vault/view-custom-fields.component.html
index f6554b38ff..e62e8d6bc5 100644
--- a/src/popup/vault/view-custom-fields.component.html
+++ b/src/popup/vault/view-custom-fields.component.html
@@ -1,7 +1,7 @@
 <ng-container>
-    <div class="box-header">
+    <h2 class="box-header">
         {{'customFields' | i18n}}
-    </div>
+    </h2>
     <div class="box-content">
         <div class="box-content-row box-content-row-flex" *ngFor="let field of cipher.fields">
             <div class="row-main">
@@ -29,7 +29,7 @@
             <div class="action-buttons">
                 <button type="button" class="row-btn" appStopClick attr.aria-label="{{'toggleVisibility' | i18n}} {{field.name}}" appA11yTitle="{{'toggleVisibility' | i18n}}"
                     *ngIf="field.type === fieldType.Hidden && cipher.viewPassword"
-                    (click)="toggleFieldValue(field)">
+                    (click)="toggleFieldValue(field)" [attr.aria-pressed]="field.showValue">
                     <i class="fa fa-lg" aria-hidden="true"
                         [ngClass]="{'fa-eye': !field.showValue, 'fa-eye-slash': field.showValue}"></i>
                 </button>
diff --git a/src/popup/vault/view.component.html b/src/popup/vault/view.component.html
index 34514b09b7..d0d9699539 100644
--- a/src/popup/vault/view.component.html
+++ b/src/popup/vault/view.component.html
@@ -2,18 +2,18 @@
     <div class="left">
         <button type="button" appBlurClick (click)="close()">{{'close' | i18n}}</button>
     </div>
-    <div class="center">
+    <h1 class="center">
         <span class="title">{{'viewItem' | i18n}}</span>
-    </div>
+    </h1>
     <div class="right" *ngIf="cipher">
         <button type="button" appBlurClick (click)="edit()" *ngIf="!cipher.isDeleted">{{'edit' | i18n}}</button>
     </div>
 </header>
 <content *ngIf="cipher">
     <div class="box">
-        <div class="box-header">
+        <h2 class="box-header">
             {{'itemInformation' | i18n}}
-        </div>
+        </h2>
         <div class="box-content">
             <div class="box-content-row">
                 <label for="name">{{'name' | i18n}}</label>
@@ -55,7 +55,7 @@
                                 aria-hidden="true"></i>
                         </button>
                         <button type="button" class="row-btn" appStopClick attr.aria-label="{{'toggleVisibility' | i18n}} {{'password' | i18n}}" appA11yTitle="{{'toggleVisibility' | i18n}}"
-                            (click)="togglePassword()" *ngIf="cipher.viewPassword">
+                            (click)="togglePassword()" *ngIf="cipher.viewPassword" [attr.aria-pressed]="showPassword">
                             <i class="fa fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                         </button>
@@ -104,7 +104,7 @@
                     </div>
                     <div class="action-buttons">
                         <button type="button" class="row-btn" appStopClick attr.aria-label="{{'toggleVisibility' | i18n}} {{'number' | i18n}}" appA11yTitle="{{'toggleVisibility' | i18n}}"
-                            (click)="toggleCardNumber()">
+                            (click)="toggleCardNumber()" [attr.aria-pressed]="showCardNumber">
                             <i class="fa fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-eye': !showCardNumber, 'fa-eye-slash': showCardNumber}"></i>
                         </button>
@@ -130,7 +130,7 @@
                     </div>
                     <div class="action-buttons">
                         <button type="button" class="row-btn" appStopClick attr.aria-label="{{'toggleVisibility' | i18n}} {{'securityCode' | i18n}}" appA11yTitle="{{'toggleVisibility' | i18n}}"
-                            (click)="toggleCardCode()">
+                            (click)="toggleCardCode()" [attr.aria-pressed]="showCardCode">
                             <i class="fa fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
                         </button>
@@ -211,9 +211,9 @@
         </div>
     </div>
     <div class="box" *ngIf="cipher.notes">
-        <div class="box-header">
+        <h2 class="box-header">
             <label for="notes">{{'notes' | i18n}}</label>
-        </div>
+        </h2>
         <div class="box-content">
             <div class="box-content-row">
                 <textarea  id="notes" [value]="cipher.notes" rows="6" readonly aria-readonly="true"></textarea>
@@ -225,9 +225,9 @@
             [copy]="copy.bind(this)"></app-vault-view-custom-fields>
     </div>
     <div class="box" *ngIf="cipher.hasAttachments && (canAccessPremium || cipher.organizationId) && showAttachments">
-        <div class="box-header">
+        <h2 class="box-header">
             {{'attachments' | i18n}}
-        </div>
+        </h2>
         <div class="box-content">
             <button type="button" class="box-content-row box-content-row-flex text-default" *ngFor="let attachment of cipher.attachments"
                 appStopClick appBlurCLick (click)="downloadAttachment(attachment)">
diff --git a/store/locales/ru/copy.resx b/store/locales/ru/copy.resx
index 8d97562506..6932fab16d 100644
--- a/store/locales/ru/copy.resx
+++ b/store/locales/ru/copy.resx
@@ -124,15 +124,31 @@
     <value>Защищенный и бесплатный менеджер паролей для всех ваших устройств</value>
   </data>
   <data name="Description" xml:space="preserve">
-    <value>Bitwarden - простой и безопасный способ хранить все ваши логины и пароли и легко их синхронизировать между всеми вашими устройствами. Расширение приложения Bitwarden позволяет быстро войти на любой веб-сайт с помощью Safari или Chrome и поддерживается сотнями других популярных приложений.
+    <value>Bitwarden, Inc. является материнской компанией 8bit Solutions LLC.
 
-Кража паролей - серьезная проблема. Сайты и приложения, которые вы используете подвергаются атакам каждый день. Проблемы в их безопасности могут привести к краже вашего пароля. Кроме того, когда вы используете одни и те же пароли на разных сайтах и приложениях, то хакеры могут легко получить доступ к нескольким вашим аккаунтам сразу (к почтовому ящику, к аккаунту банка и т. д.).
+НАЗВАН ЛУЧШИМ ДИСПЕТЧЕРОМ ПАРОЛЕЙ VERGE, US NEWS &amp; WORLD REPORT, CNET И МНОГИМИ ДРУГИМИ.
 
-Эксперты по безопасности рекомендуют использовать разные случайно сгенерированные пароли для каждого созданного вами аккаунта. Но как же управлять всеми этими паролями? Bitwarden позволяет вам легко получить доступ к вашим паролям, а так же создавать и хранить их.
+Управляйте, храните, защищайте и делитесь неограниченным количеством паролей на неограниченном количестве устройств из любого места. Bitwarden предоставляет решения с открытым исходным кодом по управлению паролями для всех, дома, на работе или в дороге.
 
-Bitwarden хранит все ваши логины и пароли в зашифрованном хранилище, которое синхронизируется между всеми вашими устройствами. До того, как данные покинут ваше устройство они будут зашифрованы и только потом отправлены. Мы в Bitwarden не сможем прочесть ваши данные, даже если мы этого захотим. Ваши данные зашифрованы при помощи алгоритма AES-256 и PBKDF2 SHA-256.
+Создавайте надежные, уникальные и случайные пароли на основе требований безопасности для каждого посещаемого вами веб-сайта.
 
-Bitwarden - это программное обеспечение с открытым на 100% исходным кодом. Исходный код Bitwarden размещен на GitHub, и каждый может свободно просматривать, проверять и вносить вклад в код Bitwarden.</value>
+Bitwarden Send быстро передает зашифрованную информацию - файлы и простой текст - напрямую кому угодно.
+
+Bitwarden предлагает для компаний планы Teams и Enterprise, чтобы вы могли безопасно делиться паролями с коллегами.
+
+Почему выбирают Bitwarden:
+
+Шифрование мирового класса
+Пароли защищены передовым сквозным шифрованием (AES-256 bit, соленый хэштег и PBKDF2 SHA-256), поэтому ваши данные остаются в безопасности и конфиденциальности.
+
+Встроенный генератор паролей
+Создавайте надежные, уникальные и случайные пароли на основе требований безопасности для каждого посещаемого вами веб-сайта.
+
+ Глобальные переводы
+ Переводы Bitwarden существуют на 40 языках и постоянно растут благодаря нашему глобальному сообществу.
+
+ Кросс-платформенные приложения
+ Защищайте и делитесь конфиденциальными данными в вашем Bitwarden Vault из любого браузера, мобильного устройства, настольной ОС и т. д.</value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
     <value>Защищенный и бесплатный менеджер паролей для всех ваших устройств</value>
@@ -150,7 +166,7 @@ Bitwarden - это программное обеспечение с открыт
     <value>Предусмотрен удобный доступ к хранилищу из контекстного меню</value>
   </data>
   <data name="ScreenshotPassword" xml:space="preserve">
-    <value>Генерируйте сильные, случайные и надежные пароли</value>
+    <value>Автоматически генерируйте сильные, случайные и надежные пароли</value>
   </data>
   <data name="ScreenshotEdit" xml:space="preserve">
     <value>Ваша информация надежно хранится благодаря шифрованию AES-256</value>