diff --git a/jslib b/jslib
index f35ecf0c..1660d757 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit f35ecf0cd8bd1b91f2544e07bb7b766d227f54ff
+Subproject commit 1660d7570b41ddc433ff7b2ac4d6d6798ac4fc94
diff --git a/src/app/accounts/accept-organization.component.html b/src/app/accounts/accept-organization.component.html
index c2787bc7..9b3a8c5d 100644
--- a/src/app/accounts/accept-organization.component.html
+++ b/src/app/accounts/accept-organization.component.html
@@ -2,7 +2,7 @@
     <div>
         <img src="../../images/logo-dark@2x.png" class="mb-4 logo" alt="Bitwarden">
         <p class="text-center">
-            <i class="fa fa-spinner fa-spin fa-2x text-muted"></i>
+            <i class="fa fa-spinner fa-spin fa-2x text-muted" title="{{'loading' | i18n}}"></i>
         </p>
     </div>
 </div>
diff --git a/src/app/accounts/hint.component.html b/src/app/accounts/hint.component.html
index 6771019b..80efd5c0 100644
--- a/src/app/accounts/hint.component.html
+++ b/src/app/accounts/hint.component.html
@@ -12,9 +12,9 @@
                     </div>
                     <hr>
                     <div class="d-flex">
-                        <button type="submit" class="btn btn-primary btn-block" [disabled]="form.loading" appBlurClick>
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
                             <span [hidden]="form.loading">{{'submit' | i18n}}</span>
-                            <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         </button>
                         <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
                             {{'cancel' | i18n}}
diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html
index 04d09c4a..30fce67d 100644
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -28,10 +28,11 @@
                     </div>
                     <hr>
                     <div class="d-flex">
-                        <button type="submit" class="btn btn-primary btn-block" [disabled]="form.loading" appBlurClick>
-                            <span [hidden]="form.loading">
-                                <i class="fa fa-sign-in"></i> {{'logIn' | i18n}}</span>
-                            <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>
+                                <i class="fa fa-sign-in"></i> {{'logIn' | i18n}}
+                            </span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></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}}
diff --git a/src/app/accounts/recover-delete.component.html b/src/app/accounts/recover-delete.component.html
index 22f59164..829483c8 100644
--- a/src/app/accounts/recover-delete.component.html
+++ b/src/app/accounts/recover-delete.component.html
@@ -12,9 +12,9 @@
                     </div>
                     <hr>
                     <div class="d-flex">
