diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html
index 6c5f0b4f4d..24ce14321a 100644
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -2,7 +2,7 @@
     <div class="row justify-content-md-center mt-5">
         <div class="col-5">
             <p class="text-center mb-4">
-                <i class="fa fa-lock fa-4x text-muted"></i>
+                <i class="fa fa-lock fa-4x text-muted" aria-hidden="true"></i>
             </p>
             <p class="lead text-center mx-4 mb-4">{{'yourVaultIsLocked' | i18n}}</p>
             <div class="card d-block">
@@ -26,7 +26,7 @@
                     <hr>
                     <div class="d-flex">
                         <button type="submit" class="btn btn-primary btn-block">
-                            <i class="fa fa-unlock-alt"></i>
+                            <i class="fa fa-unlock-alt" aria-hidden="true"></i>
                             {{'unlock' | i18n}}
                         </button>
                         <button type="button" class="btn btn-outline-secondary btn-block ml-2 mt-0" (click)="logOut()">
diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html
index cb3bfce1a6..ae8d353751 100644
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -35,13 +35,13 @@
                     <div class="d-flex">
                         <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
                             <span>
-                                <i class="fa fa-sign-in"></i> {{'logIn' | i18n}}
+                                <i class="fa fa-sign-in" aria-hidden="true"></i> {{'logIn' | i18n}}
                             </span>
                             <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
                         </button>
                         <a routerLink="/register" [queryParams]="{email: email}"
                             class="btn btn-outline-secondary btn-block ml-2 mt-0">
-                            <i class="fa fa-pencil-square-o"></i> {{'createAccount' | i18n}}
+                            <i class="fa fa-pencil-square-o" aria-hidden="true"></i> {{'createAccount' | i18n}}
                         </a>
                     </div>
                 </div>
