diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html
index b5d381a7..1b99bef9 100644
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -12,18 +12,18 @@
                         <div class="d-flex">
                             <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword" class="text-monospace form-control"
                                 [(ngModel)]="masterPassword" required appAutofocus appInputVerbatim>
-                            <button type="button" class="ml-1 btn btn-link" appBlurClick title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                            <button type="button" class="ml-1 btn btn-link" title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
                                 <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </button>
                         </div>
                     </div>
                     <hr>
                     <div class="d-flex">
-                        <button type="submit" class="btn btn-primary btn-block" appBlurClick>
+                        <button type="submit" class="btn btn-primary btn-block">
                             <i class="fa fa-unlock-alt"></i>
                             {{'unlock' | i18n}}
                         </button>
-                        <button type="button" class="btn btn-outline-secondary btn-block ml-2 mt-0" appBlurClick (click)="logOut()">
+                        <button type="button" class="btn btn-outline-secondary btn-block ml-2 mt-0" (click)="logOut()">
                             {{'logOut' | i18n}}
                         </button>
                     </div>
diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html
index 30fce67d..319befcf 100644
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -14,7 +14,7 @@
                         <div class="d-flex">
                             <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword" class="text-monospace form-control"
                                 [(ngModel)]="masterPassword" required appInputVerbatim>
-                            <button type="button" class="ml-1 btn btn-link" appBlurClick title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                            <button type="button" class="ml-1 btn btn-link" title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
                                 <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </button>
                         </div>
diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html
index 9278e637..6294b088 100644
--- a/src/app/accounts/register.component.html
+++ b/src/app/accounts/register.component.html
@@ -20,7 +20,7 @@
                         <div class="d-flex">
                             <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword" class="text-monospace form-control"
                                 [(ngModel)]="masterPassword" required appInputVerbatim>
-                            <button type="button" class="ml-1 btn btn-link" appBlurClick title="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)">
+                            <button type="button" class="ml-1 btn btn-link" title="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)">
                                 <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </button>
                         </div>
@@ -31,7 +31,7 @@
                         <div class="d-flex">
                             <input id="masterPasswordRetype" type="{{showPassword ? 'text' : 'password'}}" name="MasterPasswordRetype" class="text-monospace form-control"
                                 [(ngModel)]="confirmMasterPassword" required appInputVerbatim>
-                            <button type="button" class="ml-1 btn btn-link" appBlurClick title="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
+                            <button type="button" class="ml-1 btn btn-link" title="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
                                 <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </button>
                         </div>
diff --git a/src/app/organizations/manage/collection-add-edit.component.html b/src/app/organizations/manage/collection-add-edit.component.html
index 9b29ef96..9db9ca5a 100644
--- a/src/app/organizations/manage/collection-add-edit.component.html
+++ b/src/app/organizations/manage/collection-add-edit.component.html
@@ -18,10 +18,10 @@
                 <h3 class="mt-4 d-flex mb-0">
                     {{'groupAccess' | i18n}}
                     <div class="ml-auto" *ngIf="groups && groups.length">