-                        <button type="submit" class="btn btn-primary btn-block" [disabled]="form.loading" appBlurClick>
-                            <span [hidden]="form.loading">{{'submit' | i18n}}</span>
-                            <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>{{'submit' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         </button>
                         <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
                             {{'cancel' | i18n}}
diff --git a/src/app/accounts/recover-two-factor.component.html b/src/app/accounts/recover-two-factor.component.html
index 5fb4ae08..9f2d2e38 100644
--- a/src/app/accounts/recover-two-factor.component.html
+++ b/src/app/accounts/recover-two-factor.component.html
@@ -24,9 +24,9 @@
                     </div>
                     <hr>
                     <div class="d-flex">
-                        <button type="submit" class="btn btn-primary btn-block" [disabled]="form.loading" appBlurClick>
-                            <span [hidden]="form.loading">{{'submit' | i18n}}</span>
-                            <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>{{'submit' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         </button>
                         <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
                             {{'cancel' | i18n}}
diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html
index 5eabdca6..9278e637 100644
--- a/src/app/accounts/register.component.html
+++ b/src/app/accounts/register.component.html
@@ -43,9 +43,9 @@
                     </div>
                     <hr>
                     <div class="d-flex">
-                        <button type="submit" class="btn btn-primary btn-block" [disabled]="form.loading" appBlurClick>
-                            <span [hidden]="form.loading">{{'submit' | i18n}}</span>
-                            <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>{{'submit' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         </button>
                         <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
                             {{'cancel' | i18n}}
diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html
index 2dc14299..b9604ea7 100644
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -29,7 +29,7 @@
                     </ng-container>
                     <ng-container *ngIf="selectedProviderType === providerType.U2f">
                         <p class="text-center" *ngIf="!u2fReady">
-                            <i class="fa fa-spinner fa-spin text-muted"></i>
+                            <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
                         </p>
                         <ng-container *ngIf="u2fReady">
                             <p class="text-center">{{'insertU2f' | i18n}}</p>
@@ -42,7 +42,7 @@
                             <iframe id="duo_iframe"></iframe>
                         </div>
                     </ng-container>
-                    <i class="fa fa-spinner text-muted fa-spin pull-right" *ngIf="form.loading && selectedProviderType === providerType.U2f"></i>
+                    <i class="fa fa-spinner text-muted fa-spin pull-right" title="{{'loading' | i18n}}" *ngIf="form.loading && selectedProviderType === providerType.U2f"></i>
                     <div class="form-check" *ngIf="selectedProviderType != null">
                         <input id="remember" type="checkbox" name="Remember" class="form-check-input" [(ngModel)]="remember">
                         <label for="remember" class="form-check-label">{{'rememberMe' | i18n}}</label>
@@ -53,11 +53,12 @@
                     </ng-container>
                     <hr>
                     <div class="d-flex mb-3">
-                        <button type="submit" class="btn btn-primary btn-block" [disabled]="form.loading" appBlurClick *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo && 
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading" *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo && 
                         selectedProviderType !== providerType.OrganizationDuo && selectedProviderType !== providerType.U2f">
-                            <span [hidden]="form.loading">
-                                <i class="fa fa-sign-in"></i> {{'continue' | i18n}}</span>
-                            <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                            <span>
+                                <i class="fa fa-sign-in"></i> {{'continue' | i18n}}
+                            </span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         </button>
                         <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
                             {{'cancel' | i18n}}
diff --git a/src/app/accounts/verify-email-token.component.html b/src/app/accounts/verify-email-token.component.html
index 5b28580c..2bd2a777 100644
--- a/src/app/accounts/verify-email-token.component.html
+++ b/src/app/accounts/verify-email-token.component.html
@@ -2,7 +2,7 @@
     <div>
         <img src="../../images/logo-dark@2x.png" class="mb-4 logo" alt="Bitwarden">
         <p class="text-center">
-            <i class="fa fa-spinner fa-spin fa-2x text-muted"></i>
+            <i class="fa fa-spinner fa-spin fa-2x text-muted" title="{{'loading' | i18n}}"></i>
         </p>
     </div>
 </div>
diff --git a/src/app/accounts/verify-recover-delete.component.html b/src/app/accounts/verify-recover-delete.component.html
index 82635005..a107259d 100644
--- a/src/app/accounts/verify-recover-delete.component.html
+++ b/src/app/accounts/verify-recover-delete.component.html
@@ -11,9 +11,9 @@
                     <p>{{'deleteRecoverConfirmDesc' | i18n}}</p>
                     <hr>
                     <div class="d-flex">
-                        <button type="submit" class="btn btn-danger btn-block" [disabled]="form.loading" appBlurClick>
-                            <span [hidden]="form.loading">{{'deleteAccount' | i18n}}</span>
-                            <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                        <button type="submit" class="btn btn-danger btn-block btn-submit" [disabled]="form.loading">
+                            <span>{{'deleteAccount' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         </button>
                         <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
                             {{'cancel' | i18n}}
diff --git a/src/app/organizations/manage/collection-add-edit.component.html b/src/app/organizations/manage/collection-add-edit.component.html
index cbb70559..9b29ef96 100644
--- a/src/app/organizations/manage/collection-add-edit.component.html
+++ b/src/app/organizations/manage/collection-add-edit.component.html
@@ -8,7 +8,7 @@
                 </button>
             </div>
             <div class="modal-body" *ngIf="loading">
-                <i class="fa fa-spinner fa-spin text-muted"></i>
+                <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
             </div>
             <div class="modal-body" *ngIf="!loading">
                 <div class="form-group">
@@ -57,7 +57,7 @@
             </div>
             <div class="modal-footer">
                 <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'cancel' | i18n}}</button>
@@ -65,7 +65,7 @@
                     <button #deleteBtn appBlurClick type="button" (click)="delete()" class="btn btn-outline-danger" title="{{'delete' | i18n}}"
                         *ngIf="editMode" [disabled]="deleteBtn.loading" [appApiAction]="deletePromise">
                         <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-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading" title="{{'loading' | i18n}}"></i>
                     </button>
                 </div>
             </div>
diff --git a/src/app/organizations/manage/entity-events.component.html b/src/app/organizations/manage/entity-events.component.html
index 5dd97163..3a8008fe 100644
--- a/src/app/organizations/manage/entity-events.component.html
+++ b/src/app/organizations/manage/entity-events.component.html
@@ -11,7 +11,7 @@
                 </button>
             </div>
             <div class="modal-body" *ngIf="!loaded">
-                <i class="fa fa-spinner fa-spin text-muted"></i>
+                <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
             </div>
             <div class="modal-body" *ngIf="loaded">
                 <div class="d-flex">
@@ -60,7 +60,7 @@
                 </table>
                 <button #moreBtn [appApiAction]="morePromise" type="button" class="btn btn-block btn-link btn-submit" (click)="loadEvents(false)"
                     [disabled]="loaded && moreBtn.loading" *ngIf="continuationToken">
-                    <i class="fa fa-spinner fa-spin"></i>
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'loadMore' | i18n}}</span>
                 </button>
             </div>
diff --git a/src/app/organizations/manage/entity-users.component.html b/src/app/organizations/manage/entity-users.component.html
index d602d4bd..845cbdc9 100644
--- a/src/app/organizations/manage/entity-users.component.html
+++ b/src/app/organizations/manage/entity-users.component.html
@@ -11,7 +11,7 @@
                 </button>
             </div>
             <div class="modal-body" *ngIf="loading">
-                <i class="fa fa-spinner fa-spin text-muted"></i>
+                <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
             </div>
             <div class="modal-body" *ngIf="!loading">
                 <ng-container *ngIf="!users || !users.length">
@@ -41,7 +41,7 @@
                             <td class="table-list-options wider">
                                 <button type="button" class="btn btn-sm btn-outline-danger btn-submit" (click)="remove(u)" #removeBtn appBlurClick [disabled]="removeBtn.loading"
                                     [appApiAction]="actionPromise" *ngIf="entity !== 'collection' || !u.accessAll">
-                                    <i class="fa fa-spinner fa-spin"></i>
+                                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                                     <span>{{'remove' | i18n}}</span>
                                 </button>
                             </td>
diff --git a/src/app/organizations/manage/events.component.html b/src/app/organizations/manage/events.component.html
index 93da57fd..fce74f3b 100644
--- a/src/app/organizations/manage/events.component.html
+++ b/src/app/organizations/manage/events.component.html
@@ -3,10 +3,12 @@
     <div class="ml-auto d-flex">
         <div class="form-inline">
             <label class="sr-only" for="start">{{'startDate' | i18n}}</label>
-            <input type="datetime-local" class="form-control form-control-sm" id="start" placeholder="{{'startDate' | i18n}}" [(ngModel)]="start" placeholder="YYYY-MM-DDTHH:MM">
+            <input type="datetime-local" class="form-control form-control-sm" id="start" placeholder="{{'startDate' | i18n}}" [(ngModel)]="start"
+                placeholder="YYYY-MM-DDTHH:MM">
             <span class="mx-2">-</span>
             <label class="sr-only" for="end">{{'endDate' | i18n}}</label>
-            <input type="datetime-local" class="form-control form-control-sm" id="end" placeholder="{{'endDate' | i18n}}" [(ngModel)]="end" placeholder="YYYY-MM-DDTHH:MM">
+            <input type="datetime-local" class="form-control form-control-sm" id="end" placeholder="{{'endDate' | i18n}}" [(ngModel)]="end"
+                placeholder="YYYY-MM-DDTHH:MM">
         </div>
         <button #refreshBtn [appApiAction]="refreshPromise" type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="loadEvents(true)"
             [disabled]="loaded && refreshBtn.loading">
@@ -15,7 +17,7 @@
         </button>
     </div>
 </div>
-<i class="fa fa-spinner fa-spin text-muted" *ngIf="!loaded"></i>
+<i class="fa fa-spinner fa-spin text-muted" *ngIf="!loaded" title="{{'loading' | i18n}}"></i>
 <ng-container *ngIf="loaded">
     <p *ngIf="!events || !events.length">{{'noEventsInList' | i18n}}</p>
     <table class="table table-hover" *ngIf="events && events.length">
@@ -44,7 +46,7 @@
     </table>
     <button #moreBtn [appApiAction]="morePromise" type="button" class="btn btn-block btn-link btn-submit" (click)="loadEvents(false)"
         [disabled]="loaded && moreBtn.loading" *ngIf="continuationToken">
-        <i class="fa fa-spinner fa-spin"></i>
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'loadMore' | i18n}}</span>
     </button>
 </ng-container>
diff --git a/src/app/organizations/manage/group-add-edit.component.html b/src/app/organizations/manage/group-add-edit.component.html
index d97de018..b4afde04 100644
--- a/src/app/organizations/manage/group-add-edit.component.html
+++ b/src/app/organizations/manage/group-add-edit.component.html
@@ -8,7 +8,7 @@
                 </button>
             </div>
             <div class="modal-body" *ngIf="loading">
-                <i class="fa fa-spinner fa-spin text-muted"></i>
+                <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
             </div>
             <div class="modal-body" *ngIf="!loading">
                 <div class="form-group">
@@ -77,7 +77,7 @@
             </div>
             <div class="modal-footer">
                 <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'cancel' | i18n}}</button>
