diff --git a/src/popup/accounts/environment.component.html b/src/popup/accounts/environment.component.html
index d518900b83..5654fdc367 100644
--- a/src/popup/accounts/environment.component.html
+++ b/src/popup/accounts/environment.component.html
@@ -9,7 +9,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
-                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>
     </header>
@@ -22,7 +22,7 @@
                 <div class="box-content-row" appBoxRow>
                     <label for="baseUrl">{{'baseUrl' | i18n}}</label>
                     <input id="baseUrl" type="text" name="BaseUrl" [(ngModel)]="baseUrl"
-                           placeholder="ex. https://bitwarden.company.com" appInputVerbatim>
+                        placeholder="ex. https://bitwarden.company.com" appInputVerbatim>
                 </div>
             </div>
             <div class="box-footer">
@@ -37,7 +37,7 @@
                 <div class="box-content-row" appBoxRow>
                     <label for="webVaultUrl">{{'webVaultUrl' | i18n}}</label>
                     <input id="webVaultUrl" type="text" name="WebVaultUrl" [(ngModel)]="webVaultUrl" inputmode="url"
-                           appInputVerbatim>
+                        appInputVerbatim>
                 </div>
                 <div class="box-content-row" appBoxRow>
                     <label for="apiUrl">{{'apiUrl' | i18n}}</label>
@@ -46,17 +46,17 @@
                 <div class="box-content-row" appBoxRow>
                     <label for="identityUrl">{{'identityUrl' | i18n}}</label>
                     <input id="identityUrl" type="text" name="IdentityUrl" [(ngModel)]="identityUrl" inputmode="url"
-                           appInputVerbatim>
+                        appInputVerbatim>
                 </div>
                 <div class="box-content-row" appBoxRow>
                     <label for="notificationsUrl">{{'notificationsUrl' | i18n}}</label>
                     <input id="notificationsUrl" type="text" name="NotificationsUrl" inputmode="url"
-                           [(ngModel)]="notificationsUrl" appInputVerbatim>
+                        [(ngModel)]="notificationsUrl" appInputVerbatim>
                 </div>
                 <div class="box-content-row" appBoxRow>
                     <label for="iconsUrl">{{'iconsUrl' | i18n}}</label>
                     <input id="iconsUrl" type="text" name="IconsUrl" [(ngModel)]="iconsUrl" inputmode="url"
-                           appInputVerbatim>
+                        appInputVerbatim>
                 </div>
             </div>
             <div class="box-footer" [hidden]="!showCustom">
diff --git a/src/popup/accounts/hint.component.html b/src/popup/accounts/hint.component.html
index a9693b745e..97a7a41aa2 100644
--- a/src/popup/accounts/hint.component.html
+++ b/src/popup/accounts/hint.component.html
@@ -9,7 +9,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'submit' | i18n}}</span>
-                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>
     </header>
diff --git a/src/popup/accounts/home.component.html b/src/popup/accounts/home.component.html
index aa678422a4..a4e1b3393b 100644
--- a/src/popup/accounts/home.component.html
+++ b/src/popup/accounts/home.component.html
@@ -7,5 +7,5 @@
     </div>
 </div>
 <a routerLink="/environment" class="settings-icon">
-    <i class="fa fa-cog fa-lg"></i><span>&nbsp;{{'settings' | i18n}}</span>
+    <i class="fa fa-cog fa-lg" aria-hidden="true"></i><span>&nbsp;{{'settings' | i18n}}</span>
 </a>
diff --git a/src/popup/accounts/lock.component.html b/src/popup/accounts/lock.component.html
index 37bf7299a5..e909d91e21 100644
--- a/src/popup/accounts/lock.component.html
+++ b/src/popup/accounts/lock.component.html
@@ -23,9 +23,10 @@
                             class="monospaced" [(ngModel)]="masterPassword" required appInputVerbatim>
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleVisibility' | i18n}}"
-                            (click)="togglePassword()">
-                            <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                        <a class="row-btn" href="#" appStopClick appBlurClick
+                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                            <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"
+                                aria-hidden="true"></i>
                         </a>
                     </div>
                 </div>
diff --git a/src/popup/accounts/login.component.html b/src/popup/accounts/login.component.html
index 66e5651cee..6c9c222d99 100644
--- a/src/popup/accounts/login.component.html
+++ b/src/popup/accounts/login.component.html
@@ -9,7 +9,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'login' | i18n}}</span>
-                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>
     </header>
@@ -28,9 +28,10 @@
                             class="monospaced" [(ngModel)]="masterPassword" required appInputVerbatim>
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleVisibility' | i18n}}"
-                            (click)="togglePassword()">
-                            <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                        <a class="row-btn" href="#" appStopClick appBlurClick
+                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                            <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"
+                                aria-hidden="true"></i>
                         </a>
                     </div>
                 </div>
diff --git a/src/popup/accounts/register.component.html b/src/popup/accounts/register.component.html
index ed98c66f18..4a8701ea2a 100644
--- a/src/popup/accounts/register.component.html
+++ b/src/popup/accounts/register.component.html
@@ -9,7 +9,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'submit' | i18n}}</span>
-                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>
     </header>
@@ -36,9 +36,9 @@
                                 [appAutofocus]="email !== ''" appInputVerbatim (input)="updatePasswordStrength()">
                         </div>
                         <div class="action-buttons">
-                            <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleVisibility' | i18n}}"
-                                (click)="togglePassword(false)">
-                                <i class="fa fa-lg"
+                            <a class="row-btn" href="#" appStopClick appBlurClick
+                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)">
+                                <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </a>
                         </div>