-                        <button type="button" appBlurClick (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
                             {{'selectAll' | i18n}}
                         </button>
-                        <button type="button" appBlurClick (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
                             {{'unselectAll' | i18n}}
                         </button>
                     </div>
@@ -56,14 +56,14 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                <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">{{'cancel' | i18n}}</button>
                 <div class="ml-auto">
-                    <button #deleteBtn appBlurClick type="button" (click)="delete()" class="btn btn-outline-danger" title="{{'delete' | i18n}}"
-                        *ngIf="editMode" [disabled]="deleteBtn.loading" [appApiAction]="deletePromise">
+                    <button #deleteBtn 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" title="{{'loading' | i18n}}"></i>
                     </button>
diff --git a/src/app/organizations/manage/entity-users.component.html b/src/app/organizations/manage/entity-users.component.html
index 845cbdc9..f9e7c7b1 100644
--- a/src/app/organizations/manage/entity-users.component.html
+++ b/src/app/organizations/manage/entity-users.component.html
@@ -39,7 +39,7 @@
                                 <span *ngIf="u.type === organizationUserType.User">{{'user' | i18n}}</span>
                             </td>
                             <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"
+                                <button type="button" class="btn btn-sm btn-outline-danger btn-submit" (click)="remove(u)" #removeBtn [disabled]="removeBtn.loading"
                                     [appApiAction]="actionPromise" *ngIf="entity !== 'collection' || !u.accessAll">
                                     <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                                     <span>{{'remove' | i18n}}</span>
diff --git a/src/app/organizations/manage/group-add-edit.component.html b/src/app/organizations/manage/group-add-edit.component.html
index b4afde04..d32d12a9 100644
--- a/src/app/organizations/manage/group-add-edit.component.html
+++ b/src/app/organizations/manage/group-add-edit.component.html
@@ -25,10 +25,10 @@
                         {{'accessControl' | i18n}}
                     </div>
                     <div class="ml-auto" *ngIf="access === 'selected' && collections && collections.length">
-                        <button type="button" appBlurClick (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
                             {{'selectAll' | i18n}}
                         </button>
-                        <button type="button" appBlurClick (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
                             {{'unselectAll' | i18n}}
                         </button>
                     </div>
@@ -76,14 +76,14 @@
                 </ng-container>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                <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">{{'cancel' | i18n}}</button>
                 <div class="ml-auto">
-                    <button #deleteBtn appBlurClick type="button" (click)="delete()" class="btn btn-outline-danger" title="{{'delete' | i18n}}"
-                        *ngIf="editMode" [disabled]="deleteBtn.loading" [appApiAction]="deletePromise">
+                    <button #deleteBtn 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" title="{{'loading' | i18n}}"></i>
                     </button>
diff --git a/src/app/organizations/manage/user-add-edit.component.html b/src/app/organizations/manage/user-add-edit.component.html
index 8a6629d6..35680f6b 100644
--- a/src/app/organizations/manage/user-add-edit.component.html
+++ b/src/app/organizations/manage/user-add-edit.component.html
@@ -49,10 +49,10 @@
                         {{'accessControl' | i18n}}
                     </div>
                     <div class="ml-auto" *ngIf="access === 'selected' && collections && collections.length">
-                        <button type="button" appBlurClick (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
                             {{'selectAll' | i18n}}
                         </button>
-                        <button type="button" appBlurClick (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
                             {{'unselectAll' | i18n}}
                         </button>
                     </div>
@@ -100,14 +100,14 @@
                 </ng-container>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                <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">{{'cancel' | i18n}}</button>
                 <div class="ml-auto">
-                    <button #deleteBtn appBlurClick type="button" (click)="delete()" class="btn btn-outline-danger" title="{{'delete' | i18n}}"
-                        *ngIf="editMode" [disabled]="deleteBtn.loading" [appApiAction]="deletePromise">
+                    <button #deleteBtn 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" title="{{'loading' | i18n}}"></i>
                     </button>
diff --git a/src/app/organizations/manage/user-groups.component.html b/src/app/organizations/manage/user-groups.component.html
index fe80c919..e8ede8c0 100644
--- a/src/app/organizations/manage/user-groups.component.html
+++ b/src/app/organizations/manage/user-groups.component.html
@@ -32,7 +32,7 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                <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>
diff --git a/src/app/organizations/settings/account.component.html b/src/app/organizations/settings/account.component.html
index 8afcc6e6..d0baec62 100644
--- a/src/app/organizations/settings/account.component.html
+++ b/src/app/organizations/settings/account.component.html
@@ -49,7 +49,7 @@
 <div class="card border-danger">
     <div class="card-body">
         <p>{{'dangerZoneDesc' | i18n}}</p>
-        <button type="button" class="btn btn-outline-danger" (click)="deleteOrganization()" appBlurClick>{{'deleteOrganization' | i18n}}</button>
+        <button type="button" class="btn btn-outline-danger" (click)="deleteOrganization()">{{'deleteOrganization' | i18n}}</button>
     </div>
 </div>
 <ng-template #deleteOrganizationTemplate></ng-template>
diff --git a/src/app/organizations/vault/vault.component.html b/src/app/organizations/vault/vault.component.html
index 0673f9ab..29c8cab5 100644
--- a/src/app/organizations/vault/vault.component.html
+++ b/src/app/organizations/vault/vault.component.html
@@ -8,7 +8,7 @@
         <div class="col-9">
             <div class="page-header d-flex">
                 <h1>{{'vault' | i18n}}</h1>
-                <button type="button" class="btn btn-outline-primary btn-sm ml-auto" (click)="addCipher()" appBlurClick>
+                <button type="button" class="btn btn-outline-primary btn-sm ml-auto" (click)="addCipher()">
                     <i class="fa fa-plus fa-fw"></i>{{'addItem' | i18n}}
                 </button>
             </div>
diff --git a/src/app/settings/account.component.html b/src/app/settings/account.component.html
index 46f06971..26aa42d9 100644
--- a/src/app/settings/account.component.html
+++ b/src/app/settings/account.component.html
@@ -16,9 +16,9 @@
 <div class="card border-danger">
     <div class="card-body">
         <p>{{'dangerZoneDesc' | i18n}}</p>
-        <button type="button" class="btn btn-outline-danger" (click)="deauthorizeSessions()" appBlurClick>{{'deauthorizeSessions' | i18n}}</button>
-        <button type="button" class="btn btn-outline-danger" (click)="purgeVault()" appBlurClick>{{'purgeVault' | i18n}}</button>
-        <button type="button" class="btn btn-outline-danger" (click)="deleteAccount()" appBlurClick>{{'deleteAccount' | i18n}}</button>
+        <button type="button" class="btn btn-outline-danger" (click)="deauthorizeSessions()">{{'deauthorizeSessions' | i18n}}</button>
+        <button type="button" class="btn btn-outline-danger" (click)="purgeVault()">{{'purgeVault' | i18n}}</button>
+        <button type="button" class="btn btn-outline-danger" (click)="deleteAccount()">{{'deleteAccount' | i18n}}</button>
     </div>
 </div>
 <ng-template #deauthorizeSessionsTemplate></ng-template>
diff --git a/src/app/settings/domain-rules.component.html b/src/app/settings/domain-rules.component.html
index 4f0f5994..30345c15 100644
--- a/src/app/settings/domain-rules.component.html
+++ b/src/app/settings/domain-rules.component.html
@@ -18,7 +18,7 @@
                 <i class="fa fa-minus-circle fa-lg"></i>
             </button>
         </div>
-        <button type="button" appBlurClick (click)="add()" class="btn btn-outline-secondary btn-sm mb-2">
+        <button type="button" (click)="add()" class="btn btn-outline-secondary btn-sm mb-2">
             <i class="fa fa-plus fa-fw"></i> {{'newCustomDomain' | i18n}}
         </button>
         <small class="text-muted d-block mb-3">{{'newCustomDomainDesc' | i18n}}</small>
diff --git a/src/app/settings/options.component.html b/src/app/settings/options.component.html
index 9297146b..e02742be 100644
--- a/src/app/settings/options.component.html
+++ b/src/app/settings/options.component.html
@@ -23,7 +23,7 @@
         </div>
         <small class="form-text text-muted">{{'disableIconsDesc' | i18n}}</small>
     </div>
-    <button type="submit" class="btn btn-primary" appBlurClick>
+    <button type="submit" class="btn btn-primary">
         {{'save' | i18n}}
     </button>
 </form>
diff --git a/src/app/settings/two-factor-recovery.component.html b/src/app/settings/two-factor-recovery.component.html
index 391c2c28..48085f95 100644
--- a/src/app/settings/two-factor-recovery.component.html
+++ b/src/app/settings/two-factor-recovery.component.html
@@ -23,7 +23,7 @@
                     </ng-container>
                 </div>
                 <div class="modal-footer">
-                    <button appBlurClick type="button" class="btn btn-primary" (click)="print()" *ngIf="code">{{'printCode' | i18n}}</button>
+                    <button type="button" class="btn btn-primary" (click)="print()" *ngIf="code">{{'printCode' | i18n}}</button>
                     <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'close' | i18n}}</button>
                 </div>
             </ng-container>
diff --git a/src/app/settings/two-factor-verify.component.html b/src/app/settings/two-factor-verify.component.html
index 1f355d61..43434cb9 100644
--- a/src/app/settings/two-factor-verify.component.html
+++ b/src/app/settings/two-factor-verify.component.html
@@ -6,7 +6,7 @@
             appAutoFocus appInputVerbatim>
     </div>
     <div class="modal-footer">
-        <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
             <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'continue' | i18n}}</span>
         </button>
diff --git a/src/app/settings/two-factor-yubikey.component.html b/src/app/settings/two-factor-yubikey.component.html
index 8aba8bef..a2dafe3b 100644
--- a/src/app/settings/two-factor-yubikey.component.html
+++ b/src/app/settings/two-factor-yubikey.component.html
@@ -40,7 +40,7 @@
                                 appInputVerbatim>
                             <div class="d-flex" *ngIf="k.existingKey">
                                 <span class="mr-2">{{k.existingKey}}</span>
-                                <button type="button" class="btn btn-link text-danger ml-auto" appBlurClick (click)="remove(k)" title="{{'remove' | i18n}}">
+                                <button type="button" class="btn btn-link text-danger ml-auto" (click)="remove(k)" title="{{'remove' | i18n}}">
                                     <i class="fa fa-minus-circle fa-lg"></i>
                                 </button>
                             </div>
@@ -54,12 +54,12 @@
                     <small class="form-text text-muted">{{'twoFactorYubikeySupportsNfcDesc' | i18n}}</small>
                 </div>
                 <div class="modal-footer">
-                    <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                    <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 #disableBtn appBlurClick type="button" class="btn btn-outline-secondary btn-submit" [appApiAction]="disablePromise"
-                        [disabled]="disableBtn.loading" (click)="disable()">
+                    <button #disableBtn type="button" class="btn btn-outline-secondary btn-submit" [appApiAction]="disablePromise" [disabled]="disableBtn.loading"
+                        (click)="disable()">
                         <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                         <span>{{'disableAllKeys' | i18n}}</span>
                     </button>
diff --git a/src/app/tools/password-generator-history.component.html b/src/app/tools/password-generator-history.component.html
index 5eed6957..47aab69c 100644
--- a/src/app/tools/password-generator-history.component.html
+++ b/src/app/tools/password-generator-history.component.html
@@ -14,7 +14,7 @@
                         <small class="text-muted">{{h.date | date:'medium'}}</small>
                     </div>
                     <div class="ml-auto">
-                        <button class="btn btn-link" appBlurClick title="{{'copyPassword' | i18n}}" (click)="copy(h.password)">
+                        <button class="btn btn-link" title="{{'copyPassword' | i18n}}" (click)="copy(h.password)">
                             <i class="fa fa-lg fa-clipboard"></i>
                         </button>
                     </div>
@@ -24,11 +24,11 @@
                 {{'noPasswordsInList' | i18n}}
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="{{'close' | i18n}}">
+                <button type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="{{'close' | i18n}}">
                     {{'close' | i18n}}
                 </button>
                 <div class="ml-auto">
-                    <button appBlurClick type="button" (click)="clear()" class="btn btn-outline-danger" title="{{'clear' | i18n}}">
+                    <button type="button" (click)="clear()" class="btn btn-outline-danger" title="{{'clear' | i18n}}">
                         <i class="fa fa-trash-o fa-lg fa-fw"></i>
                     </button>
                 </div>
diff --git a/src/app/tools/password-generator.component.html b/src/app/tools/password-generator.component.html
index de6c32b2..697da526 100644
--- a/src/app/tools/password-generator.component.html
+++ b/src/app/tools/password-generator.component.html
@@ -44,15 +44,15 @@
 </div>
 <div class="d-flex">
     <div>
-        <button type="button" class="btn btn-primary" appBlurClick (click)="regenerate()">
+        <button type="button" class="btn btn-primary" (click)="regenerate()">
             {{'regeneratePassword' | i18n}}
         </button>
-        <button type="button" class="btn btn-outline-secondary" appBlurClick (click)="copy()">
+        <button type="button" class="btn btn-outline-secondary" (click)="copy()">
             {{'copyPassword' | i18n}}
         </button>
     </div>
     <div class="ml-auto">
-        <button type="button" class="btn btn-outline-secondary" appBlurClick (click)="history()" title="{{'passwordHistory' | i18n}}">
+        <button type="button" class="btn btn-outline-secondary" (click)="history()" title="{{'passwordHistory' | i18n}}">
             <i class="fa fa-clock-o fa-lg"></i>
         </button>
     </div>
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index f3bb9abd..9e577b01 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -36,7 +36,7 @@
                             <div class="input-group">
                                 <input id="loginUsername" class="form-control" type="text" name="Login.Username" [(ngModel)]="cipher.login.username" appInputVerbatim>
                                 <div class="input-group-append">
-                                    <button type="button" class="btn btn-outline-secondary" appBlurClick title="{{'copyUsername' | i18n}}" (click)="copy(cipher.login.username, 'username', 'Username')"
+                                    <button type="button" class="btn btn-outline-secondary" title="{{'copyUsername' | i18n}}" (click)="copy(cipher.login.username, 'username', 'Username')"
                                         tabindex="-1">
                                         <i class="fa fa-lg fa-clipboard"></i>
                                     </button>
@@ -47,10 +47,10 @@
                             <div class="d-flex">
                                 <label for="loginPassword">{{'password' | i18n}}</label>
                                 <div class="ml-auto d-flex">
-                                    <a href="#" class="d-block mr-2" appStopClick appBlurClick title="{{'generatePassword' | i18n}}" (click)="generatePassword()">
+                                    <a href="#" class="d-block mr-2" appStopClick title="{{'generatePassword' | i18n}}" (click)="generatePassword()">
                                         <i class="fa fa-lg fa-fw fa-refresh"></i>
                                     </a>
-                                    <a href="#" class="d-block" #checkPasswordBtn appStopClick appBlurClick title="{{'checkPassword' | i18n}}" (click)="checkPassword()"
+                                    <a href="#" class="d-block" #checkPasswordBtn appStopClick 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" title="{{'loading' | i18n}}"></i>
@@ -61,11 +61,11 @@
                                 <input id="loginPassword" class="form-control text-monospace" type="{{showPassword ? 'text' : 'password'}}" name="Login.Password"
                                     [(ngModel)]="cipher.login.password" appInputVerbatim>
                                 <div class="input-group-append">
-                                    <button type="button" class="btn btn-outline-secondary" appBlurClick title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()"
+                                    <button type="button" class="btn btn-outline-secondary" title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()"
                                         tabindex="-1">
                                         <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                                     </button>
-                                    <button type="button" class="btn btn-outline-secondary" appBlurClick title="{{'copyPassword' | i18n}}" (click)="copy(cipher.login.password, 'password', 'Password')"
+                                    <button type="button" class="btn btn-outline-secondary" title="{{'copyPassword' | i18n}}" (click)="copy(cipher.login.password, 'password', 'Password')"
                                         tabindex="-1">
                                         <i class="fa fa-lg fa-clipboard"></i>
                                     </button>
@@ -93,7 +93,7 @@
                                     </svg>
                                 </span>
                                 <span class="totp-code mr-2" title="{{'verificationCodeTotp' | i18n}}">{{totpCodeFormatted}}</span>
-                                <button type="button" class="btn btn-link" appBlurClick title="{{'copyVerificationCode' | i18n}}" (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')">
+                                <button type="button" class="btn btn-link" title="{{'copyVerificationCode' | i18n}}" (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')">
                                     <i class="fa fa-clipboard"></i>
                                 </button>
                             </div>
@@ -107,11 +107,11 @@
                                     <input class="form-control" id="loginUri{{i}}" type="text" name="Login.Uris[{{i}}].Uri" [(ngModel)]="u.uri" placeholder="{{'ex' | i18n}} https://google.com"
                                         appInputVerbatim>
                                     <div class="input-group-append">
-                                        <button type="button" class="btn btn-outline-secondary" appBlurClick title="{{'launch' | i18n}}" (click)="launch(u)" [disabled]="!u.canLaunch"
+                                        <button type="button" class="btn btn-outline-secondary" title="{{'launch' | i18n}}" (click)="launch(u)" [disabled]="!u.canLaunch"
                                             tabindex="-1">
                                             <i class="fa fa-lg fa-share"></i>
                                         </button>
-                                        <button type="button" class="btn btn-outline-secondary" appBlurClick title="{{'copyUri' | i18n}}" (click)="copy(u.uri, 'uri', 'URI')"
+                                        <button type="button" class="btn btn-outline-secondary" title="{{'copyUri' | i18n}}" (click)="copy(u.uri, 'uri', 'URI')"
                                             tabindex="-1">
                                             <i class="fa fa-lg fa-clipboard"></i>
                                         </button>
@@ -133,7 +133,7 @@
                             </div>
                         </div>
                     </ng-container>
-                    <a href="#" appStopClick appBlurClick (click)="addUri()" class="d-inline-block mb-3">
+                    <a href="#" appStopClick (click)="addUri()" class="d-inline-block mb-3">
                         <i class="fa fa-plus-circle fa-fw"></i> {{'newUri' | i18n}}
                     </a>
                 </ng-container>
@@ -157,7 +157,7 @@
                             <div class="input-group">
                                 <input id="cardNumber" class="form-control" type="text" name="Card.Number" [(ngModel)]="cipher.card.number" appInputVerbatim>
                                 <div class="input-group-append">
-                                    <button type="button" class="btn btn-outline-secondary" appBlurClick title="{{'copyNumber' | i18n}}" (click)="copy(cipher.card.number, 'number', 'Number')"
+                                    <button type="button" class="btn btn-outline-secondary" title="{{'copyNumber' | i18n}}" (click)="copy(cipher.card.number, 'number', 'Number')"
                                         tabindex="-1">
                                         <i class="fa fa-lg fa-clipboard"></i>
                                     </button>
@@ -182,11 +182,11 @@
                                 <input id="cardCode" class="form-control text-monospace" type="{{showCardCode ? 'text' : 'password'}}" name="Card.Code" [(ngModel)]="cipher.card.code"
                                     appInputVerbatim>
                                 <div class="input-group-append">
-                                    <button type="button" class="btn btn-outline-secondary" appBlurClick title="{{'toggleVisibility' | i18n}}" (click)="toggleCardCode()"
+                                    <button type="button" class="btn btn-outline-secondary" title="{{'toggleVisibility' | i18n}}" (click)="toggleCardCode()"
                                         tabindex="-1">
                                         <i class="fa fa-lg" [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
                                     </button>
-                                    <button type="button" class="btn btn-outline-secondary" appBlurClick title="{{'securityCode' | i18n}}" (click)="copy(cipher.card.code, 'securityCode', 'Security Code')"
+                                    <button type="button" class="btn btn-outline-secondary" title="{{'securityCode' | i18n}}" (click)="copy(cipher.card.code, 'securityCode', 'Security Code')"
                                         tabindex="-1">
                                         <i class="fa fa-lg fa-clipboard"></i>
                                     </button>
@@ -309,7 +309,7 @@
                                 <div class="input-group" *ngIf="f.type === fieldType.Text">
                                     <input id="fieldValue{{i}}" class="form-control" type="text" name="Field.Value{{i}}" [(ngModel)]="f.value" appInputVerbatim>
                                     <div class="input-group-append">
-                                        <button type="button" class="btn btn-outline-secondary" appBlurClick title="{{'copyValue' | i18n}}" (click)="copy(f.value, 'value', 'Field')"
+                                        <button type="button" class="btn btn-outline-secondary" title="{{'copyValue' | i18n}}" (click)="copy(f.value, 'value', 'Field')"
                                             tabindex="-1">
                                             <i class="fa fa-lg fa-clipboard"></i>
                                         </button>
@@ -319,11 +319,11 @@
                                     <input id="fieldValue{{i}}" type="{{f.showValue ? 'text' : 'password'}}" name="Field.Value{{i}}" [(ngModel)]="f.value" class="form-control text-monospace"
                                         appInputVerbatim>
                                     <div class="input-group-append">
-                                        <button type="button" class="btn btn-outline-secondary" appBlurClick title="{{'toggleVisibility' | i18n}}" (click)="toggleFieldValue(f)"
+                                        <button type="button" class="btn btn-outline-secondary" title="{{'toggleVisibility' | i18n}}" (click)="toggleFieldValue(f)"
                                             tabindex="-1">
                                             <i class="fa fa-lg" [ngClass]="{'fa-eye': !f.showValue, 'fa-eye-slash': f.showValue}"></i>
                                         </button>
-                                        <button type="button" class="btn btn-outline-secondary" appBlurClick title="{{'copyValue' | i18n}}" (click)="copy(f.value, 'value', 'Field')"
+                                        <button type="button" class="btn btn-outline-secondary" title="{{'copyValue' | i18n}}" (click)="copy(f.value, 'value', 'Field')"
                                             tabindex="-1">
                                             <i class="fa fa-lg fa-clipboard"></i>
                                         </button>
@@ -340,7 +340,7 @@
                         </div>
                     </div>
                 </ng-container>
-                <a href="#" appStopClick appBlurClick (click)="addField()" class="d-inline-block mb-2">
+                <a href="#" appStopClick (click)="addField()" class="d-inline-block mb-2">
                     <i class="fa fa-plus-circle fa-fw"></i> {{'newCustomField' | i18n}}
                 </a>
                 <div class="row">
@@ -361,10 +361,10 @@
                     {{'cancel' | i18n}}
                 </button>
                 <div class="ml-auto" *ngIf="cipher">
-                    <button *ngIf="!organization" appBlurClick type="button" (click)="toggleFavorite()" class="btn btn-link" title="{{(cipher.favorite ? 'unfavorite' : 'favorite') | i18n}}">
+                    <button *ngIf="!organization" type="button" (click)="toggleFavorite()" class="btn btn-link" title="{{(cipher.favorite ? 'unfavorite' : 'favorite') | i18n}}">
                         <i class="fa fa-lg" [ngClass]="{'fa-star': cipher.favorite, 'fa-star-o': !cipher.favorite}"></i>
                     </button>
-                    <button #deleteBtn appBlurClick type="button" (click)="delete()" class="btn btn-outline-danger" title="{{'delete' | i18n}}"
+                    <button #deleteBtn 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" title="{{'loading' | i18n}}"></i>
diff --git a/src/app/vault/attachments.component.html b/src/app/vault/attachments.component.html
index c57af408..d3030dc4 100644
--- a/src/app/vault/attachments.component.html
+++ b/src/app/vault/attachments.component.html
@@ -19,13 +19,13 @@
                                 <i class="fa fa-spinner fa-lg fa-fw fa-spin" *ngIf="a.downloading"></i>
                             </td>
                             <td>
-                                <a href="#" appStopClick appBlurCLick (click)="download(a)">{{a.fileName}}</a>
+                                <a href="#" appStopClick (click)="download(a)">{{a.fileName}}</a>
                                 <br>
                                 <small>{{a.sizeName}}</small>
                             </td>
                             <td class="table-list-options">
-                                <button class="btn btn-outline-danger" type="button" appStopClick appBlurClick title="{{'delete' | i18n}}" (click)="delete(a)"
-                                    #deleteBtn [appApiAction]="deletePromises[a.id]" [disabled]="deleteBtn.loading">
+                                <button class="btn btn-outline-danger" type="button" appStopClick 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" title="{{'loading' | i18n}}"></i>
                                 </button>
diff --git a/src/app/vault/bulk-share.component.html b/src/app/vault/bulk-share.component.html
index 8c22283a..e5a5f1a5 100644
--- a/src/app/vault/bulk-share.component.html
+++ b/src/app/vault/bulk-share.component.html
@@ -21,10 +21,10 @@
                 <div class="d-flex">
                     <h3>{{'collections' | i18n}}</h3>
                     <small class="ml-auto d-flex">
-                        <button type="button" appBlurClick (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
                             {{'selectAll' | i18n}}
                         </button>
-                        <button type="button" appBlurClick (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
                             {{'unselectAll' | i18n}}
                         </button>
                     </small>
diff --git a/src/app/vault/collections.component.html b/src/app/vault/collections.component.html
index d735c7be..ac25f9d3 100644
--- a/src/app/vault/collections.component.html
+++ b/src/app/vault/collections.component.html
@@ -15,10 +15,10 @@
                 <div class="d-flex">
                     <h3>{{'collections' | i18n}}</h3>
                     <div class="ml-auto d-flex" *ngIf="collections && collections.length">
-                        <button type="button" appBlurClick (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
                             {{'selectAll' | i18n}}
                         </button>
-                        <button type="button" appBlurClick (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
                             {{'unselectAll' | i18n}}
                         </button>
                     </div>
@@ -40,7 +40,7 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary" title="{{'save' | i18n}}" [disabled]="form.loading">
+                <button 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" title="{{'loading' | i18n}}"></i>
                 </button>
diff --git a/src/app/vault/folder-add-edit.component.html b/src/app/vault/folder-add-edit.component.html
index 5421c055..acc6060e 100644
--- a/src/app/vault/folder-add-edit.component.html
+++ b/src/app/vault/folder-add-edit.component.html
@@ -18,8 +18,8 @@
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="{{'cancel' | i18n}}">{{'cancel' | i18n}}</button>
                 <div class="ml-auto">
-                    <button #deleteBtn appBlurClick type="button" (click)="delete()" class="btn btn-outline-danger" title="{{'delete' | i18n}}"
-                        *ngIf="editMode" [disabled]="deleteBtn.loading" [appApiAction]="deletePromise">
+                    <button #deleteBtn 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" title="{{'loading' | i18n}}"></i>
                     </button>
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html
index d37894ec..74727a2e 100644
--- a/src/app/vault/groupings.component.html
+++ b/src/app/vault/groupings.component.html
@@ -7,12 +7,12 @@
             (input)="searchTextChanged()" appAutofocus>
         <ul class="fa-ul card-ul">
             <li [ngClass]="{active: selectedAll}">
-                <a href="#" appStopClick appBlurClick (click)="selectAll()">
+                <a href="#" appStopClick (click)="selectAll()">
                     <i class="fa-li fa fa-fw fa-th"></i>{{'allItems' | i18n}}
                 </a>
             </li>
             <li [ngClass]="{active: selectedFavorites}" *ngIf="showFavorites">
-                <a href="#" appStopClick appBlurClick (click)="selectFavorites()">
+                <a href="#" appStopClick (click)="selectFavorites()">
                     <i class="fa-li fa fa-fw fa-star"></i>{{'favorites' | i18n}}
                 </a>
             </li>
@@ -20,22 +20,22 @@
         <h3>{{'types' | i18n}}</h3>
         <ul class="fa-ul card-ul">
             <li [ngClass]="{active: selectedType === cipherType.Login}">
-                <a href="#" appStopClick appBlurClick (click)="selectType(cipherType.Login)">
+                <a href="#" appStopClick (click)="selectType(cipherType.Login)">
                     <i class="fa-li fa fa-fw fa-globe"></i>{{'typeLogin' | i18n}}
                 </a>
             </li>
             <li [ngClass]="{active: selectedType === cipherType.Card}">
-                <a href="#" appStopClick appBlurClick (click)="selectType(cipherType.Card)">
+                <a href="#" appStopClick (click)="selectType(cipherType.Card)">
                     <i class="fa-li fa fa-fw fa-credit-card"></i>{{'typeCard' | i18n}}
                 </a>
             </li>
             <li [ngClass]="{active: selectedType === cipherType.Identity}">
-                <a href="#" appStopClick appBlurClick (click)="selectType(cipherType.Identity)">
+                <a href="#" appStopClick (click)="selectType(cipherType.Identity)">
                     <i class="fa-li fa fa-fw fa-id-card-o"></i>{{'typeIdentity' | i18n}}
                 </a>
             </li>
             <li [ngClass]="{active: selectedType === cipherType.SecureNote}">
-                <a href="#" appStopClick appBlurClick (click)="selectType(cipherType.SecureNote)">
+                <a href="#" appStopClick (click)="selectType(cipherType.SecureNote)">
                     <i class="fa-li fa fa-fw fa-sticky-note-o"></i>{{'typeSecureNote' | i18n}}
                 </a>
             </li>
@@ -47,16 +47,15 @@
             <ng-container *ngIf="showFolders">
                 <h3 class="d-flex">
                     {{'folders' | i18n}}
-                    <a href="#" class="text-muted ml-auto" appStopClick appBlurClick (click)="addFolder()" title="{{'addFolder' | i18n}}">
+                    <a href="#" class="text-muted ml-auto" appStopClick (click)="addFolder()" title="{{'addFolder' | i18n}}">
                         <i class="fa fa-plus fa-fw"></i>
                     </a>
                 </h3>
                 <ul class="fa-ul card-ul carets">
                     <li *ngFor="let f of folders" class="d-flex" [ngClass]="{active: selectedFolder && f.id === selectedFolderId}">
-                        <a href="#" appStopClick appBlurClick (click)="selectFolder(f)">
+                        <a href="#" appStopClick (click)="selectFolder(f)">
                             <i class="fa-li fa fa-caret-right"></i> {{f.name}}</a>
-                        <a href="#" class="text-muted ml-auto show-active" appStopClick appBlurClick (click)="editFolder(f)" title="{{'editFolder' | i18n}}"
-                            *ngIf="f.id">
+                        <a href="#" class="text-muted ml-auto show-active" appStopClick (click)="editFolder(f)" title="{{'editFolder' | i18n}}" *ngIf="f.id">
                             <i class="fa fa-pencil fa-fw"></i>
                         </a>
                     </li>
@@ -66,7 +65,7 @@
                 <h3>{{'collections' | i18n}}</h3>
                 <ul class="fa-ul card-ul carets">
                     <li *ngFor="let c of collections" [ngClass]="{active: c.id === selectedCollectionId}">
-                        <a href="#" appStopClick appBlurClick (click)="selectCollection(c)">
+                        <a href="#" appStopClick (click)="selectCollection(c)">
                             <i class="fa-li fa fa-caret-right"></i> {{c.name}}</a>
                     </li>
                 </ul>
diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html
index 77a45abd..b43a8eed 100644
--- a/src/app/vault/share.component.html
+++ b/src/app/vault/share.component.html
@@ -21,10 +21,10 @@
                 <div class="d-flex">
                     <h3>{{'collections' | i18n}}</h3>
                     <small class="ml-auto d-flex">
-                        <button type="button" appBlurClick (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
                             {{'selectAll' | i18n}}
                         </button>
-                        <button type="button" appBlurClick (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
+                        <button type="button" (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
                             {{'unselectAll' | i18n}}
                         </button>
                     </small>
@@ -43,7 +43,7 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                <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>
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index 161c3426..3b773608 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -39,7 +39,7 @@
                             </a>
                         </div>
                     </div>
-                    <button type="button" class="btn btn-outline-primary btn-sm" (click)="addCipher()" appBlurClick>
+                    <button type="button" class="btn btn-outline-primary btn-sm" (click)="addCipher()">
                         <i class="fa fa-plus fa-fw"></i>{{'addItem' | i18n}}
                     </button>
                 </div>