@@ -85,7 +85,7 @@
                     <button #deleteBtn appBlurClick type="button" (click)="delete()" class="btn btn-outline-danger" title="{{'delete' | i18n}}"
                         *ngIf="editMode" [disabled]="deleteBtn.loading" [appApiAction]="deletePromise">
                         <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-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading" title="{{'loading' | i18n}}"></i>
                     </button>
                 </div>
             </div>
diff --git a/src/app/organizations/manage/groups.component.html b/src/app/organizations/manage/groups.component.html
index fd723ef7..c246012a 100644
--- a/src/app/organizations/manage/groups.component.html
+++ b/src/app/organizations/manage/groups.component.html
@@ -11,7 +11,7 @@
         </button>
     </div>
 </div>
-<i class="fa fa-spinner fa-spin text-muted" *ngIf="loading"></i>
+<i class="fa fa-spinner fa-spin text-muted" *ngIf="loading" title="{{'loading' | i18n}}"></i>
 <ng-container *ngIf="!loading && (groups | search:searchText:'name':'id') as searchedGroups">
     <p *ngIf="!searchedGroups.length">{{'noGroupsInList' | i18n}}</p>
     <table class="table table-hover table-list" *ngIf="searchedGroups.length">
diff --git a/src/app/organizations/manage/people.component.html b/src/app/organizations/manage/people.component.html
index 1c7640db..d0111233 100644
--- a/src/app/organizations/manage/people.component.html
+++ b/src/app/organizations/manage/people.component.html
@@ -26,7 +26,7 @@
         </button>
     </div>
 </div>
-<i class="fa fa-spinner fa-spin text-muted" *ngIf="loading"></i>
+<i class="fa fa-spinner fa-spin text-muted" *ngIf="loading" title="{{'loading' | i18n}}"></i>
 <ng-container *ngIf="!loading && (users | search:searchText:'name':'email':'id') as searchedUsers">
     <p *ngIf="!searchedUsers.length">{{'noUsersInList' | i18n}}</p>
     <table class="table table-hover table-list" *ngIf="searchedUsers.length">
diff --git a/src/app/organizations/manage/user-add-edit.component.html b/src/app/organizations/manage/user-add-edit.component.html
index 877c3743..8a6629d6 100644
--- a/src/app/organizations/manage/user-add-edit.component.html
+++ b/src/app/organizations/manage/user-add-edit.component.html
@@ -11,7 +11,7 @@
                 </button>
             </div>
             <div class="modal-body" *ngIf="loading">
-                <i class="fa fa-spinner fa-spin text-muted"></i>
+                <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
             </div>
             <div class="modal-body" *ngIf="!loading">
                 <ng-container *ngIf="!editMode">
@@ -101,7 +101,7 @@
             </div>
             <div class="modal-footer">
                 <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'cancel' | i18n}}</button>
@@ -109,7 +109,7 @@
                     <button #deleteBtn appBlurClick type="button" (click)="delete()" class="btn btn-outline-danger" title="{{'delete' | i18n}}"
                         *ngIf="editMode" [disabled]="deleteBtn.loading" [appApiAction]="deletePromise">
                         <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-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading" title="{{'loading' | i18n}}"></i>
                     </button>
                 </div>
             </div>
diff --git a/src/app/organizations/manage/user-groups.component.html b/src/app/organizations/manage/user-groups.component.html
index 9a1c3021..fe80c919 100644
--- a/src/app/organizations/manage/user-groups.component.html
+++ b/src/app/organizations/manage/user-groups.component.html
@@ -11,7 +11,7 @@
                 </button>
             </div>
             <div class="modal-body" *ngIf="loading">
-                <i class="fa fa-spinner fa-spin text-muted"></i>
+                <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
             </div>
             <div class="modal-body" *ngIf="!loading">
                 <p>{{'groupAccessUserDesc' | i18n}}</p>
@@ -33,7 +33,7 @@
             </div>
             <div class="modal-footer">
                 <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'cancel' | i18n}}</button>
diff --git a/src/app/organizations/settings/account.component.html b/src/app/organizations/settings/account.component.html
index 500ff870..8afcc6e6 100644
--- a/src/app/organizations/settings/account.component.html
+++ b/src/app/organizations/settings/account.component.html
@@ -2,7 +2,7 @@
     <h1>{{'myOrganization' | i18n}}</h1>
 </div>
 <div *ngIf="loading">