@@ -64,9 +64,10 @@
                             appInputVerbatim>
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleVisibility' | i18n}}"
-                            (click)="togglePassword(true)">
-                            <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                        <a class="row-btn" href="#" appStopClick appBlurClick
+                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
+                            <i class="fa fa-lg" aria-hidden="true"
+                                [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                         </a>
                     </div>
                 </div>
diff --git a/src/popup/accounts/two-factor.component.html b/src/popup/accounts/two-factor.component.html
index 33bbf1e247..5b2ee5e333 100644
--- a/src/popup/accounts/two-factor.component.html
+++ b/src/popup/accounts/two-factor.component.html
@@ -11,7 +11,7 @@
                         selectedProviderType !== providerType.OrganizationDuo &&
                         (selectedProviderType !== providerType.U2f || form.loading)">
                 <span [hidden]="form.loading">{{'continue' | i18n}}</span>
-                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>
     </header>
diff --git a/src/popup/components/action-buttons.component.html b/src/popup/components/action-buttons.component.html
index 866c396bbd..276666fb97 100644
--- a/src/popup/components/action-buttons.component.html
+++ b/src/popup/components/action-buttons.component.html
@@ -1,36 +1,36 @@
-<span class="row-btn" (click)="view()" appStopClick appStopProp title="{{'view' | i18n}}" *ngIf="showView">
-    <i class="fa fa-lg fa-list-alt"></i>
+<span class="row-btn" (click)="view()" appStopClick appStopProp appA11yTitle="{{'view' | i18n}}" *ngIf="showView">
+    <i class="fa fa-lg fa-list-alt" aria-hidden="true"></i>
 </span>
 <ng-container *ngIf="cipher.type === cipherType.Login">
-    <span class="row-btn" appStopClick appStopProp title="{{'launch' | i18n}}" (click)="launch()" *ngIf="!showView"
-        [ngClass]="{disabled: !cipher.login.canLaunch}">
-        <i class="fa fa-lg fa-share-square-o"></i>
+    <span class="row-btn" appStopClick appStopProp appA11yTitle="{{'launch' | i18n}}" (click)="launch()"
+        *ngIf="!showView" [ngClass]="{disabled: !cipher.login.canLaunch}">
+        <i class="fa fa-lg fa-share-square-o" aria-hidden="true"></i>
     </span>
-    <span class="row-btn" appStopClick appStopProp title="{{'copyUsername' | i18n}}"
+    <span class="row-btn" appStopClick appStopProp appA11yTitle="{{'copyUsername' | i18n}}"
         (click)="copy(cipher, cipher.login.username, 'username', 'Username')"
         [ngClass]="{disabled: !cipher.login.username}">
-        <i class="fa fa-lg fa-user"></i>
+        <i class="fa fa-lg fa-user" aria-hidden="true"></i>
     </span>
-    <span class="row-btn" appStopClick appStopProp title="{{'copyPassword' | i18n}}"
+    <span class="row-btn" appStopClick appStopProp appA11yTitle="{{'copyPassword' | i18n}}"
         (click)="copy(cipher, cipher.login.password, 'password', 'Password')"
         [ngClass]="{disabled: !cipher.login.password}">
-        <i class="fa fa-lg fa-key"></i>
+        <i class="fa fa-lg fa-key" aria-hidden="true"></i>
     </span>
 </ng-container>
 <ng-container *ngIf="cipher.type === cipherType.Card">
-    <span class="row-btn" appStopClick appStopProp title="{{'copyNumber' | i18n}}"
+    <span class="row-btn" appStopClick appStopProp appA11yTitle="{{'copyNumber' | i18n}}"
         (click)="copy(cipher, cipher.card.number, 'number', 'Card Number')" [ngClass]="{disabled: !cipher.card.number}">
-        <i class="fa fa-lg fa-hashtag"></i>
+        <i class="fa fa-lg fa-hashtag" aria-hidden="true"></i>
     </span>
-    <span class="row-btn" appStopClick appStopProp title="{{'copySecurityCode' | i18n}}"
+    <span class="row-btn" appStopClick appStopProp appA11yTitle="{{'copySecurityCode' | i18n}}"
         (click)="copy(cipher, cipher.card.code, 'securityCode', 'Security Code')"
         [ngClass]="{disabled: !cipher.card.code}">
-        <i class="fa fa-lg fa-key"></i>
+        <i class="fa fa-lg fa-key" aria-hidden="true"></i>
     </span>
 </ng-container>
 <ng-container *ngIf="cipher.type === cipherType.SecureNote">
-    <span class="row-btn" appStopClick appStopProp title="{{'copyNote' | i18n}}"
+    <span class="row-btn" appStopClick appStopProp appA11yTitle="{{'copyNote' | i18n}}"
         (click)="copy(cipher, cipher.notes, 'note', 'Note')" [ngClass]="{disabled: !cipher.notes}">
-        <i class="fa fa-lg fa-clipboard"></i>
+        <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
     </span>
 </ng-container>
diff --git a/src/popup/components/ciphers-list.component.html b/src/popup/components/ciphers-list.component.html
index de34720380..33c585ad1f 100644
--- a/src/popup/components/ciphers-list.component.html
+++ b/src/popup/components/ciphers-list.component.html
@@ -5,8 +5,14 @@
         <div class="row-main-content">
             <span class="text">
                 {{c.name}}
-                <i class="fa fa-share-alt text-muted" *ngIf="c.organizationId" title="{{'shared' | i18n}}"></i>
-                <i class="fa fa-paperclip text-muted" *ngIf="c.hasAttachments" title="{{'attachments' | i18n}}"></i>
+                <ng-container *ngIf="c.organizationId">
+                    <i class="fa fa-share-alt text-muted" title="{{'shared' | i18n}}" aria-hidden="true"></i>
+                    <span class="sr-only">{{'shared' | i18n}}</span>
+                </ng-container>
+                <ng-container *ngIf="c.hasAttachments">
+                    <i class="fa fa-paperclip text-muted" title="{{'attachments' | i18n}}" aria-hidden="true"></i>
+                    <span class="sr-only">{{'attachments' | i18n}}</span>
+                </ng-container>
             </span>
             <span class="detail">{{c.subTitle}}</span>
         </div>
diff --git a/src/popup/components/pop-out.component.html b/src/popup/components/pop-out.component.html
index c8ae8a606b..2f14e7c0cb 100644
--- a/src/popup/components/pop-out.component.html
+++ b/src/popup/components/pop-out.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="show">
-    <button (click)="expand()" title="{{'popOutNewWindow' | i18n}}">
-        <i class="fa fa-external-link fa-rotate-270 fa-lg fa-fw"></i>
+    <button (click)="expand()" appA11yTitle="{{'popOutNewWindow' | i18n}}">
+        <i class="fa fa-external-link fa-rotate-270 fa-lg fa-fw" aria-hidden="true"></i>
     </button>
 </ng-container>
diff --git a/src/popup/generator/password-generator-history.component.html b/src/popup/generator/password-generator-history.component.html
index 3a4c5efbc7..48190a650a 100644
--- a/src/popup/generator/password-generator-history.component.html
+++ b/src/popup/generator/password-generator-history.component.html
@@ -1,7 +1,7 @@
 <header>
     <div class="left">
         <button appBlurClick type="button" (click)="close()">
-            <span class="header-icon"><i class="fa fa-chevron-left"></i></span>
+            <span class="header-icon" aria-hidden="true"><i class="fa fa-chevron-left"></i></span>
             <span>{{'back' | i18n}}</span>
         </button>
     </div>
@@ -26,9 +26,9 @@
                     </div>
                 </div>
                 <div class="action-buttons">
-                    <a class="row-btn" href="#" appStopClick title="{{'copyPassword' | i18n}}"
+                    <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyPassword' | i18n}}"
                         (click)="copy(h.password)">
-                        <i class="fa fa-lg fa-clipboard"></i>
+                        <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                     </a>
                 </div>
             </div>
diff --git a/src/popup/generator/password-generator.component.html b/src/popup/generator/password-generator.component.html
index ab7ca9712f..ff51415ca7 100644
--- a/src/popup/generator/password-generator.component.html
+++ b/src/popup/generator/password-generator.component.html
@@ -26,7 +26,7 @@
         <div class="box-content single-line">
             <a class="box-content-row box-content-row-flex" routerLink="/generator-history">
                 <div class="row-main">{{'passwordHistory' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
         </div>
     </div>
diff --git a/src/popup/index.html b/src/popup/index.html
index eb38555c82..9a174c1dcc 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -8,7 +8,7 @@
 </head>
 <body>
     <app-root>
-        <div id="loading"><i class="fa fa-spinner fa-spin fa-3x"></i></div>
+        <div id="loading"><i class="fa fa-spinner fa-spin fa-3x" aria-hidden="true"></i></div>
     </app-root>
 </body>
 </html>
diff --git a/src/popup/settings/export.component.html b/src/popup/settings/export.component.html
index e93afb840d..c04ff10cad 100644
--- a/src/popup/settings/export.component.html
+++ b/src/popup/settings/export.component.html
@@ -2,7 +2,7 @@
     <header>
         <div class="left">
             <a routerLink="/tabs/settings">
-                <span class="header-icon"><i class="fa fa-chevron-left"></i></span>
+                <span class="header-icon" aria-hidden="true"><i class="fa fa-chevron-left"></i></span>
                 <span>{{'back' | i18n}}</span>
             </a>
         </div>
@@ -30,9 +30,10 @@
                             class="monospaced" [(ngModel)]="masterPassword" required appInputVerbatim appAutofocus>
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleVisibility' | i18n}}"
-                            (click)="togglePassword()">
-                            <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                        <a class="row-btn" href="#" appStopClick appBlurClick
+                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                            <i class="fa fa-lg" aria-hidden="true"
+                                [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                         </a>
                     </div>
                 </div>
diff --git a/src/popup/settings/folder-add-edit.component.html b/src/popup/settings/folder-add-edit.component.html
index 323d77dc76..d7e6f9ea56 100644
--- a/src/popup/settings/folder-add-edit.component.html
+++ b/src/popup/settings/folder-add-edit.component.html
@@ -9,7 +9,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
-                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>
     </header>
@@ -27,7 +27,7 @@
                 <a class="box-content-row" href="#" appStopClick appBlurClick (click)="delete()"
                     [appApiAction]="deletePromise" #deleteBtn>
                     <div class="row-main text-danger">
-                        <div class="icon text-danger">
+                        <div class="icon text-danger" aria-hidden="true">
                             <i class="fa fa-trash-o fa-lg fa-fw" [hidden]="deleteBtn.loading"></i>
                             <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading"></i>
                         </div>
diff --git a/src/popup/settings/folders.component.html b/src/popup/settings/folders.component.html
index 229f603ddc..6b12b47d59 100644
--- a/src/popup/settings/folders.component.html
+++ b/src/popup/settings/folders.component.html
@@ -1,7 +1,7 @@
 <header>
     <div class="left">
         <a routerLink="/tabs/settings">
-            <span class="header-icon"><i class="fa fa-chevron-left"></i></span>
+            <span class="header-icon"><i class="fa fa-chevron-left" aria-hidden="true"></i></span>
             <span>{{'back' | i18n}}</span>
         </a>
     </div>
@@ -9,8 +9,8 @@
         <span class="title">{{'folders' | i18n}}</span>
     </div>
     <div class="right">
-        <button appBlurClick (click)="addFolder()" title="{{'addFolder' | i18n}}">
-            <i class="fa fa-plus fa-lg fa-fw"></i>
+        <button appBlurClick (click)="addFolder()" appA11yTitle="{{'addFolder' | i18n}}">
+            <i class="fa fa-plus fa-lg fa-fw" aria-hidden="true"></i>
         </button>
     </div>
 </header>
diff --git a/src/popup/settings/options.component.html b/src/popup/settings/options.component.html
index 239a17ad5a..6104b85d84 100644
--- a/src/popup/settings/options.component.html
+++ b/src/popup/settings/options.component.html
@@ -1,7 +1,7 @@
 <header>
     <div class="left">
         <a routerLink="/tabs/settings">
-            <span class="header-icon"><i class="fa fa-chevron-left"></i></span>
+            <span class="header-icon"><i class="fa fa-chevron-left" aria-hidden="true"></i></span>
             <span>{{'back' | i18n}}</span>
         </a>
     </div>
diff --git a/src/popup/settings/premium.component.html b/src/popup/settings/premium.component.html
index e6378d33db..3fbb32552e 100644
--- a/src/popup/settings/premium.component.html
+++ b/src/popup/settings/premium.component.html
@@ -1,7 +1,7 @@
 <header>
     <div class="left">
         <a routerLink="/tabs/settings">
-            <span class="header-icon"><i class="fa fa-chevron-left"></i></span>
+            <span class="header-icon"><i class="fa fa-chevron-left" aria-hidden="true"></i></span>
             <span>{{'back' | i18n}}</span>
         </a>
     </div>
@@ -17,27 +17,27 @@
             <p>{{'premiumSignUpAndGet' | i18n}}</p>
             <ul class="fa-ul">
                 <li>
-                    <i class="fa-li fa fa-check text-success"></i>
+                    <i class="fa-li fa fa-check text-success" aria-hidden="true"></i>
                     {{'ppremiumSignUpStorage' | i18n}}
                 </li>
                 <li>
-                    <i class="fa-li fa fa-check text-success"></i>
+                    <i class="fa-li fa fa-check text-success" aria-hidden="true"></i>
                     {{'ppremiumSignUpTwoStep' | i18n}}
                 </li>
                 <li>
-                    <i class="fa-li fa fa-check text-success"></i>
+                    <i class="fa-li fa fa-check text-success" aria-hidden="true"></i>
                     {{'ppremiumSignUpReports' | i18n}}
                 </li>
                 <li>
-                    <i class="fa-li fa fa-check text-success"></i>
+                    <i class="fa-li fa fa-check text-success" aria-hidden="true"></i>
                     {{'ppremiumSignUpTotp' | i18n}}
                 </li>
                 <li>
-                    <i class="fa-li fa fa-check text-success"></i>
+                    <i class="fa-li fa fa-check text-success" aria-hidden="true"></i>
                     {{'ppremiumSignUpSupport' | i18n}}
                 </li>
                 <li>
-                    <i class="fa-li fa fa-check text-success"></i>
+                    <i class="fa-li fa fa-check text-success" aria-hidden="true"></i>
                     {{'ppremiumSignUpFuture' | i18n}}
                 </li>
             </ul>
@@ -48,7 +48,7 @@
             <button #refreshBtn type="button" appBlurClick (click)="refresh()" [disabled]="refreshBtn.loading"
                 [appApiAction]="refreshPromise" class="btn link block">
                 <span [hidden]="refreshBtn.loading">{{'premiumRefresh' | i18n}}</span>
-                <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!refreshBtn.loading"></i>
+                <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!refreshBtn.loading" aria-hidden="true"></i>
             </button>
         </ng-container>
         <ng-container *ngIf="isPremium">
diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html
index a3ef6f0624..85d1f9ad90 100644
--- a/src/popup/settings/settings.component.html
+++ b/src/popup/settings/settings.component.html
@@ -13,11 +13,11 @@
         <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>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
             <a class="box-content-row box-content-row-flex text-default" routerLink="/sync">
                 <div class="row-main">{{'sync' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
         </div>
     </div>
@@ -38,12 +38,12 @@
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="lock()">
                 <div class="row-main">{{'lockNow' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="twoStep()">
                 <div class="row-main">{{'twoStepLogin' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
         </div>
     </div>
@@ -52,25 +52,25 @@
         <div class="box-content single-line">
             <a class="box-content-row" routerLink="/premium">
                 <div class="row-main">
-                    <div class="icon text-primary"><i class="fa fa-fw fa-lg fa-star"></i></div>
+                    <div class="icon text-primary"><i class="fa fa-fw fa-lg fa-star" aria-hidden="true"></i></div>
                     <span class="text text-primary"><b>{{'premiumMembership' | i18n}}</b></span>
                 </div>
-                <span><i class="fa fa-chevron-right fa-lg row-sub-icon"></i></span>
+                <span><i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i></span>
             </a>
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="changePassword()">
                 <div class="row-main">{{'changeMasterPassword' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="fingerprint()">
                 <div class="row-main">{{'fingerprintPhrase' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="logOut()">
                 <div class="row-main">{{'logOut' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
         </div>
     </div>
@@ -80,22 +80,22 @@
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="import()">
                 <div class="row-main">{{'importItems' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="export()">
                 <div class="row-main">{{'exportVault' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="share()">
                 <div class="row-main">{{'shareVault' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="webVault()">
                 <div class="row-main">{{'bitWebVault' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
         </div>
     </div>
@@ -104,22 +104,22 @@
         <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>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="about()">
                 <div class="row-main">{{'about' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="help()">
                 <div class="row-main">{{'helpFeedback' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                 (click)="rate()">
                 <div class="row-main">{{'rateExtension' | i18n}}</div>
-                <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
+                <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </a>
         </div>
         <div class="box-footer">{{'rateExtensionDesc' | i18n}}</div>
diff --git a/src/popup/settings/settings.component.ts b/src/popup/settings/settings.component.ts
index da730895a6..23da522b25 100644
--- a/src/popup/settings/settings.component.ts
+++ b/src/popup/settings/settings.component.ts
@@ -244,7 +244,7 @@ export class SettingsComponent implements OnInit {
         const versionText = document.createTextNode(
             this.i18nService.t('version') + ': ' + BrowserApi.getApplicationVersion());
         const div = document.createElement('div');
-        div.innerHTML = `<p class="text-center"><i class="fa fa-shield fa-3x"></i></p>
+        div.innerHTML = `<p class="text-center"><i class="fa fa-shield fa-3x" aria-hidden="true"></i></p>
             <p class="text-center"><b>Bitwarden</b><br>&copy; 8bit Solutions LLC 2015-` + year + `</p>`;
         div.appendChild(versionText);
 
diff --git a/src/popup/settings/sync.component.html b/src/popup/settings/sync.component.html
index 25815c1daa..722a79f17a 100644
--- a/src/popup/settings/sync.component.html
+++ b/src/popup/settings/sync.component.html
@@ -1,7 +1,7 @@
 <header>
     <div class="left">
         <a routerLink="/tabs/settings">
-            <span class="header-icon"><i class="fa fa-chevron-left"></i></span>
+            <span class="header-icon"><i class="fa fa-chevron-left" aria-hidden="true"></i></span>
             <span>{{'back' | i18n}}</span>
         </a>
     </div>
@@ -15,7 +15,7 @@
         <button type="button" class="btn block primary" (click)="sync()" #syncBtn [disabled]="syncBtn.loading"
             [appApiAction]="syncPromise">
             <span [hidden]="syncBtn.loading">{{'syncVaultNow' | i18n}}</span>
-            <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!syncBtn.loading"></i>
+            <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!syncBtn.loading" aria-hidden="true"></i>
         </button>
         <p class="text-center text-muted small">{{'lastSync' | i18n}} {{lastSync}}</p>
     </div>
diff --git a/src/popup/tabs.component.html b/src/popup/tabs.component.html
index ba5fc42678..71de2575bf 100644
--- a/src/popup/tabs.component.html
+++ b/src/popup/tabs.component.html
@@ -3,23 +3,23 @@
     <nav class="tabs" [ngClass]="{'tabs-3': !showCurrentTab}">
         <ul>
             <li routerLinkActive="active" *ngIf="showCurrentTab">
-                <a routerLink="current" title="{{'currentTab' | i18n}}">
-                    <i class="fa fa-folder fa-2x"></i>{{'tab' | i18n}}
+                <a routerLink="current" appA11yTitle="{{'currentTab' | i18n}}">
+                    <i class="fa fa-folder fa-2x" aria-hidden="true"></i>{{'tab' | i18n}}
                 </a>
             </li>
             <li routerLinkActive="active">
-                <a routerLink="vault" title="{{'myVault' | i18n}}">
-                    <i class="fa fa-lock fa-2x"></i>{{'myVault' | i18n}}
+                <a routerLink="vault" appA11yTitle="{{'myVault' | i18n}}">
+                    <i class="fa fa-lock fa-2x" aria-hidden="true"></i>{{'myVault' | i18n}}
                 </a>
             </li>
             <li routerLinkActive="active">
-                <a routerLink="generator" title="{{'passGen' | i18n}}">
-                    <i class="fa fa-refresh fa-2x"></i>{{'generator' | i18n}}
+                <a routerLink="generator" appA11yTitle="{{'passGen' | i18n}}">
+                    <i class="fa fa-refresh fa-2x" aria-hidden="true"></i>{{'generator' | i18n}}
                 </a>
             </li>
             <li routerLinkActive="active">
-                <a routerLink="settings" title="{{'settings' | i18n}}">
-                    <i class="fa fa-cogs fa-2x"></i>{{'settings' | i18n}}
+                <a routerLink="settings" appA11yTitle="{{'settings' | i18n}}">
+                    <i class="fa fa-cogs fa-2x" aria-hidden="true"></i>{{'settings' | i18n}}
                 </a>
             </li>
         </ul>
diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index 7769d57f13..3feda8951f 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -9,7 +9,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
-                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>
     </header>
@@ -44,19 +44,21 @@
                         </div>
                         <div class="action-buttons">
                             <button type="button" #checkPasswordBtn class="row-btn btn" appBlurClick
-                                title="{{'checkPassword' | i18n}}" (click)="checkPassword()"
+                                appA11yTitle="{{'checkPassword' | i18n}}" (click)="checkPassword()"
                                 [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">
-                                <i class="fa fa-lg fa-check-circle" [hidden]="checkPasswordBtn.loading"></i>
-                                <i class="fa fa-lg fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"></i>
+                                <i class="fa fa-lg fa-check-circle" [hidden]="checkPasswordBtn.loading"
+                                    aria-hidden="true"></i>
+                                <i class="fa fa-lg fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"
+                                    aria-hidden="true"></i>
                             </button>
-                            <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleVisibility' | i18n}}"
-                                (click)="togglePassword()">
-                                <i class="fa fa-lg"
+                            <a class="row-btn" href="#" appStopClick appBlurClick
+                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                                <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </a>
-                            <a class="row-btn" href="#" appStopClick appBlurClick title="{{'generatePassword' | i18n}}"
-                                (click)="generatePassword()">
-                                <i class="fa fa-lg fa-refresh"></i>
+                            <a class="row-btn" href="#" appStopClick appBlurClick
+                                appA11yTitle="{{'generatePassword' | i18n}}" (click)="generatePassword()">
+                                <i class="fa fa-lg fa-refresh" aria-hidden="true"></i>
                             </a>
                         </div>
                     </div>
@@ -102,9 +104,9 @@
                                 name="Card.Code" [(ngModel)]="cipher.card.code" appInputVerbatim>
                         </div>
                         <div class="action-buttons">
-                            <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleVisibility' | i18n}}"
-                                (click)="toggleCardCode()">
-                                <i class="fa fa-lg"
+                            <a class="row-btn" href="#" appStopClick appBlurClick
+                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleCardCode()">
+                                <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
                             </a>
                         </div>
@@ -206,8 +208,8 @@
                 <ng-container *ngIf="cipher.login.hasUris">
                     <div class="box-content-row box-content-row-multi" appBoxRow
                         *ngFor="let u of cipher.login.uris; let i = index; trackBy:trackByFunction">
-                        <a href="#" appStopClick (click)="removeUri(u)" title="{{'remove' | i18n}}">
-                            <i class="fa fa-minus-circle fa-lg"></i>
+                        <a href="#" appStopClick (click)="removeUri(u)" appA11yTitle="{{'remove' | i18n}}">
+                            <i class="fa fa-minus-circle fa-lg" aria-hidden="true"></i>
                         </a>
                         <div class="row-main">
                             <label for="loginUri{{i}}">{{'uriPosition' | i18n : (i + 1)}}</label>
@@ -223,16 +225,16 @@
                             </select>
                         </div>
                         <div class="action-buttons">
-                            <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleOptions' | i18n}}"
-                                (click)="toggleUriOptions(u)">
-                                <i class="fa fa-lg fa-cog"></i>
+                            <a class="row-btn" href="#" appStopClick appBlurClick
+                                appA11yTitle="{{'toggleOptions' | i18n}}" (click)="toggleUriOptions(u)">
+                                <i class="fa fa-lg fa-cog" aria-hidden="true"></i>
                             </a>
                         </div>
                     </div>
                 </ng-container>
                 <a href="#" appStopClick appBlurClick (click)="addUri()"
                     class="box-content-row box-content-row-newmulti">
-                    <i class="fa fa-plus-circle fa-fw fa-lg"></i> {{'newUri' | i18n}}
+                    <i class="fa fa-plus-circle fa-fw fa-lg" aria-hidden="true"></i> {{'newUri' | i18n}}
                 </a>
             </div>
         </div>
@@ -251,12 +253,12 @@
                 <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                     (click)="attachments()" *ngIf="editMode && showAttachments">
                     <div class="row-main">{{'attachments' | i18n}}</div>
-                    <i class="fa fa-chevron-right row-sub-icon"></i>
+                    <i class="fa fa-chevron-right row-sub-icon" aria-hidden="true"></i>
                 </a>
                 <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                     (click)="editCollections()" *ngIf="editMode && cipher.organizationId">
                     <div class="row-main">{{'collections' | i18n}}</div>
-                    <i class="fa fa-chevron-right row-sub-icon"></i>
+                    <i class="fa fa-chevron-right row-sub-icon" aria-hidden="true"></i>
                 </a>
             </div>
         </div>
@@ -279,8 +281,8 @@
                     <div class="box-content-row box-content-row-multi box-draggable-row" appBoxRow cdkDrag
                         *ngFor="let f of cipher.fields; let i = index; trackBy:trackByFunction"
                         [ngClass]="{'box-content-row-checkbox': f.type === fieldType.Boolean}">
-                        <a href="#" appStopClick (click)="removeField(f)" title="{{'remove' | i18n}}">
-                            <i class="fa fa-minus-circle fa-lg"></i>
+                        <a href="#" appStopClick (click)="removeField(f)" appA11yTitle="{{'remove' | i18n}}">
+                            <i class="fa fa-minus-circle fa-lg" aria-hidden="true"></i>
                         </a>
                         <label for="fieldName{{i}}" class="sr-only">{{'name' | i18n}}</label>
                         <label for="fieldValue{{i}}" class="sr-only">{{'value' | i18n}}</label>
@@ -296,20 +298,20 @@
                         <input id="fieldValue{{i}}" name="Field.Value{{i}}" type="checkbox" [(ngModel)]="f.value"
                             *ngIf="f.type === fieldType.Boolean" appTrueFalseValue trueValue="true" falseValue="false">
                         <div class="action-buttons" *ngIf="f.type === fieldType.Hidden">
-                            <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleVisibility' | i18n}}"
-                                (click)="toggleFieldValue(f)">
-                                <i class="fa fa-lg"
+                            <a class="row-btn" href="#" appStopClick appBlurClick
+                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleFieldValue(f)">
+                                <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !f.showValue, 'fa-eye-slash': f.showValue}"></i>
                             </a>
                         </div>
-                        <div class="drag-handle" title="{{'dragToSort' | i18n}}" cdkDragHandle>
-                            <i class="fa fa-bars"></i>
+                        <div class="drag-handle" appA11yTitle="{{'dragToSort' | i18n}}" cdkDragHandle>
+                            <i class="fa fa-bars" aria-hidden="true"></i>
                         </div>
                     </div>
                 </div>
                 <div class="box-content-row box-content-row-newmulti" appBoxRow>
                     <a href="#" appStopClick (click)="addField()">
-                        <i class="fa fa-plus-circle fa-fw fa-lg"></i> {{'newCustomField' | i18n}}
+                        <i class="fa fa-plus-circle fa-fw fa-lg" aria-hidden="true"></i> {{'newCustomField' | i18n}}
                     </a>
                     <label for="addFieldType" class="sr-only">{{'type' | i18n}}</label>
                     <select id="addFieldType" name="AddFieldType" [(ngModel)]="addFieldType" class="field-type">
@@ -355,7 +357,7 @@
                 <a class="box-content-row" href="#" appStopClick appBlurClick (click)="share()"
                     *ngIf="!cipher.organizationId">
                     <div class="row-main text-primary">
-                        <div class="icon text-primary">
+                        <div class="icon text-primary" aria-hidden="true">
                             <i class="fa fa-share-alt fa-lg fa-fw"></i>
                         </div>
                         <span>{{'shareItem' | i18n}}</span>
@@ -364,7 +366,7 @@
                 <a class="box-content-row" href="#" appStopClick appBlurClick (click)="delete()"
                     [appApiAction]="deletePromise" #deleteBtn>
                     <div class="row-main text-danger">
-                        <div class="icon text-danger">
+                        <div class="icon text-danger" aria-hidden="true">
                             <i class="fa fa-trash-o fa-lg fa-fw" [hidden]="deleteBtn.loading"></i>
                             <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading"></i>
                         </div>
diff --git a/src/popup/vault/attachments.component.html b/src/popup/vault/attachments.component.html
index 692c0c3189..7c6ec237fe 100644
--- a/src/popup/vault/attachments.component.html
+++ b/src/popup/vault/attachments.component.html
@@ -2,7 +2,7 @@
     <header>
         <div class="left">
             <button type="button" appBlurClick (click)="back()">
-                <span class="header-icon"><i class="fa fa-chevron-left"></i></span>
+                <span class="header-icon"><i class="fa fa-chevron-left" aria-hidden="true"></i></span>
                 <span>{{'back' | i18n}}</span>
             </button>
         </div>
@@ -12,7 +12,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
-                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>
     </header>
@@ -26,10 +26,11 @@
                     <small class="row-sub-label">{{a.sizeName}}</small>
                     <div class="action-buttons no-pad">
                         <button class="row-btn btn" type="button" appStopClick appBlurClick
-                            title="{{'deleteAttachment' | i18n}}" (click)="delete(a)" #deleteBtn
+                            appA11yTitle="{{'deleteAttachment' | i18n}}" (click)="delete(a)" #deleteBtn
                             [appApiAction]="deletePromises[a.id]" [disabled]="deleteBtn.loading">
-                            <i class="fa fa-trash-o fa-lg fa-fw" [hidden]="deleteBtn.loading"></i>
-                            <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading"></i>
+                            <i class="fa fa-trash-o fa-lg fa-fw" [hidden]="deleteBtn.loading" aria-hidden="true"></i>
+                            <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading"
+                                aria-hidden="true"></i>
                         </button>
                     </div>
                 </div>
diff --git a/src/popup/vault/ciphers.component.html b/src/popup/vault/ciphers.component.html
index 52a6b5d143..d8c6861d2a 100644
--- a/src/popup/vault/ciphers.component.html
+++ b/src/popup/vault/ciphers.component.html
@@ -1,7 +1,7 @@
 <header>
     <div class="left">
         <button type="button" appBlurClick (click)="back()">
-            <span class="header-icon"><i class="fa fa-chevron-left"></i></span>
+            <span class="header-icon"><i class="fa fa-chevron-left" aria-hidden="true"></i></span>
             <span>{{'back' | i18n}}</span>
         </button>
     </div>
@@ -9,11 +9,11 @@
         <input type="{{searchTypeSearch ? 'search' : 'text'}}"
             placeholder="{{searchPlaceholder || ('searchVault' | i18n)}}" id="search" [(ngModel)]="searchText"
             (input)="search(200)" appAutofocus>
-        <i class="fa fa-search"></i>
+        <i class="fa fa-search" aria-hidden="true"></i>
     </div>
     <div class="right">
-        <button type="button" appBlurClick (click)="addCipher()" title="{{'addItem' | i18n}}">
-            <i class="fa fa-plus fa-lg fa-fw"></i>
+        <button type="button" appBlurClick (click)="addCipher()" appA11yTitle="{{'addItem' | i18n}}">
+            <i class="fa fa-plus fa-lg fa-fw" aria-hidden="true"></i>
         </button>
     </div>
 </header>
@@ -28,12 +28,12 @@
                     (click)="selectFolder(f.node)">
                     <div class="row-main">
                         <div class="icon">
-                            <i class="fa fa-fw fa-lg"
+                            <i class="fa fa-fw fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-folder-open': f.node.id, 'fa-folder-open-o': !f.node.id}"></i>
                         </div>
                         <span class="text">{{f.node.name}}</span>
                     </div>
-                    <span><i class="fa fa-chevron-right fa-lg row-sub-icon"></i></span>
+                    <span><i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i></span>
                 </a>
             </div>
         </div>
@@ -45,17 +45,17 @@
                 <a *ngFor="let c of nestedCollections" href="#" class="box-content-row" appStopClick appBlurClick
                     (click)="selectCollection(c.node)">
                     <div class="row-main">
-                        <div class="icon"><i class="fa fa-fw fa-lg fa-cube"></i></div>
+                        <div class="icon"><i class="fa fa-fw fa-lg fa-cube" aria-hidden="true"></i></div>
                         <span class="text">{{c.node.name}}</span>
                     </div>
-                    <span><i class="fa fa-chevron-right fa-lg row-sub-icon"></i></span>
+                    <span><i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i></span>
                 </a>
             </div>
         </div>
     </ng-container>
     <ng-container *ngIf="(isPaging() ? pagedCiphers : ciphers) as filteredCiphers">
         <div class="no-items" *ngIf="!filteredCiphers.length">
-            <i class="fa fa-spinner fa-spin fa-3x" *ngIf="!loaded"></i>
+            <i class="fa fa-spinner fa-spin fa-3x" *ngIf="!loaded" aria-hidden="true"></i>
             <ng-container *ngIf="loaded">
                 <p>{{'noItemsInList' | i18n}}</p>
                 <button (click)="addCipher()" class="btn block primary link">
diff --git a/src/popup/vault/collections.component.html b/src/popup/vault/collections.component.html
index 3b2cd388a9..a1265dc916 100644
--- a/src/popup/vault/collections.component.html
+++ b/src/popup/vault/collections.component.html
@@ -2,7 +2,7 @@
     <header>
         <div class="left">
             <button type="button" appBlurClick (click)="back()">
-                <span class="header-icon"><i class="fa fa-chevron-left"></i></span>
+                <span class="header-icon"><i class="fa fa-chevron-left" aria-hidden="true"></i></span>
                 <span>{{'back' | i18n}}</span>
             </button>
         </div>
@@ -12,7 +12,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
-                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>
     </header>
diff --git a/src/popup/vault/current-tab.component.html b/src/popup/vault/current-tab.component.html
index f5e5e5b103..ab988bd2a7 100644
--- a/src/popup/vault/current-tab.component.html
+++ b/src/popup/vault/current-tab.component.html
@@ -1,24 +1,24 @@
 <header>
     <div class="left" *ngIf="showLeftHeader">
         <app-pop-out [show]="!inSidebar"></app-pop-out>
-        <button type="button" appBlurClick (click)="refresh()" title="{{'refresh' | i18n}}" *ngIf="inSidebar">
-            <i class="fa fa-retweet fa-lg fa-fw"></i>
+        <button type="button" appBlurClick (click)="refresh()" appA11yTitle="{{'refresh' | i18n}}" *ngIf="inSidebar">
+            <i class="fa fa-retweet fa-lg fa-fw" aria-hidden="true"></i>
         </button>
     </div>
     <div class="search">
         <input type="{{searchTypeSearch ? 'search' : 'text'}}" placeholder="{{'searchVault' | i18n}}" id="search"
             [(ngModel)]="searchText" (input)="searchVault()">
-        <i class="fa fa-search"></i>
+        <i class="fa fa-search" aria-hidden="true"></i>
     </div>
     <div class="right">
-        <button type="button" appBlurClick (click)="addCipher()" title="{{'addItem' | i18n}}">
-            <i class="fa fa-plus fa-lg fa-fw"></i>
+        <button type="button" appBlurClick (click)="addCipher()" appA11yTitle="{{'addItem' | i18n}}">
+            <i class="fa fa-plus fa-lg fa-fw" aria-hidden="true"></i>
         </button>
     </div>
 </header>
 <content>
     <div class="no-items" *ngIf="!loaded">
-        <i class="fa fa-spinner fa-spin fa-3x"></i>
+        <i class="fa fa-spinner fa-spin fa-3x" aria-hidden="true"></i>
     </div>
     <ng-container *ngIf="loaded">
         <div class="box list" *ngIf="loginCiphers">
diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html
index 5058a58072..9fc53b00c8 100644
--- a/src/popup/vault/groupings.component.html
+++ b/src/popup/vault/groupings.component.html
@@ -8,8 +8,8 @@
         <i class="fa fa-search"></i>
     </div>
     <div class="right">
-        <button appBlurClick (click)="addCipher()" title="{{'addItem' | i18n}}">
-            <i class="fa fa-plus fa-lg fa-fw"></i>
+        <button appBlurClick (click)="addCipher()" appA11yTitle="{{'addItem' | i18n}}">
+            <i class="fa fa-plus fa-lg fa-fw" aria-hidden="true"></i>
         </button>
     </div>
 </header>
diff --git a/src/popup/vault/password-history.component.html b/src/popup/vault/password-history.component.html
index 39d2154e0d..5637dc9d22 100644
--- a/src/popup/vault/password-history.component.html
+++ b/src/popup/vault/password-history.component.html
@@ -20,9 +20,9 @@
                     </div>
                 </div>
                 <div class="action-buttons">
-                    <a class="row-btn" href="#" appStopClick title="{{'copyPassword' | i18n}}"
+                    <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyPassword' | i18n}}"
                         (click)="copy(h.password)">
-                        <i class="fa fa-lg fa-clipboard"></i>
+                        <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                     </a>
                 </div>
             </div>
diff --git a/src/popup/vault/share.component.html b/src/popup/vault/share.component.html
index fdf5cabf5f..fd45749f86 100644
--- a/src/popup/vault/share.component.html
+++ b/src/popup/vault/share.component.html
@@ -10,7 +10,7 @@
             <button type="submit" appBlurClick [disabled]="form.loading || !canSave"
                 *ngIf="organizations && organizations.length">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
-                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>
     </header>
diff --git a/src/popup/vault/view.component.html b/src/popup/vault/view.component.html
index 21a1629685..b3dbaee397 100644
--- a/src/popup/vault/view.component.html
+++ b/src/popup/vault/view.component.html
@@ -27,9 +27,9 @@
                         {{cipher.login.username}}
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick title="{{'copyUsername' | i18n}}"
+                        <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyUsername' | i18n}}"
                             (click)="copy(cipher.login.username, 'username', 'Username')">
-                            <i class="fa fa-lg fa-clipboard"></i>
+                            <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                         </a>
                     </div>
                 </div>
@@ -43,18 +43,21 @@
                     </div>
                     <div class="action-buttons">
                         <button type="button" #checkPasswordBtn class="row-btn btn" appBlurClick
-                            title="{{'checkPassword' | i18n}}" (click)="checkPassword()"
+                            appA11yTitle="{{'checkPassword' | i18n}}" (click)="checkPassword()"
                             [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">
-                            <i class="fa fa-lg fa-check-circle" [hidden]="checkPasswordBtn.loading"></i>
-                            <i class="fa fa-lg fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"></i>
+                            <i class="fa fa-lg fa-check-circle" [hidden]="checkPasswordBtn.loading"
+                                aria-hidden="true"></i>
+                            <i class="fa fa-lg fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"
+                                aria-hidden="true"></i>
                         </button>
-                        <a class="row-btn" href="#" appStopClick title="{{'toggleVisibility' | i18n}}"
+                        <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
                             (click)="togglePassword()">
-                            <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                            <i class="fa fa-lg" aria-hidden="true"
+                                [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                         </a>
-                        <a class="row-btn" href="#" appStopClick title="{{'copyPassword' | i18n}}"
+                        <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyPassword' | i18n}}"
                             (click)="copy(cipher.login.password, 'password', 'Password')">
-                            <i class="fa fa-lg fa-clipboard"></i>
+                            <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                         </a>
                     </div>
                 </div>
@@ -75,9 +78,9 @@
                         </svg>
                     </span>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick title="{{'copyVerificationCode' | i18n}}"
+                        <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyVerificationCode' | i18n}}"
                             (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')">
-                            <i class="fa fa-lg fa-clipboard"></i>
+                            <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                         </a>
                     </div>
                 </div>
@@ -94,9 +97,9 @@
                         {{cipher.card.number}}
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick title="{{'copyNumber' | i18n}}"
+                        <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyNumber' | i18n}}"
                             (click)="copy(cipher.card.number, 'number', 'Number')">
-                            <i class="fa fa-lg fa-clipboard"></i>
+                            <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                         </a>
                     </div>
                 </div>
@@ -115,13 +118,14 @@
                         <span [hidden]="!showCardCode" class="monospaced">{{cipher.card.code}}</span>
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick title="{{'toggleVisibility' | i18n}}"
+                        <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
                             (click)="toggleCardCode()">
-                            <i class="fa fa-lg" [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
+                            <i class="fa fa-lg" aria-hidden="true"
+                                [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
                         </a>
-                        <a class="row-btn" href="#" appStopClick title="{{'copySecurityCode' | i18n}}"
+                        <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copySecurityCode' | i18n}}"
                             (click)="copy(cipher.card.code, 'securityCode', 'Security Code')">
-                            <i class="fa fa-lg fa-clipboard"></i>
+                            <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                         </a>
                     </div>
                 </div>
@@ -181,13 +185,13 @@
                     <span title="{{u.uri}}">{{u.hostnameOrUri}}</span>
                 </div>
                 <div class="action-buttons">
-                    <a class="row-btn" href="#" appStopClick title="{{'launch' | i18n}}" *ngIf="u.canLaunch"
+                    <a class="row-btn" href="#" appStopClick appA11yTitle="{{'launch' | i18n}}" *ngIf="u.canLaunch"
                         (click)="launch(u)">
-                        <i class="fa fa-lg fa-share-square-o"></i>
+                        <i class="fa fa-lg fa-share-square-o" aria-hidden="true"></i>
                     </a>
-                    <a class="row-btn" href="#" appStopClick title="{{'copyUri' | i18n}}"
+                    <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyUri' | i18n}}"
                         (click)="copy(u.uri, u.isWebsite ? 'website' : 'uri', 'URI')">
-                        <i class="fa fa-lg fa-clipboard"></i>
+                        <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                     </a>
                 </div>
             </div>
@@ -217,20 +221,21 @@
                         <span [hidden]="field.showValue" class="monospaced">{{field.maskedValue}}</span>
                     </div>
                     <div *ngIf="field.type === fieldType.Boolean">
-                        <i class="fa fa-check-square-o" *ngIf="field.value === 'true'"></i>
-                        <i class="fa fa-square-o" *ngIf="field.value !== 'true'"></i>
+                        <i class="fa fa-check-square-o" *ngIf="field.value === 'true'" aria-hidden="true"></i>
+                        <i class="fa fa-square-o" *ngIf="field.value !== 'true'" aria-hidden="true"></i>
+                        <span class="sr-only">{{field.value}}</span>
                     </div>
                 </div>
                 <div class="action-buttons">
-                    <a class="row-btn" href="#" appStopClick title="{{'toggleVisibility' | i18n}}"
+                    <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
                         *ngIf="field.type === fieldType.Hidden" (click)="toggleFieldValue(field)">
-                        <i class="fa fa-lg"
+                        <i class="fa fa-lg" aria-hidden="true"
                             [ngClass]="{'fa-eye': !field.showValue, 'fa-eye-slash': field.showValue}"></i>
                     </a>
-                    <a class="row-btn" href="#" appStopClick title="{{'copyValue' | i18n}}"
+                    <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyValue' | i18n}}"
                         *ngIf="field.value && field.type !== fieldType.Boolean"
                         (click)="copy(field.value, 'value', field.type === fieldType.Hidden ? 'H_Field' : 'Field')">
-                        <i class="fa fa-lg fa-clipboard"></i>
+                        <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                     </a>
                 </div>
             </div>
@@ -245,8 +250,9 @@
                 href="#" appStopClick appBlurCLick (click)="downloadAttachment(attachment)">
                 <span class="row-main">{{attachment.fileName}}</span>
                 <small class="row-sub-label">{{attachment.sizeName}}</small>
-                <i class="fa fa-download fa-fw row-sub-icon" *ngIf="!attachment.downloading"></i>
-                <i class="fa fa-spinner fa-fw fa-spin row-sub-icon" *ngIf="attachment.downloading"></i>
+                <i class="fa fa-download fa-fw row-sub-icon" *ngIf="!attachment.downloading" aria-hidden="true"></i>
+                <i class="fa fa-spinner fa-fw fa-spin row-sub-icon" *ngIf="attachment.downloading"
+                    aria-hidden="true"></i>
             </a>
         </div>
     </div>
diff --git a/src/safari/safari/app/popup/index.html b/src/safari/safari/app/popup/index.html
index 9c709f70d0..43da392e74 100644
--- a/src/safari/safari/app/popup/index.html
+++ b/src/safari/safari/app/popup/index.html
@@ -11,7 +11,7 @@
 
 <body>
     <app-root>
-        <div id="loading"><i class="fa fa-spinner fa-spin fa-3x"></i></div>
+        <div id="loading"><i class="fa fa-spinner fa-spin fa-3x" aria-hidden="true"></i></div>
     </app-root>
     <script type="text/javascript">
         const urlParams = new URLSearchParams(window.location.search);