diff --git a/src/app/accounts/two-factor-options.component.html b/src/app/accounts/two-factor-options.component.html
index 4e291461d9..4380f9bf0a 100644
--- a/src/app/accounts/two-factor-options.component.html
+++ b/src/app/accounts/two-factor-options.component.html
@@ -3,7 +3,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h2 class="modal-title">{{'twoStepOptions' | i18n}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html
index 94f516854d..0dbedf5caf 100644
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -67,7 +67,7 @@
                             *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo && 
                         selectedProviderType !== providerType.OrganizationDuo && selectedProviderType !== providerType.U2f">
                             <span>
-                                <i class="fa fa-sign-in"></i> {{'continue' | i18n}}
+                                <i class="fa fa-sign-in" aria-hidden="true"></i> {{'continue' | i18n}}
                             </span>
                             <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
                         </button>
diff --git a/src/app/components/callout.component.html b/src/app/components/callout.component.html
index 0093b78c2d..31e1d10e96 100644
--- a/src/app/components/callout.component.html
+++ b/src/app/components/callout.component.html
@@ -1,6 +1,6 @@
 <div class="callout callout-{{calloutStyle}}" role="alert">
     <h3 class="callout-heading" *ngIf="title">
-        <i class="fa {{icon}}" *ngIf="icon"></i>
+        <i class="fa {{icon}}" *ngIf="icon" aria-hidden="true"></i>
         {{title}}
     </h3>
     <ng-content></ng-content>
diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html
index a3b08df1d4..c1233ded20 100644
--- a/src/app/layouts/navbar.component.html
+++ b/src/app/layouts/navbar.component.html
@@ -20,7 +20,7 @@
             <li class="nav-item dropdown">
                 <a class="nav-item nav-link dropdown-toggle" href="#" id="nav-profile" data-toggle="dropdown"
                     aria-haspopup="true" aria-expanded="false">
-                    <i class="fa fa-user-circle fa-lg"></i>
+                    <i class="fa fa-user-circle fa-lg" aria-hidden="true"></i>
                 </a>
                 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-profile">
                     <div class="dropdown-item-text d-flex align-items-center" *ngIf="name" appStopProp>
@@ -32,24 +32,24 @@
                     </div>
                     <div class="dropdown-divider"></div>
                     <a class="dropdown-item" href="#" routerLink="/settings/account">
-                        <i class="fa fa-fw fa-user"></i>
+                        <i class="fa fa-fw fa-user" aria-hidden="true"></i>
                         {{'myAccount' | i18n}}
                     </a>
                     <a class="dropdown-item" href="https://help.bitwarden.com" target="_blank" rel="noopener">
-                        <i class="fa fa-fw fa-question-circle"></i>
+                        <i class="fa fa-fw fa-question-circle" aria-hidden="true"></i>
                         {{'getHelp' | i18n}}
                     </a>
                     <a class="dropdown-item" href="https://bitwarden.com#download" target="_blank" rel="noopener">
-                        <i class="fa fa-fw fa-download"></i>
+                        <i class="fa fa-fw fa-download" aria-hidden="true"></i>
                         {{'getApps' | i18n}}
                     </a>
                     <div class="dropdown-divider"></div>
                     <button type="button" class="dropdown-item" (click)="lock()">
-                        <i class="fa fa-fw fa-lock"></i>
+                        <i class="fa fa-fw fa-lock" aria-hidden="true"></i>
                         {{'lockNow' | i18n}}
                     </button>
                     <button type="button" class="dropdown-item" (click)="logOut()">
-                        <i class="fa fa-fw fa-sign-out"></i>
+                        <i class="fa fa-fw fa-sign-out" aria-hidden="true"></i>
                         {{'logOut' | i18n}}
                     </button>
                 </div>
diff --git a/src/app/layouts/organization-layout.component.html b/src/app/layouts/organization-layout.component.html
index e3863a42ff..3ca204fe71 100644
--- a/src/app/layouts/organization-layout.component.html
+++ b/src/app/layouts/organization-layout.component.html
@@ -9,7 +9,7 @@
             </div>
             <div class="ml-auto card border-danger text-danger bg-transparent" *ngIf="!organization.enabled">
                 <div class="card-body py-2">
-                    <i class="fa fa-exclamation-triangle"></i>
+                    <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
                     {{'organizationIsDisabled' | i18n}}
                 </div>
             </div>
@@ -17,25 +17,25 @@
         <ul class="nav nav-tabs" *ngIf="organization.isManager">
             <li class="nav-item">
                 <a class="nav-link" routerLink="vault" routerLinkActive="active">
-                    <i class="fa fa-lock"></i>
+                    <i class="fa fa-lock" aria-hidden="true"></i>
                     {{'vault' | i18n}}
                 </a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" routerLink="manage" routerLinkActive="active">
-                    <i class="fa fa-sliders"></i>
+                    <i class="fa fa-sliders" aria-hidden="true"></i>
                     {{'manage' | i18n}}
                 </a>
             </li>
             <li class="nav-item" *ngIf="organization.isAdmin">
                 <a class="nav-link" routerLink="tools" routerLinkActive="active">
-                    <i class="fa fa-wrench"></i>
+                    <i class="fa fa-wrench" aria-hidden="true"></i>
                     {{'tools' | i18n}}
                 </a>
             </li>
             <li class="nav-item" *ngIf="organization.isOwner">
                 <a class="nav-link" routerLink="settings" routerLinkActive="active">
-                    <i class="fa fa-cogs"></i>
+                    <i class="fa fa-cogs" aria-hidden="true"></i>
                     {{'settings' | i18n}}
                 </a>
             </li>
diff --git a/src/app/organizations/manage/collection-add-edit.component.html b/src/app/organizations/manage/collection-add-edit.component.html
index 3993423ae8..e5caf303e3 100644
--- a/src/app/organizations/manage/collection-add-edit.component.html
+++ b/src/app/organizations/manage/collection-add-edit.component.html
@@ -3,7 +3,7 @@
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
             <div class="modal-header">
                 <h2 class="modal-title">{{title}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/organizations/manage/collections.component.html b/src/app/organizations/manage/collections.component.html
index bf6e919d84..f3a00cb4a1 100644
--- a/src/app/organizations/manage/collections.component.html
+++ b/src/app/organizations/manage/collections.component.html
@@ -7,12 +7,15 @@
                 [(ngModel)]="searchText">
         </div>
         <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="add()">
-            <i class="fa fa-plus fa-fw"></i>
+            <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
             {{'newCollection' | i18n}}
         </button>
     </div>
 </div>
-<i class="fa fa-spinner fa-spin text-muted" *ngIf="loading"></i>
+<ng-container *ngIf="loading">
+    <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
+    <span class="sr-only">{{'loading' | i18n}}</span>
+</ng-container>
 <ng-container *ngIf="!loading && (collections | search:searchText:'name':'id') as searchedCollections">
     <p *ngIf="!searchedCollections.length">{{'noCollectionsInList' | i18n}}</p>
     <table class="table table-hover table-list" *ngIf="searchedCollections.length">
@@ -24,16 +27,16 @@
                 <td class="table-list-options">
                     <div class="dropdown" appListDropdown>
                         <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-toggle="dropdown"
-                            aria-haspopup="true" aria-expanded="false">
-                            <i class="fa fa-cog fa-lg"></i>
+                            aria-haspopup="true" aria-expanded="false" appA11yTitle="{{'options' | i18n}}">
+                            <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
                         </button>
                         <div class="dropdown-menu dropdown-menu-right">
                             <a class="dropdown-item" href="#" appStopClick (click)="users(c)">
-                                <i class="fa fa-fw fa-users"></i>
+                                <i class="fa fa-fw fa-users" aria-hidden="true"></i>
                                 {{'users' | i18n}}
                             </a>
                             <a class="dropdown-item text-danger" href="#" appStopClick (click)="delete(c)">
-                                <i class="fa fa-fw fa-trash-o"></i>
+                                <i class="fa fa-fw fa-trash-o" aria-hidden="true"></i>
                                 {{'delete' | i18n}}
                             </a>
                         </div>
diff --git a/src/app/organizations/manage/entity-events.component.html b/src/app/organizations/manage/entity-events.component.html
index 32d4e51e98..6484ceda62 100644
--- a/src/app/organizations/manage/entity-events.component.html
+++ b/src/app/organizations/manage/entity-events.component.html
@@ -6,7 +6,7 @@
                     {{'eventLogs' | i18n}}
                     <small class="text-muted" *ngIf="name">{{name}}</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
@@ -28,7 +28,8 @@
                     <button #refreshBtn [appApiAction]="refreshPromise" type="button"
                         class="btn btn-sm btn-outline-primary ml-3" (click)="loadEvents(true)"
                         [disabled]="loaded && refreshBtn.loading">
-                        <i class="fa fa-refresh fa-fw" [ngClass]="{'fa-spin': loaded && refreshBtn.loading}"></i>
+                        <i class="fa fa-refresh fa-fw" [ngClass]="{'fa-spin': loaded && refreshBtn.loading}"
+                            aria-hidden="true"></i>
                         {{'refresh' | i18n}}
                     </button>
                 </div>
diff --git a/src/app/organizations/manage/entity-users.component.html b/src/app/organizations/manage/entity-users.component.html
index 0045268439..9c3cda3c55 100644
--- a/src/app/organizations/manage/entity-users.component.html
+++ b/src/app/organizations/manage/entity-users.component.html
@@ -6,7 +6,7 @@
                     {{'userAccess' | i18n}}
                     <small>{{entityName}}</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
@@ -74,7 +74,8 @@
                                 </td>
                                 <td *ngIf="entity === 'collection'">
                                     <ng-container *ngIf="u.accessAll">
-                                        <i class="fa fa-th" title="{{'userAccessAllItems' | i18n}}"></i>
+                                        <i class="fa fa-th" title="{{'userAccessAllItems' | i18n}}"
+                                            aria-hidden="true"></i>
                                         <span class="sr-only">{{'userAccessAllItems' | i18n}}</span>
                                     </ng-container>
                                 </td>
diff --git a/src/app/organizations/manage/events.component.html b/src/app/organizations/manage/events.component.html
index 6f5d7ebf54..d09a877415 100644
--- a/src/app/organizations/manage/events.component.html
+++ b/src/app/organizations/manage/events.component.html
@@ -12,7 +12,7 @@
         </div>
         <button #refreshBtn [appApiAction]="refreshPromise" type="button" class="btn btn-sm btn-outline-primary ml-3"
             (click)="loadEvents(true)" [disabled]="loaded && refreshBtn.loading">
-            <i class="fa fa-refresh fa-fw" [ngClass]="{'fa-spin': loaded && refreshBtn.loading}"></i>
+            <i class="fa fa-refresh fa-fw" aria-hidden="true" [ngClass]="{'fa-spin': loaded && refreshBtn.loading}"></i>
             {{'refresh' | i18n}}
         </button>
     </div>
diff --git a/src/app/organizations/manage/group-add-edit.component.html b/src/app/organizations/manage/group-add-edit.component.html
index dc9e35cd93..43973b7db5 100644
--- a/src/app/organizations/manage/group-add-edit.component.html
+++ b/src/app/organizations/manage/group-add-edit.component.html
@@ -3,7 +3,7 @@
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
             <div class="modal-header">
                 <h2 class="modal-title">{{title}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/organizations/manage/groups.component.html b/src/app/organizations/manage/groups.component.html
index 6e2800f4ca..045668bb9f 100644
--- a/src/app/organizations/manage/groups.component.html
+++ b/src/app/organizations/manage/groups.component.html
@@ -7,7 +7,7 @@
                 [(ngModel)]="searchText">
         </div>
         <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="add()">
-            <i class="fa fa-plus fa-fw"></i>
+            <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
             {{'newGroup' | i18n}}
         </button>
     </div>
@@ -27,16 +27,16 @@
                 <td class="table-list-options">
                     <div class="dropdown" appListDropdown>
                         <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-toggle="dropdown"
-                            aria-haspopup="true" aria-expanded="false">
-                            <i class="fa fa-cog fa-lg"></i>
+                            aria-haspopup="true" aria-expanded="false" appA11yTitle="{{'options' | i18n}}">
+                            <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
                         </button>
                         <div class="dropdown-menu dropdown-menu-right">
                             <a class="dropdown-item" href="#" appStopClick (click)="users(g)">
-                                <i class="fa fa-fw fa-users"></i>
+                                <i class="fa fa-fw fa-users" aria-hidden="true"></i>
                                 {{'users' | i18n}}
                             </a>
                             <a class="dropdown-item text-danger" href="#" appStopClick (click)="delete(g)">
-                                <i class="fa fa-fw fa-trash-o"></i>
+                                <i class="fa fa-fw fa-trash-o" aria-hidden="true"></i>
                                 {{'delete' | i18n}}
                             </a>
                         </div>
diff --git a/src/app/organizations/manage/people.component.html b/src/app/organizations/manage/people.component.html
index 810ecb63fb..81305f6099 100644
--- a/src/app/organizations/manage/people.component.html
+++ b/src/app/organizations/manage/people.component.html
@@ -25,7 +25,7 @@
                 [(ngModel)]="searchText">
         </div>
         <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="invite()">
-            <i class="fa fa-plus fa-fw"></i>
+            <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
             {{'inviteUser' | i18n}}
         </button>
     </div>
@@ -57,7 +57,7 @@
                     </td>
                     <td>
                         <ng-container *ngIf="u.twoFactorEnabled">
-                            <i class="fa fa-lock" title="{{'userUsingTwoStep' | i18n}}"></i>
+                            <i class="fa fa-lock" title="{{'userUsingTwoStep' | i18n}}" aria-hidden="true"></i>
                             <span class="sr-only">{{'userUsingTwoStep' | i18n}}</span>
                         </ng-container>
                     </td>
@@ -70,31 +70,32 @@
                     <td class="table-list-options">
                         <div class="dropdown" appListDropdown>
                             <button class="btn btn-outline-secondary dropdown-toggle" type="button"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                <i class="fa fa-cog fa-lg"></i>
+                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                                appA11yTitle="{{'options' | i18n}}">
+                                <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
                             </button>
                             <div class="dropdown-menu dropdown-menu-right">
                                 <a class="dropdown-item" href="#" appStopClick (click)="reinvite(u)"
                                     *ngIf="u.status === organizationUserStatusType.Invited">
-                                    <i class="fa fa-fw fa-envelope-o"></i>
+                                    <i class="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
                                     {{'resendInvitation' | i18n}}
                                 </a>
                                 <a class="dropdown-item text-success" href="#" appStopClick (click)="confirm(u)"
                                     *ngIf="u.status === organizationUserStatusType.Accepted">
-                                    <i class="fa fa-fw fa-check"></i>
+                                    <i class="fa fa-fw fa-check" aria-hidden="true"></i>
                                     {{'confirm' | i18n}}
                                 </a>
                                 <a class="dropdown-item" href="#" appStopClick (click)="groups(u)" *ngIf="accessGroups">
-                                    <i class="fa fa-fw fa-sitemap"></i>
+                                    <i class="fa fa-fw fa-sitemap" aria-hidden="true"></i>
                                     {{'groups' | i18n}}
                                 </a>
                                 <a class="dropdown-item" href="#" appStopClick (click)="events(u)"
                                     *ngIf="accessEvents && u.status === organizationUserStatusType.Confirmed">
-                                    <i class="fa fa-fw fa-file-text-o"></i>
+                                    <i class="fa fa-fw fa-file-text-o" aria-hidden="true"></i>
                                     {{'eventLogs' | i18n}}
                                 </a>
                                 <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(u)">
-                                    <i class="fa fa-fw fa-remove"></i>
+                                    <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
                                     {{'remove' | i18n}}
                                 </a>
                             </div>
diff --git a/src/app/organizations/manage/user-add-edit.component.html b/src/app/organizations/manage/user-add-edit.component.html
index a0fc94dada..9d937bd87f 100644
--- a/src/app/organizations/manage/user-add-edit.component.html
+++ b/src/app/organizations/manage/user-add-edit.component.html
@@ -6,7 +6,7 @@
                     {{title}}
                     <small class="text-muted" *ngIf="name">{{name}}</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/organizations/manage/user-confirm.component.html b/src/app/organizations/manage/user-confirm.component.html
index 15c5901eb0..a4651f9478 100644
--- a/src/app/organizations/manage/user-confirm.component.html
+++ b/src/app/organizations/manage/user-confirm.component.html
@@ -6,7 +6,7 @@
                     {{'confirmUser' | i18n}}
                     <small class="text-muted" *ngIf="name">{{name}}</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/organizations/manage/user-groups.component.html b/src/app/organizations/manage/user-groups.component.html
index d8f68b084c..b4ab72b74c 100644
--- a/src/app/organizations/manage/user-groups.component.html
+++ b/src/app/organizations/manage/user-groups.component.html
@@ -6,7 +6,7 @@
                     {{'groupAccess' | i18n}}
                     <small class="text-muted" *ngIf="name">{{name}}</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/organizations/settings/adjust-seats.component.html b/src/app/organizations/settings/adjust-seats.component.html
index 968334b79b..dbb15fa4fb 100644
--- a/src/app/organizations/settings/adjust-seats.component.html
+++ b/src/app/organizations/settings/adjust-seats.component.html
@@ -1,7 +1,7 @@
 <form #form class="card" (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
     <div class="card-body">
-        <button type="button" class="close" attr.aria-label="{{'cancel' | i18n}}" appA11yTitle="{{'cancel' | i18n}}"
-            (click)="cancel()"><span aria-hidden="true">&times;</span></button>
+        <button type="button" class="close" appA11yTitle="{{'cancel' | i18n}}" (click)="cancel()"><span
+                aria-hidden="true">&times;</span></button>
         <h3 class="card-body-header">{{(add ? 'addSeats' : 'removeSeats') | i18n}}</h3>
         <div class="row">
             <div class="form-group col-6">
diff --git a/src/app/organizations/settings/api-key.component.html b/src/app/organizations/settings/api-key.component.html
index b77f3b5135..d17e198d74 100644
--- a/src/app/organizations/settings/api-key.component.html
+++ b/src/app/organizations/settings/api-key.component.html
@@ -3,7 +3,7 @@
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
             <div class="modal-header">
                 <h2 class="modal-title">{{'apiKey' | i18n}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/organizations/settings/change-plan.component.html b/src/app/organizations/settings/change-plan.component.html
index bf6787dc83..df0e641f4a 100644
--- a/src/app/organizations/settings/change-plan.component.html
+++ b/src/app/organizations/settings/change-plan.component.html
@@ -1,7 +1,7 @@
 <div class="card card-org-plans">
     <div class="card-body">
-        <button type="button" class="close" attr.aria-label="{{'cancel' | i18n}}" appA11yTitle="{{'cancel' | i18n}}"
-            (click)="cancel()"><span aria-hidden="true">&times;</span></button>
+        <button type="button" class="close" appA11yTitle="{{'cancel' | i18n}}" (click)="cancel()"><span
+                aria-hidden="true">&times;</span></button>
         <h2 class="card-body-header">{{'changeBillingPlan' | i18n}}</h2>
         <p class="mb-0">{{'changeBillingPlanUpgrade' | i18n}}</p>
         <app-organization-plans [showFree]="false" [showCancel]="true" plan="families" [organizationId]="organizationId"
diff --git a/src/app/organizations/settings/delete-organization.component.html b/src/app/organizations/settings/delete-organization.component.html
index 8fe49e2462..fb826c9e38 100644
--- a/src/app/organizations/settings/delete-organization.component.html
+++ b/src/app/organizations/settings/delete-organization.component.html
@@ -3,7 +3,7 @@
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
             <div class="modal-header">
                 <h2 class="modal-title">{{'deleteOrganization' | i18n}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/organizations/settings/download-license.component.html b/src/app/organizations/settings/download-license.component.html
index 2a3e1b9adc..77936a6a83 100644
--- a/src/app/organizations/settings/download-license.component.html
+++ b/src/app/organizations/settings/download-license.component.html
@@ -1,7 +1,7 @@
 <form #form class="card" (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
     <div class="card-body">
-        <button type="button" class="close" attr.aria-label="{{'cancel' | i18n}}" appA11yTitle="{{'cancel' | i18n}}"
-            (click)="cancel()"><span aria-hidden="true">&times;</span></button>
+        <button type="button" class="close" appA11yTitle="{{'cancel' | i18n}}" (click)="cancel()"><span
+                aria-hidden="true">&times;</span></button>
         <h3 class="card-body-header">{{'downloadLicense' | i18n}}</h3>
         <div class="row">
             <div class="form-group col-6">
@@ -9,7 +9,7 @@
                     <label for="installationId">{{'enterInstallationId' | i18n}}</label>
                     <a class="ml-auto" target="_blank" rel="noopener" appA11yTitle="{{'learnMore' | i18n}}"
                         href="https://help.bitwarden.com/article/licensing-on-premise/#organization-account-sharing">
-                        <i class="fa fa-question-circle-o"></i>
+                        <i class="fa fa-question-circle-o" aria-hidden="true"></i>
                     </a>
                 </div>
                 <input id="installationId" class="form-control" type="text" name="InstallationId"
diff --git a/src/app/organizations/settings/organization-subscription.component.html b/src/app/organizations/settings/organization-subscription.component.html
index b93c794b90..6aeaabb130 100644
--- a/src/app/organizations/settings/organization-subscription.component.html
+++ b/src/app/organizations/settings/organization-subscription.component.html
@@ -29,7 +29,7 @@
         <dd *ngIf="sub.expiration">
             {{sub.expiration | date:'mediumDate'}}
             <span *ngIf="isExpired" class="text-danger ml-2">
-                <i class="fa fa-exclamation-triangle"></i>
+                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
                 {{'licenseIsExpired' | i18n}}
             </span>
         </dd>
diff --git a/src/app/organizations/settings/rotate-api-key.component.html b/src/app/organizations/settings/rotate-api-key.component.html
index b58d172a9a..7d88237c5c 100644
--- a/src/app/organizations/settings/rotate-api-key.component.html
+++ b/src/app/organizations/settings/rotate-api-key.component.html
@@ -3,7 +3,7 @@
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
             <div class="modal-header">
                 <h2 class="modal-title">{{'rotateApiKey' | i18n}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/organizations/vault/vault.component.html b/src/app/organizations/vault/vault.component.html
index 1b62948a47..216f13c4e5 100644
--- a/src/app/organizations/vault/vault.component.html
+++ b/src/app/organizations/vault/vault.component.html
@@ -19,7 +19,7 @@
                     </small>
                 </h1>
                 <button type="button" class="btn btn-outline-primary btn-sm ml-auto" (click)="addCipher()">
-                    <i class="fa fa-plus fa-fw"></i>{{'addItem' | i18n}}
+                    <i class="fa fa-plus fa-fw" aria-hidden="true"></i>{{'addItem' | i18n}}
                 </button>
             </div>
             <app-org-vault-ciphers (onCipherClicked)="editCipher($event)"
diff --git a/src/app/settings/add-credit.component.html b/src/app/settings/add-credit.component.html
index 2e80c81e14..7ec14b9944 100644
--- a/src/app/settings/add-credit.component.html
+++ b/src/app/settings/add-credit.component.html
@@ -8,13 +8,13 @@
                 <input class="form-check-input" type="radio" name="Method" id="credit-method-paypal"
                     [value]="paymentMethodType.PayPal" [(ngModel)]="method">
                 <label class="form-check-label" for="credit-method-paypal">
-                    <i class="fa fa-fw fa-paypal"></i> PayPal</label>
+                    <i class="fa fa-fw fa-paypal" aria-hidden="true"></i> PayPal</label>
             </div>
             <div class="form-check form-check-inline">
                 <input class="form-check-input" type="radio" name="Method" id="credit-method-bitcoin"
                     [value]="paymentMethodType.BitPay" [(ngModel)]="method">
                 <label class="form-check-label" for="credit-method-bitcoin">
-                    <i class="fa fa-fw fa-bitcoin"></i> Bitcoin</label>
+                    <i class="fa fa-fw fa-bitcoin" aria-hidden="true"></i> Bitcoin</label>
             </div>
         </div>
         <div class="form-group">
diff --git a/src/app/settings/deauthorize-sessions.component.html b/src/app/settings/deauthorize-sessions.component.html
index dea74b2f7d..7175c2f9b2 100644
--- a/src/app/settings/deauthorize-sessions.component.html
+++ b/src/app/settings/deauthorize-sessions.component.html
@@ -3,7 +3,7 @@
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
             <div class="modal-header">
                 <h2 class="modal-title">{{'deauthorizeSessions' | i18n}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/settings/delete-account.component.html b/src/app/settings/delete-account.component.html
index 2dc71a18aa..47721b2ca5 100644
--- a/src/app/settings/delete-account.component.html
+++ b/src/app/settings/delete-account.component.html
@@ -3,7 +3,7 @@
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
             <div class="modal-header">
                 <h2 class="modal-title">{{'deleteAccount' | i18n}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/settings/domain-rules.component.html b/src/app/settings/domain-rules.component.html
index 3248a77e05..6525f2be0c 100644
--- a/src/app/settings/domain-rules.component.html
+++ b/src/app/settings/domain-rules.component.html
@@ -21,7 +21,7 @@
             </button>
         </div>
         <button type="button" (click)="add()" class="btn btn-outline-secondary btn-sm mb-2">
-            <i class="fa fa-plus fa-fw"></i> {{'newCustomDomain' | i18n}}
+            <i class="fa fa-plus fa-fw" aria-hidden="true"></i> {{'newCustomDomain' | i18n}}
         </button>
         <small class="text-muted d-block mb-3">{{'newCustomDomainDesc' | i18n}}</small>
     </ng-container>
@@ -41,22 +41,22 @@
                 <td class="table-list-options">
                     <div class="dropdown" appListDropdown>
                         <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-toggle="dropdown"
-                            aria-haspopup="true" aria-expanded="false">
-                            <i class="fa fa-cog fa-lg"></i>
+                            aria-haspopup="true" aria-expanded="false" appA11yTitle="{{'options' | i18n}}">
+                            <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
                         </button>
                         <div class="dropdown-menu dropdown-menu-right">
                             <a class="dropdown-item" href="#" appStopClick (click)="toggleExcluded(d)"
                                 *ngIf="!d.excluded">
-                                <i class="fa fa-fw fa-close"></i>
+                                <i class="fa fa-fw fa-close" aria-hidden="true"></i>
                                 {{'exclude' | i18n}}
                             </a>
                             <a class="dropdown-item" href="#" appStopClick (click)="toggleExcluded(d)"
                                 *ngIf="d.excluded">
-                                <i class="fa fa-fw fa-plus"></i>
+                                <i class="fa fa-fw fa-plus" aria-hidden="true"></i>
                                 {{'include' | i18n}}
                             </a>
                             <a class="dropdown-item" href="#" appStopClick (click)="customize(d)">
-                                <i class="fa fa-fw fa-scissors"></i>
+                                <i class="fa fa-fw fa-scissors" aria-hidden="true"></i>
                                 {{'customize' | i18n}}
                             </a>
                         </div>
diff --git a/src/app/settings/organization-plans.component.html b/src/app/settings/organization-plans.component.html
index b454e31052..b3383860ce 100644
--- a/src/app/settings/organization-plans.component.html
+++ b/src/app/settings/organization-plans.component.html
@@ -8,7 +8,7 @@
                 class="form-text text-muted">{{'licenseFileDesc' | i18n : 'bitwarden_organization_license.json'}}</small>
         </div>
         <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
             <span>{{'submit' | i18n}}</span>
         </button>
     </form>
@@ -211,7 +211,7 @@
     </ng-container>
     <div [ngClass]="{'mt-4': !createOrganization || plans[plan].noPayment}">
         <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
             <span>{{'submit' | i18n}}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" (click)="cancel()" *ngIf="showCancel">
diff --git a/src/app/settings/organizations.component.html b/src/app/settings/organizations.component.html
index ca3dce9ec3..94c6dd688c 100644
--- a/src/app/settings/organizations.component.html
+++ b/src/app/settings/organizations.component.html
@@ -19,7 +19,7 @@
         <p *ngIf="!organizations || !organizations.length">{{'noOrganizationsList' | i18n}}</p>
     </ng-container>
     <a href="#" routerLink="/settings/create-organization" class="btn btn-block btn-outline-primary">
-        <i class="fa fa-plus fa-fw"></i>
+        <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
         {{'newOrganization' | i18n}}
     </a>
 </ng-container>
@@ -36,7 +36,7 @@
         </h1>
         <a href="#" routerLink="/settings/create-organization" class="btn btn-sm btn-outline-primary ml-auto"
             *ngIf="!loaded || (organizations && organizations.length)">
-            <i class="fa fa-plus fa-fw"></i>
+            <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
             {{'newOrganization' | i18n}}
         </a>
     </div>
@@ -48,7 +48,7 @@
         <ng-container *ngIf="!organizations || !organizations.length">
             <p>{{'noOrganizationsList' | i18n}}</p>
             <a href="#" routerLink="/settings/create-organization" class="btn btn-outline-primary">
-                <i class="fa fa-plus fa-fw"></i>
+                <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
                 {{'newOrganization' | i18n}}
             </a>
         </ng-container>
@@ -69,12 +69,13 @@
                     <td class="table-list-options">
                         <div class="dropdown" appListDropdown>
                             <button class="btn btn-outline-secondary dropdown-toggle" type="button"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                <i class="fa fa-cog fa-lg"></i>
+                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                                appA11yTitle="{{'options' | i18n}}">
+                                <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
                             </button>
                             <div class="dropdown-menu dropdown-menu-right">
                                 <a class="dropdown-item text-danger" href="#" appStopClick (click)="leave(o)">
-                                    <i class="fa fa-fw fa-sign-out"></i>
+                                    <i class="fa fa-fw fa-sign-out" aria-hidden="true"></i>
                                     {{'leave' | i18n}}
                                 </a>
                             </div>
diff --git a/src/app/settings/payment.component.html b/src/app/settings/payment.component.html
index 2cdd97e17f..7862b445cb 100644
--- a/src/app/settings/payment.component.html
+++ b/src/app/settings/payment.component.html
@@ -3,25 +3,25 @@
         <input class="form-check-input" type="radio" name="Method" id="method-card" [value]="paymentMethodType.Card"
             [(ngModel)]="method" (change)="changeMethod()">
         <label class="form-check-label" for="method-card">
-            <i class="fa fa-fw fa-credit-card"></i> {{'creditCard' | i18n}}</label>
+            <i class="fa fa-fw fa-credit-card" aria-hidden="true"></i> {{'creditCard' | i18n}}</label>
     </div>
     <div class="form-check form-check-inline mr-4" *ngIf="!hideBank">
         <input class="form-check-input" type="radio" name="Method" id="method-bank"
             [value]="paymentMethodType.BankAccount" [(ngModel)]="method" (change)="changeMethod()">
         <label class="form-check-label" for="method-bank">
-            <i class="fa fa-fw fa-university"></i> {{'bankAccount' | i18n}}</label>
+            <i class="fa fa-fw fa-university" aria-hidden="true"></i> {{'bankAccount' | i18n}}</label>
     </div>
     <div class="form-check form-check-inline" *ngIf="!hidePaypal">
         <input class="form-check-input" type="radio" name="Method" id="method-paypal" [value]="paymentMethodType.PayPal"
             [(ngModel)]="method" (change)="changeMethod()">
         <label class="form-check-label" for="method-paypal">
-            <i class="fa fa-fw fa-paypal"></i> PayPal</label>
+            <i class="fa fa-fw fa-paypal" aria-hidden="true"></i> PayPal</label>
     </div>
     <div class="form-check form-check-inline" *ngIf="!hideCredit">
         <input class="form-check-input" type="radio" name="Method" id="method-credit" [value]="paymentMethodType.Credit"
             [(ngModel)]="method" (change)="changeMethod()">
         <label class="form-check-label" for="method-credit">
-            <i class="fa fa-fw fa-dollar"></i> {{'accountCredit' | i18n}}</label>
+            <i class="fa fa-fw fa-dollar" aria-hidden="true"></i> {{'accountCredit' | i18n}}</label>
     </div>
 </div>
 <ng-container *ngIf="showMethods && method === paymentMethodType.Card">
diff --git a/src/app/settings/premium.component.html b/src/app/settings/premium.component.html
index 733a9b7906..417b92cac0 100644
--- a/src/app/settings/premium.component.html
+++ b/src/app/settings/premium.component.html
@@ -8,27 +8,27 @@
     <p>{{'premiumUpgradeUnlockFeatures' | i18n}}</p>
     <ul class="fa-ul">
         <li>
-            <i class="fa fa-check text-success fa-li"></i>
+            <i class="fa fa-check text-success fa-li" aria-hidden="true"></i>
             {{'premiumSignUpStorage' | i18n}}
         </li>
         <li>
-            <i class="fa fa-check text-success fa-li"></i>
+            <i class="fa fa-check text-success fa-li" aria-hidden="true"></i>
             {{'premiumSignUpTwoStep' | i18n}}
         </li>
         <li>
-            <i class="fa fa-check text-success fa-li"></i>
+            <i class="fa fa-check text-success fa-li" aria-hidden="true"></i>
             {{'premiumSignUpReports' | i18n}}
         </li>
         <li>
-            <i class="fa fa-check text-success fa-li"></i>
+            <i class="fa fa-check text-success fa-li" aria-hidden="true"></i>
             {{'premiumSignUpTotp' | i18n}}
         </li>
         <li>
-            <i class="fa fa-check text-success fa-li"></i>
+            <i class="fa fa-check text-success fa-li" aria-hidden="true"></i>
             {{'premiumSignUpSupport' | i18n}}
         </li>
         <li>
-            <i class="fa fa-check text-success fa-li"></i>
+            <i class="fa fa-check text-success fa-li" aria-hidden="true"></i>
             {{'premiumSignUpFuture' | i18n}}
         </li>
     </ul>
diff --git a/src/app/settings/purge-vault.component.html b/src/app/settings/purge-vault.component.html
index a8076bc972..837f12933b 100644
--- a/src/app/settings/purge-vault.component.html
+++ b/src/app/settings/purge-vault.component.html
@@ -3,7 +3,7 @@
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
             <div class="modal-header">
                 <h2 class="modal-title">{{'purgeVault' | i18n}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/settings/two-factor-authenticator.component.html b/src/app/settings/two-factor-authenticator.component.html
index f82f08e823..40b741d595 100644
--- a/src/app/settings/two-factor-authenticator.component.html
+++ b/src/app/settings/two-factor-authenticator.component.html
@@ -6,7 +6,7 @@
                     {{'twoStepLogin' | i18n}}
                     <small>{{'authenticatorAppTitle' | i18n}}</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/settings/two-factor-duo.component.html b/src/app/settings/two-factor-duo.component.html
index ccb58c7145..d4d82c690c 100644
--- a/src/app/settings/two-factor-duo.component.html
+++ b/src/app/settings/two-factor-duo.component.html
@@ -6,7 +6,7 @@
                     {{'twoStepLogin' | i18n}}
                     <small>Duo</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/settings/two-factor-email.component.html b/src/app/settings/two-factor-email.component.html
index 5d72c70e08..05fe7257b0 100644
--- a/src/app/settings/two-factor-email.component.html
+++ b/src/app/settings/two-factor-email.component.html
@@ -6,7 +6,7 @@
                     {{'twoStepLogin' | i18n}}
                     <small>{{'emailTitle' | i18n}}</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/settings/two-factor-recovery.component.html b/src/app/settings/two-factor-recovery.component.html
index bfaeeddba7..d5a054ebd0 100644
--- a/src/app/settings/two-factor-recovery.component.html
+++ b/src/app/settings/two-factor-recovery.component.html
@@ -6,7 +6,7 @@
                     {{'twoStepLogin' | i18n}}
                     <small>{{'recoveryCodeTitle' | i18n}}</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/settings/two-factor-u2f.component.html b/src/app/settings/two-factor-u2f.component.html
index 8359c7cefb..4c79addcf4 100644
--- a/src/app/settings/two-factor-u2f.component.html
+++ b/src/app/settings/two-factor-u2f.component.html
@@ -6,7 +6,7 @@
                     {{'twoStepLogin' | i18n}}
                     <small>FIDO U2F</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
@@ -71,19 +71,19 @@
                         {{'readKey' | i18n}}
                     </button>
                     <ng-container *ngIf="readKeyBtn.loading">
-                        <i class="fa fa-spinner fa-spin text-muted"></i>
+                        <i class="fa fa-spinner fa-spin text-muted" aria-hidden="true"></i>
                     </ng-container>
                     <ng-container *ngIf="!readKeyBtn.loading">
                         <ng-container *ngIf="u2fListening">
-                            <i class="fa fa-spinner fa-spin text-muted"></i>
+                            <i class="fa fa-spinner fa-spin text-muted" aria-hidden="true"></i>
                             {{'twoFactorU2fWaiting' | i18n}}...
                         </ng-container>
                         <ng-container *ngIf="u2fResponse">
-                            <i class="fa fa-check-circle text-success"></i>
+                            <i class="fa fa-check-circle text-success" aria-hidden="true"></i>
                             {{'twoFactorU2fClickSave' | i18n}}
                         </ng-container>
                         <ng-container *ngIf="u2fError">
-                            <i class="fa fa-warning text-danger"></i>
+                            <i class="fa fa-warning text-danger" aria-hidden="true"></i>
                             {{'twoFactorU2fProblemReadingTryAgain' | i18n}}
                         </ng-container>
                     </ng-container>
diff --git a/src/app/settings/two-factor-yubikey.component.html b/src/app/settings/two-factor-yubikey.component.html
index bf4fa9a9cd..76aa16bf36 100644
--- a/src/app/settings/two-factor-yubikey.component.html
+++ b/src/app/settings/two-factor-yubikey.component.html
@@ -6,7 +6,7 @@
                     {{'twoStepLogin' | i18n}}
                     <small>YubiKey</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/settings/update-key.component.html b/src/app/settings/update-key.component.html
index c0b89b7330..84d81f4280 100644
--- a/src/app/settings/update-key.component.html
+++ b/src/app/settings/update-key.component.html
@@ -3,7 +3,7 @@
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
             <div class="modal-header">
                 <h2 class="modal-title">{{'updateEncryptionKey' | i18n}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/settings/user-billing.component.html b/src/app/settings/user-billing.component.html
index a61cea5c2c..70759d7d19 100644
--- a/src/app/settings/user-billing.component.html
+++ b/src/app/settings/user-billing.component.html
@@ -3,7 +3,7 @@
         {{'billing' | i18n}}
     </h1>
     <button (click)="load()" class="btn btn-sm btn-outline-primary ml-auto" *ngIf="firstLoaded" [disabled]="loading">
-        <i class="fa fa-refresh fa-fw" [ngClass]="{'fa-spin': loading}"></i>
+        <i class="fa fa-refresh fa-fw" [ngClass]="{'fa-spin': loading}" aria-hidden="true"></i>
         {{'refresh' | i18n}}
     </button>
 </div>
@@ -84,11 +84,11 @@
                 <td>{{i.amount | currency:'$'}}</td>
                 <td>
                     <span *ngIf="i.paid">
-                        <i class="fa fa-check text-success"></i>
+                        <i class="fa fa-check text-success" aria-hidden="true"></i>
                         {{'paid' | i18n}}
                     </span>
                     <span *ngIf="!i.paid">
-                        <i class="fa fa-exclamation-circle text-muted"></i>
+                        <i class="fa fa-exclamation-circle text-muted" aria-hidden="true"></i>
                         {{'unpaid' | i18n}}
                     </span>
                 </td>
@@ -108,7 +108,7 @@
                     <span *ngIf="t.type === transactionType.Refund">{{'refundNoun' | i18n}}</span>
                 </td>
                 <td>
-                    <i class="fa fa-fw" *ngIf="t.paymentMethodType" [ngClass]="{
+                    <i class="fa fa-fw" *ngIf="t.paymentMethodType" aria-hidden="true" [ngClass]="{
                             'fa-credit-card': t.paymentMethodType === paymentMethodType.Card,
                             'fa-university': t.paymentMethodType === paymentMethodType.BankAccount ||
                                 t.paymentMethodType === paymentMethodType.WireTransfer,
diff --git a/src/app/tools/password-generator-history.component.html b/src/app/tools/password-generator-history.component.html
index d8f4c5e632..78fe4ddd2c 100644
--- a/src/app/tools/password-generator-history.component.html
+++ b/src/app/tools/password-generator-history.component.html
@@ -3,7 +3,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h2 class="modal-title">{{'passwordHistory' | i18n}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 783c58d823..00569c7851 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -4,7 +4,7 @@
             autocomplete="off">
             <div class="modal-header">
                 <h2 class="modal-title">{{title}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
@@ -173,7 +173,7 @@
                         </div>
                     </ng-container>
                     <a href="#" appStopClick (click)="addUri()" class="d-inline-block mb-3">
-                        <i class="fa fa-plus-circle fa-fw"></i> {{'newUri' | i18n}}
+                        <i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i> {{'newUri' | i18n}}
                     </a>
                 </ng-container>
                 <!-- Card -->
@@ -429,7 +429,7 @@
                     </div>
                 </div>
                 <a href="#" appStopClick (click)="addField()" class="d-inline-block mb-2">
-                    <i class="fa fa-plus-circle fa-fw"></i> {{'newCustomField' | i18n}}
+                    <i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i> {{'newCustomField' | i18n}}
                 </a>
                 <div class="row">
                     <div class="col-5">
diff --git a/src/app/vault/attachments.component.html b/src/app/vault/attachments.component.html
index 350ca0d692..9a2a4d21a6 100644
--- a/src/app/vault/attachments.component.html
+++ b/src/app/vault/attachments.component.html
@@ -6,7 +6,7 @@
                     {{'attachments' | i18n}}
                     <small *ngIf="cipher">{{cipher.name}}</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
@@ -15,8 +15,9 @@
                     <tbody>
                         <tr *ngFor="let a of cipher.attachments">
                             <td class="table-list-icon">
-                                <i class="fa fa-fw fa-lg fa-file-o" *ngIf="!a.downloading"></i>
-                                <i class="fa fa-spinner fa-lg fa-fw fa-spin" *ngIf="a.downloading"></i>
+                                <i class="fa fa-fw fa-lg fa-file-o" *ngIf="!a.downloading" aria-hidden="true"></i>
+                                <i class="fa fa-spinner fa-lg fa-fw fa-spin" *ngIf="a.downloading"
+                                    aria-hidden="true"></i>
                             </td>
                             <td>
                                 <div class="d-flex">
diff --git a/src/app/vault/bulk-delete.component.html b/src/app/vault/bulk-delete.component.html
index fbc45ef333..59d9fec78b 100644
--- a/src/app/vault/bulk-delete.component.html
+++ b/src/app/vault/bulk-delete.component.html
@@ -5,7 +5,7 @@
                 <h2 class="modal-title">
                     {{'deleteSelected' | i18n}}
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/vault/bulk-move.component.html b/src/app/vault/bulk-move.component.html
index e202ef66bb..cda19aa1f5 100644
--- a/src/app/vault/bulk-move.component.html
+++ b/src/app/vault/bulk-move.component.html
@@ -5,7 +5,7 @@
                 <h2 class="modal-title">
                     {{'moveSelected' | i18n}}
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/vault/bulk-share.component.html b/src/app/vault/bulk-share.component.html
index 04fe1dbd6f..36ce98b749 100644
--- a/src/app/vault/bulk-share.component.html
+++ b/src/app/vault/bulk-share.component.html
@@ -5,7 +5,7 @@
                 <h2 class="modal-title">
                     {{'shareSelected' | i18n}}
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html
index 3c7487c0ce..4ec98a4d30 100644
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -31,43 +31,44 @@
                 <td class="table-list-options">
                     <div class="dropdown" appListDropdown>
                         <button class="btn btn-outline-secondary dropdown-toggle" type="button" id="dropdownMenuButton"
-                            data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <i class="fa fa-cog fa-lg"></i>
+                            data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                            appA11yTitle="{{'options' | i18n}}">
+                            <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
                         </button>
                         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
                             <ng-container *ngIf="c.type === cipherType.Login">
                                 <a class="dropdown-item" href="#" appStopClick
                                     (click)="copy(c, c.login.password, 'password', 'password')">
-                                    <i class="fa fa-fw fa-clipboard"></i>
+                                    <i class="fa fa-fw fa-clipboard" aria-hidden="true"></i>
                                     {{'copyPassword' | i18n}}
                                 </a>
                                 <a class="dropdown-item" href="#" appStopClick *ngIf="c.login.canLaunch"
                                     (click)="launch(c.login.launchUri)">
-                                    <i class="fa fa-fw fa-share-square-o"></i>
+                                    <i class="fa fa-fw fa-share-square-o" aria-hidden="true"></i>
                                     {{'launch' | i18n}}
                                 </a>
                             </ng-container>
                             <a class="dropdown-item" href="#" appStopClick (click)="attachments(c)">
-                                <i class="fa fa-fw fa-paperclip"></i>
+                                <i class="fa fa-fw fa-paperclip" aria-hidden="true"></i>
                                 {{'attachments' | i18n}}
                             </a>
                             <a class="dropdown-item" href="#" appStopClick *ngIf="!organization && !c.organizationId"
                                 (click)="share(c)">
-                                <i class="fa fa-fw fa-share-alt"></i>
+                                <i class="fa fa-fw fa-share-alt" aria-hidden="true"></i>
                                 {{'share' | i18n}}
                             </a>
                             <a class="dropdown-item" href="#" appStopClick *ngIf="c.organizationId"
                                 (click)="collections(c)">
-                                <i class="fa fa-fw fa-cubes"></i>
+                                <i class="fa fa-fw fa-cubes" aria-hidden="true"></i>
                                 {{'collections' | i18n}}
                             </a>
                             <a class="dropdown-item" href="#" appStopClick *ngIf="c.organizationId && accessEvents"
                                 (click)="events(c)">
-                                <i class="fa fa-fw fa-file-text-o"></i>
+                                <i class="fa fa-fw fa-file-text-o" aria-hidden="true"></i>
                                 {{'eventLogs' | i18n}}
                             </a>
                             <a class="dropdown-item text-danger" href="#" appStopClick (click)="delete(c)">
-                                <i class="fa fa-fw fa-trash-o"></i>
+                                <i class="fa fa-fw fa-trash-o" aria-hidden="true"></i>
                                 {{'delete' | i18n}}
                             </a>
                         </div>
diff --git a/src/app/vault/collections.component.html b/src/app/vault/collections.component.html
index e6ec10fc2e..797ce52fbd 100644
--- a/src/app/vault/collections.component.html
+++ b/src/app/vault/collections.component.html
@@ -6,7 +6,7 @@
                     {{'collections' | i18n}}
                     <small *ngIf="cipher">{{cipher.name}}</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/vault/folder-add-edit.component.html b/src/app/vault/folder-add-edit.component.html
index e7a6ae11ff..8626048844 100644
--- a/src/app/vault/folder-add-edit.component.html
+++ b/src/app/vault/folder-add-edit.component.html
@@ -3,7 +3,7 @@
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
             <div class="modal-header">
                 <h2 class="modal-title">{{title}}</h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html
index 285dcee1d5..c2142ff868 100644
--- a/src/app/vault/share.component.html
+++ b/src/app/vault/share.component.html
@@ -6,7 +6,7 @@
                     {{'share' | i18n}}
                     <small *ngIf="cipher">{{cipher.name}}</small>
                 </h2>
-                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index 2af3f8c34b..e412015b71 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -22,35 +22,36 @@
                 <div class="ml-auto d-flex">
                     <div class="dropdown mr-2" appListDropdown>
                         <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button"
-                            id="bulkActionsButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <i class="fa fa-cog"></i>
+                            id="bulkActionsButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                            appA11yTitle="{{'options' | i18n}}">
+                            <i class="fa fa-cog" aria-hidden="true"></i>
                         </button>
                         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bulkActionsButton">
                             <a class="dropdown-item" href="#" appStopClick (click)="bulkMove()">
-                                <i class="fa fa-fw fa-share"></i>
+                                <i class="fa fa-fw fa-share" aria-hidden="true"></i>
                                 {{'moveSelected' | i18n}}
                             </a>
                             <a class="dropdown-item" href="#" appStopClick (click)="bulkShare()">
-                                <i class="fa fa-fw fa-share-alt"></i>
+                                <i class="fa fa-fw fa-share-alt" aria-hidden="true"></i>
                                 {{'shareSelected' | i18n}}
                             </a>
                             <a class="dropdown-item text-danger" href="#" (click)="bulkDelete()">
-                                <i class="fa fa-fw fa-trash-o"></i>
+                                <i class="fa fa-fw fa-trash-o" aria-hidden="true"></i>
                                 {{'deleteSelected' | i18n}}
                             </a>
                             <div class="dropdown-divider"></div>
                             <a class="dropdown-item" href="#" appStopClick (click)="selectAll(true)">
-                                <i class="fa fa-fw fa-check-square-o"></i>
+                                <i class="fa fa-fw fa-check-square-o" aria-hidden="true"></i>
                                 {{'selectAll' | i18n}}
                             </a>
                             <a class="dropdown-item" href="#" appStopClick (click)="selectAll(false)">
-                                <i class="fa fa-fw fa-minus-square-o"></i>
+                                <i class="fa fa-fw fa-minus-square-o" aria-hidden="true"></i>
                                 {{'unselectAll' | i18n}}
                             </a>
                         </div>
                     </div>
                     <button type="button" class="btn btn-outline-primary btn-sm" (click)="addCipher()">
-                        <i class="fa fa-plus fa-fw"></i>{{'addItem' | i18n}}
+                        <i class="fa fa-plus fa-fw" aria-hidden="true"></i>{{'addItem' | i18n}}
                     </button>
                 </div>
             </div>
@@ -62,7 +63,7 @@
         <div class="col-3">
             <div class="card border-warning mb-4" *ngIf="showUpdateKey">
                 <div class="card-header bg-warning text-white">
-                    <i class="fa fa-warning fa-fw"></i> {{'updateKeyTitle' | i18n}}
+                    <i class="fa fa-warning fa-fw" aria-hidden="true"></i> {{'updateKeyTitle' | i18n}}
                 </div>
                 <div class="card-body">
                     <p>{{'updateEncryptionKeyShortDesc' | i18n}}</p>
@@ -74,7 +75,7 @@
             <app-verify-email *ngIf="showVerifyEmail" class="d-block mb-4"></app-verify-email>
             <div class="card border-warning mb-4" *ngIf="showBrowserOutdated">
                 <div class="card-header bg-warning text-white">
-                    <i class="fa fa-warning fa-fw"></i> {{'updateBrowser' | i18n}}
+                    <i class="fa fa-warning fa-fw" aria-hidden="true"></i> {{'updateBrowser' | i18n}}
                 </div>
                 <div class="card-body">
                     <p>{{'updateBrowserDesc' | i18n}}</p>
@@ -86,7 +87,7 @@
             </div>
             <div class="card border-success mb-4" *ngIf="showPremiumCallout">
                 <div class="card-header bg-success text-white">
-                    <i class="fa fa-star fa-fw"></i> {{'goPremium' | i18n}}
+                    <i class="fa fa-star fa-fw" aria-hidden="true"></i> {{'goPremium' | i18n}}
                 </div>
                 <div class="card-body">
                     <p>{{'premiumUpgradeUnlockFeatures' | i18n}}</p>