-    <i class="fa fa-spinner fa-spin text-muted"></i>
+    <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
 </div>
 <form *ngIf="org && !loading" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
     <div class="row">
@@ -24,8 +24,8 @@
             <app-avatar data="{{org.name}}" dynamic="true" width="75" height="75" fontSize="35"></app-avatar>
         </div>
     </div>
-    <button type="submit" class="btn btn-primary btn-submit" appBlurClick [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin"></i>
+    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'save' | i18n}}</span>
     </button>
 </form>
diff --git a/src/app/organizations/settings/adjust-seats.component.html b/src/app/organizations/settings/adjust-seats.component.html
index c5a033bc..d79e46cc 100644
--- a/src/app/organizations/settings/adjust-seats.component.html
+++ b/src/app/organizations/settings/adjust-seats.component.html
@@ -13,7 +13,7 @@
             | currency:'$'}} /{{interval | i18n}}
         </div>
         <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-            <i class="fa fa-spinner fa-spin"></i>
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'submit' | i18n}}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" (click)="cancel()">
diff --git a/src/app/organizations/settings/delete-organization.component.html b/src/app/organizations/settings/delete-organization.component.html
index da16e474..428ac544 100644
--- a/src/app/organizations/settings/delete-organization.component.html
+++ b/src/app/organizations/settings/delete-organization.component.html
@@ -15,8 +15,8 @@
                     appAutofocus appInputVerbatim>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'deleteOrganization' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'close' | i18n}}</button>
diff --git a/src/app/organizations/settings/organization-billing.component.html b/src/app/organizations/settings/organization-billing.component.html
index 03cd2a9a..9e7cee1b 100644
--- a/src/app/organizations/settings/organization-billing.component.html
+++ b/src/app/organizations/settings/organization-billing.component.html
@@ -13,7 +13,7 @@
         <p>{{'subscriptionPendingCanceled' | i18n}}</p>
         <button #reinstateBtn type="button" class="btn btn-outline-secondary btn-submit" (click)="reinstate()" [appApiAction]="reinstatePromise"
             [disabled]="reinstateBtn.loading">
-            <i class="fa fa-spinner fa-spin"></i>
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'reinstateSubscription' | i18n}}</span>
         </button>
     </app-callout>
@@ -81,12 +81,12 @@
             </button>
             <button type="button" class="btn btn-outline-secondary btn-submit ml-1" #licenseBtn [appApiAction]="licensePromise" [disabled]="licenseBtn.loading"
                 (click)="downloadLicense()" *ngIf="subscription && !subscription.cancelled">
-                <i class="fa fa-spinner fa-spin"></i>
+                <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                 <span>{{'downloadLicense' | i18n}}</span>
             </button>
             <button #cancelBtn type="button" class="btn btn-outline-danger btn-submit ml-auto" (click)="cancel()" [appApiAction]="cancelPromise"
                 [disabled]="cancelBtn.loading" *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel">
-                <i class="fa fa-spinner fa-spin"></i>
+                <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                 <span>{{'cancelSubscription' | i18n}}</span>
             </button>
         </div>
@@ -149,7 +149,7 @@
                             min="1" max="99" step="1" required>
                     </div>
                     <button type="submit" class="btn btn-outline-primary btn-submit" [disabled]="verifyForm.loading">
-                        <i class="fa fa-spinner fa-spin"></i>
+                        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         <span>{{'verifyBankAccount' | i18n}}</span>
                     </button>
                 </form>
diff --git a/src/app/settings/adjust-payment.component.html b/src/app/settings/adjust-payment.component.html
index b24e3472..44014c24 100644
--- a/src/app/settings/adjust-payment.component.html
+++ b/src/app/settings/adjust-payment.component.html
@@ -12,7 +12,7 @@
         <h3 class="card-body-header">{{(currentType != null ? 'changePaymentMethod' : 'addPaymentMethod') | i18n}}</h3>
         <app-payment [showOptions]="organizationId || currentType == null" [hidePaypal]="true" [hideBank]="!organizationId"></app-payment>
         <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-            <i class="fa fa-spinner fa-spin"></i>
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'submit' | i18n}}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" (click)="cancel()">
diff --git a/src/app/settings/adjust-storage.component.html b/src/app/settings/adjust-storage.component.html
index 993d9e32..737cf804 100644
--- a/src/app/settings/adjust-storage.component.html
+++ b/src/app/settings/adjust-storage.component.html
@@ -13,7 +13,7 @@
             | currency:'$'}} /{{interval | i18n}}
         </div>
         <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-            <i class="fa fa-spinner fa-spin"></i>
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'submit' | i18n}}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" (click)="cancel()">
diff --git a/src/app/settings/change-email.component.html b/src/app/settings/change-email.component.html
index 55d8b8c5..6eb079f2 100644
--- a/src/app/settings/change-email.component.html
+++ b/src/app/settings/change-email.component.html
@@ -26,8 +26,8 @@
             </div>
         </div>
     </ng-container>
-    <button type="submit" class="btn btn-primary btn-submit" appBlurClick [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin"></i>
+    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span *ngIf="!tokenSent">{{'continue' | i18n}}</span>
         <span *ngIf="tokenSent">{{'changeEmail' | i18n}}</span>
     </button>
diff --git a/src/app/settings/change-password.component.html b/src/app/settings/change-password.component.html
index 375993a4..9b3b1421 100644
--- a/src/app/settings/change-password.component.html
+++ b/src/app/settings/change-password.component.html
@@ -19,8 +19,8 @@
             </div>
         </div>
     </div>
-    <button type="submit" class="btn btn-primary btn-submit" appBlurClick [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin"></i>
+    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'changeMasterPassword' | i18n}}</span>
     </button>
 </form>
diff --git a/src/app/settings/create-organization.component.html b/src/app/settings/create-organization.component.html
index 4ccb4b70..94d927d2 100644
--- a/src/app/settings/create-organization.component.html
+++ b/src/app/settings/create-organization.component.html
@@ -11,7 +11,7 @@
             <small 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"></i>
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'submit' | i18n}}</span>
         </button>
     </form>
@@ -172,8 +172,8 @@
         <app-payment [hidePaypal]="true"></app-payment>
     </ng-container>
     <div [ngClass]="{'mt-4': plans[plan].noPayment}">
-        <button type="submit" class="btn btn-primary btn-submit" appBlurClick [disabled]="form.loading">
-            <i class="fa fa-spinner fa-spin"></i>
+        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'submit' | i18n}}</span>
         </button>
     </div>
diff --git a/src/app/settings/deauthorize-sessions.component.html b/src/app/settings/deauthorize-sessions.component.html
index daebbba8..019550ad 100644
--- a/src/app/settings/deauthorize-sessions.component.html
+++ b/src/app/settings/deauthorize-sessions.component.html
@@ -15,8 +15,8 @@
                     appAutoFocus appInputVerbatim>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'deauthorizeSessions' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'close' | i18n}}</button>
diff --git a/src/app/settings/delete-account.component.html b/src/app/settings/delete-account.component.html
index 08bb705a..487db1d7 100644
--- a/src/app/settings/delete-account.component.html
+++ b/src/app/settings/delete-account.component.html
@@ -15,8 +15,8 @@
                     appAutofocus appInputVerbatim>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'deleteAccount' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'close' | i18n}}</button>
diff --git a/src/app/settings/domain-rules.component.html b/src/app/settings/domain-rules.component.html
index 35c756fa..4f0f5994 100644
--- a/src/app/settings/domain-rules.component.html
+++ b/src/app/settings/domain-rules.component.html
@@ -5,7 +5,7 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
     <h2>{{'customEqDomains' | i18n}}</h2>
     <p *ngIf="loading">
-        <i class="fa fa-spinner fa-spin text-muted"></i>
+        <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
     </p>
     <ng-container *ngIf="!loading">
         <div class="form-group d-flex" *ngFor="let d of custom; let i = index; trackBy: indexTrackBy">
@@ -23,13 +23,13 @@
         </button>
         <small class="text-muted d-block mb-3">{{'newCustomDomainDesc' | i18n}}</small>
     </ng-container>
-    <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin"></i>
+    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'save' | i18n}}</span>
     </button>
     <h2 class="spaced-header">{{'globalEqDomains' | i18n}}</h2>
     <p *ngIf="loading">
-        <i class="fa fa-spinner fa-spin text-muted"></i>
+        <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
     </p>
     <table class="table table-hover table-list" *ngIf="!loading && global.length > 0">
         <tbody>
@@ -59,8 +59,8 @@
             </tr>
         </tbody>
     </table>
-    <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin"></i>
+    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'save' | i18n}}</span>
     </button>
 </form>
diff --git a/src/app/settings/organizations.component.html b/src/app/settings/organizations.component.html
index fddd4c16..cccf855c 100644
--- a/src/app/settings/organizations.component.html
+++ b/src/app/settings/organizations.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="vault">
     <p *ngIf="!loaded" class="text-muted">
-        <i class="fa fa-spinner fa-spin"></i>
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
     </p>
     <ng-container *ngIf="loaded">
         <ul class="fa-ul card-ul carets" *ngIf="organizations && organizations.length">
@@ -22,7 +22,7 @@
         <h1>
             {{'organizations' | i18n}}
             <small [appApiAction]="actionPromise" #action>
-                <i class="fa fa-spinner fa-spin text-muted" *ngIf="action.loading"></i>
+                <i class="fa fa-spinner fa-spin text-muted" *ngIf="action.loading" title="{{'loading' | i18n}}"></i>
             </small>
         </h1>
         <a href="#" routerLink="/settings/create-organization" class="btn btn-sm btn-outline-primary ml-auto">
@@ -30,7 +30,7 @@
             {{'newOrganization' | i18n}}
         </a>
     </div>
-    <i class="fa fa-spinner fa-spin text-muted" *ngIf="!loaded"></i>
+    <i class="fa fa-spinner fa-spin text-muted" *ngIf="!loaded" title="{{'loading' | i18n}}"></i>
     <ng-container *ngIf="loaded">
         <p *ngIf="!organizations || !organizations.length">{{'noOrganizationsList' | i18n}}</p>
         <table class="table table-hover table-list" *ngIf="organizations && organizations.length">
diff --git a/src/app/settings/premium.component.html b/src/app/settings/premium.component.html
index 973593c8..385cda4f 100644
--- a/src/app/settings/premium.component.html
+++ b/src/app/settings/premium.component.html
@@ -40,7 +40,7 @@
             <small class="form-text text-muted">{{'licenseFileDesc' | i18n : 'bitwarden_premium_license.json'}}</small>
         </div>
         <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-            <i class="fa fa-spinner fa-spin"></i>
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'submit' | i18n}}</span>
         </button>
     </form>
@@ -66,8 +66,8 @@
     <small class="text-muted font-italic">{{'paymentChargedAnnually' | i18n}}</small>
     <h2 class="spaced-header mb-4">{{'paymentInformation' | i18n}}</h2>
     <app-payment [hideBank]="true"></app-payment>
-    <button type="submit" class="btn btn-primary btn-submit" appBlurClick [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin"></i>
+    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'submit' | i18n}}</span>
     </button>
 </form>
diff --git a/src/app/settings/profile.component.html b/src/app/settings/profile.component.html
index 9d900e32..247df117 100644
--- a/src/app/settings/profile.component.html
+++ b/src/app/settings/profile.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="loading">
-    <i class="fa fa-spinner fa-spin text-muted"></i>
+    <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
 </div>
 <form *ngIf="profile && !loading" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
     <div class="row">
@@ -21,8 +21,8 @@
             <app-avatar data="{{profile.name || profile.email}}" dynamic="true" width="75" height="75" fontSize="35"></app-avatar>
         </div>
     </div>
-    <button type="submit" class="btn btn-primary btn-submit" appBlurClick [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin"></i>
+    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'save' | i18n}}</span>
     </button>
 </form>
diff --git a/src/app/settings/purge-vault.component.html b/src/app/settings/purge-vault.component.html
index fcfaac58..62f91119 100644
--- a/src/app/settings/purge-vault.component.html
+++ b/src/app/settings/purge-vault.component.html
@@ -15,8 +15,8 @@
                     appAutofocus appInputVerbatim>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'purgeVault' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'close' | i18n}}</button>
diff --git a/src/app/settings/two-factor-authenticator.component.html b/src/app/settings/two-factor-authenticator.component.html
index 4c768376..f75a519b 100644
--- a/src/app/settings/two-factor-authenticator.component.html
+++ b/src/app/settings/two-factor-authenticator.component.html
@@ -58,8 +58,8 @@
                     </ng-container>
                 </div>
                 <div class="modal-footer">
-                    <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                        <i class="fa fa-spinner fa-spin"></i>
+                    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         <span *ngIf="!enabled">{{'enable' | i18n}}</span>
                         <span *ngIf="enabled">{{'disable' | i18n}}</span>
                     </button>
diff --git a/src/app/settings/two-factor-duo.component.html b/src/app/settings/two-factor-duo.component.html
index d235dbec..9999c87f 100644
--- a/src/app/settings/two-factor-duo.component.html
+++ b/src/app/settings/two-factor-duo.component.html
@@ -44,8 +44,8 @@
                     </ng-container>
                 </div>
                 <div class="modal-footer">
-                    <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                        <i class="fa fa-spinner fa-spin"></i>
+                    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         <span *ngIf="!enabled">{{'enable' | i18n}}</span>
                         <span *ngIf="enabled">{{'disable' | i18n}}</span>
                     </button>
diff --git a/src/app/settings/two-factor-email.component.html b/src/app/settings/two-factor-email.component.html
index 15026dce..c8c43f3d 100644
--- a/src/app/settings/two-factor-email.component.html
+++ b/src/app/settings/two-factor-email.component.html
@@ -30,9 +30,9 @@
                             <input id="email" type="text" name="Email" class="form-control" [(ngModel)]="email" required inputmode="email" appInputVerbatim="false">
                         </div>
                         <div class="mb-3 d-flex">
-                            <button #sendBtn type="button" class="btn btn-outline-primary btn-sm btn-submit align-self-start" appBlurClick (click)="sendEmail()"
-                                [appApiAction]="emailPromise" [disabled]="sendBtn.loading">
-                                <i class="fa fa-spinner fa-spin"></i>
+                            <button #sendBtn type="button" class="btn btn-outline-primary btn-sm btn-submit align-self-start" (click)="sendEmail()" [appApiAction]="emailPromise"
+                                [disabled]="sendBtn.loading">
+                                <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                                 <span>{{'sendEmail' | i18n}}</span>
                             </button>
                             <span class="text-success ml-3" *ngIf="sentEmail">
@@ -46,8 +46,8 @@
                     </ng-container>
                 </div>
                 <div class="modal-footer">
-                    <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                        <i class="fa fa-spinner fa-spin"></i>
+                    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         <span *ngIf="!enabled">{{'enable' | i18n}}</span>
                         <span *ngIf="enabled">{{'disable' | i18n}}</span>
                     </button>
diff --git a/src/app/settings/two-factor-setup.component.html b/src/app/settings/two-factor-setup.component.html
index 19ba71d9..c04fc7c3 100644
--- a/src/app/settings/two-factor-setup.component.html
+++ b/src/app/settings/two-factor-setup.component.html
@@ -8,7 +8,7 @@
 <h2 class="mt-5">
     {{'providers' | i18n}}
     <small *ngIf="loading">
-        <i class="fa fa-spinner fa-spin fa-fw text-muted"></i>
+        <i class="fa fa-spinner fa-spin fa-fw text-muted" title="{{'loading' | i18n}}"></i>
     </small>
 </h2>
 <ul class="list-group list-group-2fa">
diff --git a/src/app/settings/two-factor-u2f.component.html b/src/app/settings/two-factor-u2f.component.html
index 02046625..bc6caec2 100644
--- a/src/app/settings/two-factor-u2f.component.html
+++ b/src/app/settings/two-factor-u2f.component.html
@@ -54,8 +54,8 @@
                     </ng-container>
                 </div>
                 <div class="modal-footer">
-                    <button appBlurClick type="submit" class="btn btn-primary" [disabled]="form.loading || (!enabled && !u2fResponse)">
-                        <i class="fa fa-spinner fa-spin" *ngIf="form.loading"></i>
+                    <button type="submit" class="btn btn-primary" [disabled]="form.loading || (!enabled && !u2fResponse)">
+                        <i class="fa fa-spinner fa-spin" *ngIf="form.loading" title="{{'loading' | i18n}}"></i>
                         <ng-container *ngIf="!form.loading">
                             <span *ngIf="!enabled">{{'enable' | i18n}}</span>
                             <span *ngIf="enabled">{{'disable' | i18n}}</span>
diff --git a/src/app/settings/two-factor-verify.component.html b/src/app/settings/two-factor-verify.component.html
index f566c344..1f355d61 100644
--- a/src/app/settings/two-factor-verify.component.html
+++ b/src/app/settings/two-factor-verify.component.html
@@ -7,7 +7,7 @@
     </div>
     <div class="modal-footer">
         <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-            <i class="fa fa-spinner fa-spin"></i>
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'continue' | i18n}}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'close' | i18n}}</button>
diff --git a/src/app/settings/two-factor-yubikey.component.html b/src/app/settings/two-factor-yubikey.component.html
index e9560fc5..8aba8bef 100644
--- a/src/app/settings/two-factor-yubikey.component.html
+++ b/src/app/settings/two-factor-yubikey.component.html
@@ -55,12 +55,12 @@
                 </div>
                 <div class="modal-footer">
                     <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                        <i class="fa fa-spinner fa-spin"></i>
+                        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         <span>{{'save' | i18n}}</span>
                     </button>
                     <button #disableBtn appBlurClick type="button" class="btn btn-outline-secondary btn-submit" [appApiAction]="disablePromise"
                         [disabled]="disableBtn.loading" (click)="disable()">
-                        <i class="fa fa-spinner fa-spin"></i>
+                        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         <span>{{'disableAllKeys' | i18n}}</span>
                     </button>
                     <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'close' | i18n}}</button>
diff --git a/src/app/settings/update-key.component.html b/src/app/settings/update-key.component.html
index d2322964..45121be6 100644
--- a/src/app/settings/update-key.component.html
+++ b/src/app/settings/update-key.component.html
@@ -17,8 +17,8 @@
                     appAutofocus appInputVerbatim>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'updateEncryptionKey' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'close' | i18n}}</button>
diff --git a/src/app/settings/user-billing.component.html b/src/app/settings/user-billing.component.html
index b50ceb1e..7b6dc799 100644
--- a/src/app/settings/user-billing.component.html
+++ b/src/app/settings/user-billing.component.html
@@ -2,18 +2,18 @@
     <h1>
         {{'billingAndLicensing' | i18n}}
         <small>
-            <i class="fa fa-spinner fa-spin text-muted" *ngIf="firstLoaded && loading"></i>
+            <i class="fa fa-spinner fa-spin text-muted" *ngIf="firstLoaded && loading" title="{{'loading' | i18n}}"></i>
         </small>
     </h1>
 </div>
-<i class="fa fa-spinner fa-spin text-muted" *ngIf="!firstLoaded && loading"></i>
+<i class="fa fa-spinner fa-spin text-muted" *ngIf="!firstLoaded && loading" title="{{'loading' | i18n}}"></i>
 <ng-container *ngIf="billing">
     <app-callout type="warning" title="{{'canceled' | i18n}}" *ngIf="subscription && subscription.cancelled">{{'subscriptionCanceled' | i18n}}</app-callout>
     <app-callout type="warning" title="{{'pendingCancellation' | i18n}}" *ngIf="subscriptionMarkedForCancel">
         <p>{{'subscriptionPendingCanceled' | i18n}}</p>
         <button #reinstateBtn type="button" class="btn btn-outline-secondary btn-submit" (click)="reinstate()" [appApiAction]="reinstatePromise"
             [disabled]="reinstateBtn.loading">
-            <i class="fa fa-spinner fa-spin"></i>
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'reinstateSubscription' | i18n}}</span>
         </button>
     </app-callout>
@@ -80,7 +80,7 @@
                 </button>
                 <button #cancelBtn type="button" class="btn btn-outline-danger btn-submit ml-auto" (click)="cancel()" [appApiAction]="cancelPromise"
                     [disabled]="cancelBtn.loading" *ngIf="!subscription.cancelled && !subscriptionMarkedForCancel">
-                    <i class="fa fa-spinner fa-spin"></i>
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'cancelSubscription' | i18n}}</span>
                 </button>
             </div>
diff --git a/src/app/settings/verify-email.component.html b/src/app/settings/verify-email.component.html
index d257f50e..c98ce80c 100644
--- a/src/app/settings/verify-email.component.html
+++ b/src/app/settings/verify-email.component.html
@@ -6,7 +6,7 @@
         <p>{{'verifyEmailDesc' | i18n}}</p>
         <button type="button" class="btn btn-block btn-outline-secondary btn-submit" #sendBtn [appApiAction]="actionPromise" [disabled]="sendBtn.loading"
             (click)="send()">
-            <i class="fa fa-spin fa-spinner"></i>
+            <i class="fa fa-spin fa-spinner" title="{{'loading' | i18n}}"></i>
             <span>
                 {{'sendEmail' | i18n}}
             </span>
diff --git a/src/app/tools/breach-report.component.html b/src/app/tools/breach-report.component.html
index a1571937..3f8f75e7 100644
--- a/src/app/tools/breach-report.component.html
+++ b/src/app/tools/breach-report.component.html
@@ -10,8 +10,8 @@
             <small class="form-text text-muted">{{'breachCheckUsernameEmail' | i18n}}</small>
         </div>
     </div>
-    <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin"></i>
+    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'checkBreaches' | i18n}}</span>
     </button>
 </form>
diff --git a/src/app/tools/export.component.html b/src/app/tools/export.component.html
index 39622eb9..a9dd4c80 100644
--- a/src/app/tools/export.component.html
+++ b/src/app/tools/export.component.html
@@ -11,8 +11,8 @@
                 appInputVerbatim>
         </div>
     </div>
-    <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin"></i>
+    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'exportVault' | i18n}}</span>
     </button>
 </form>
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index 1cb1b4d1..b231d849 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -120,8 +120,8 @@
         <label for="fileContents">{{'orCopyPasteFileContents' | i18n}}</label>
         <textarea id="fileContents" class="form-control" name="FileContents" [(ngModel)]="fileContents"></textarea>
     </div>
-    <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin"></i>
+    <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'importData' | i18n}}</span>
     </button>
 </form>
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 512bc208..f3bb9abd 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -53,7 +53,7 @@
                                     <a href="#" class="d-block" #checkPasswordBtn appStopClick appBlurClick title="{{'checkPassword' | i18n}}" (click)="checkPassword()"
                                         [appApiAction]="checkPasswordPromise">
                                         <i class="fa fa-lg fa-fw fa-check-circle" [hidden]="checkPasswordBtn.loading"></i>
-                                        <i class="fa fa-lg fa-fw fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"></i>
+                                        <i class="fa fa-lg fa-fw fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading" title="{{'loading' | i18n}}"></i>
                                     </a>
                                 </div>
                             </div>
@@ -353,11 +353,11 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
-                <button appBlurClick type="button" class="btn btn-outline-secondary" data-dismiss="modal">
+                <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
                     {{'cancel' | i18n}}
                 </button>
                 <div class="ml-auto" *ngIf="cipher">
@@ -367,7 +367,7 @@
                     <button #deleteBtn appBlurClick type="button" (click)="delete()" class="btn btn-outline-danger" title="{{'delete' | i18n}}"
                         *ngIf="editMode" [disabled]="deleteBtn.loading" [appApiAction]="deletePromise">
                         <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-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading" title="{{'loading' | i18n}}"></i>
                     </button>
                 </div>
             </div>
diff --git a/src/app/vault/attachments.component.html b/src/app/vault/attachments.component.html
index c71e800c..c57af408 100644
--- a/src/app/vault/attachments.component.html
+++ b/src/app/vault/attachments.component.html
@@ -27,7 +27,7 @@
                                 <button class="btn btn-outline-danger" type="button" appStopClick appBlurClick title="{{'delete' | 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-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading" title="{{'loading' | i18n}}"></i>
                                 </button>
                             </td>
                         </tr>
@@ -39,8 +39,8 @@
                 <small class="form-text text-muted">{{'maxFileSize' | i18n}}</small>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="{{'close' | i18n}}">{{'close' | i18n}}</button>
diff --git a/src/app/vault/bulk-delete.component.html b/src/app/vault/bulk-delete.component.html
index de082860..439edf06 100644
--- a/src/app/vault/bulk-delete.component.html
+++ b/src/app/vault/bulk-delete.component.html
@@ -13,8 +13,8 @@
                 {{'deleteSelectedItemsDesc' | i18n: cipherIds.length}}
             </div>
             <div class="modal-footer">
-                <button appBlurClick appAutoFocus type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                <button appAutoFocus type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'delete' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="{{'cancel' | i18n}}">{{'cancel' | i18n}}</button>
diff --git a/src/app/vault/bulk-move.component.html b/src/app/vault/bulk-move.component.html
index 7af391b9..328e8855 100644
--- a/src/app/vault/bulk-move.component.html
+++ b/src/app/vault/bulk-move.component.html
@@ -19,8 +19,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="{{'cancel' | i18n}}">{{'cancel' | i18n}}</button>
diff --git a/src/app/vault/bulk-share.component.html b/src/app/vault/bulk-share.component.html
index 0441f5b7..8c22283a 100644
--- a/src/app/vault/bulk-share.component.html
+++ b/src/app/vault/bulk-share.component.html
@@ -43,8 +43,8 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="{{'cancel' | i18n}}">{{'cancel' | i18n}}</button>
diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html
index 67b092c6..fd3d90ad 100644
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -53,7 +53,7 @@
         </tbody>
     </table>
     <div class="no-items" *ngIf="searchedCiphers.length === 0">
-        <i class="fa fa-spinner fa-spin text-muted" *ngIf="!loaded"></i>
+        <i class="fa fa-spinner fa-spin text-muted" *ngIf="!loaded" title="{{'loading' | i18n}}"></i>
         <ng-container *ngIf="loaded">
             <p>{{'noItemsInList' | i18n}}</p>
             <button (click)="addCipher()" class="btn btn-outline-primary" *ngIf="showAddNew">
diff --git a/src/app/vault/collections.component.html b/src/app/vault/collections.component.html
index 1508f4c2..d735c7be 100644
--- a/src/app/vault/collections.component.html
+++ b/src/app/vault/collections.component.html
@@ -42,7 +42,7 @@
             <div class="modal-footer">
                 <button appBlurClick type="submit" class="btn btn-primary" title="{{'save' | i18n}}" [disabled]="form.loading">
                     <i class="fa fa-save fa-lg fa-fw" [hidden]="form.loading"></i>
-                    <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!form.loading"></i>
+                    <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!form.loading" title="{{'loading' | i18n}}"></i>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="{{'cancel' | i18n}}">{{'cancel' | i18n}}</button>
             </div>
diff --git a/src/app/vault/folder-add-edit.component.html b/src/app/vault/folder-add-edit.component.html
index 1d369eb2..5421c055 100644
--- a/src/app/vault/folder-add-edit.component.html
+++ b/src/app/vault/folder-add-edit.component.html
@@ -12,8 +12,8 @@
                 <input id="name" class="form-control" type="text" name="Name" [(ngModel)]="folder.name" required>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="{{'cancel' | i18n}}">{{'cancel' | i18n}}</button>
@@ -21,7 +21,7 @@
                     <button #deleteBtn appBlurClick type="button" (click)="delete()" class="btn btn-outline-danger" title="{{'delete' | i18n}}"
                         *ngIf="editMode" [disabled]="deleteBtn.loading" [appApiAction]="deletePromise">
                         <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-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading" title="{{'loading' | i18n}}"></i>
                     </button>
                 </div>
             </div>
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html
index fc9fee31..d37894ec 100644
--- a/src/app/vault/groupings.component.html
+++ b/src/app/vault/groupings.component.html
@@ -41,7 +41,7 @@
             </li>
         </ul>
         <p *ngIf="!loaded" class="text-muted">
-            <i class="fa fa-spinner fa-spin"></i>
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         </p>
         <ng-container *ngIf="loaded">
             <ng-container *ngIf="showFolders">
diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html
index fe4b5ca9..77a45abd 100644
--- a/src/app/vault/share.component.html
+++ b/src/app/vault/share.component.html
@@ -44,7 +44,7 @@
             </div>
             <div class="modal-footer">
                 <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin"></i>
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="{{'cancel' | i18n}}">{{'cancel' | i18n}}</button>
diff --git a/src/index.html b/src/index.html
index 1c3949f9..c9cce1ed 100644
--- a/src/index.html
+++ b/src/index.html
@@ -24,7 +24,7 @@
             <div>
                 <img src="./images/logo-dark@2x.png" class="mb-4 logo" alt="Bitwarden">
                 <p class="text-center">
-                    <i class="fa fa-spinner fa-spin fa-2x text-muted"></i>
+                    <i class="fa fa-spinner fa-spin fa-2x text-muted" title="Loading"></i>
                 </p>
             </div>
         </div>