From 05f6a30672a5390edf43279f4d8bf034fb6b4be2 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Mon, 25 Jul 2022 11:43:10 +0100
Subject: [PATCH] [PS-1182] Desktop / Browser: Accessibility - remove
 appBlurClick, change remaining links to buttons (#2662)

* Remove `appBlurClick` from browser extension controls

* Remove last remaining `appBlurClick` from desktop app controls

* Change any straggler `<a>` links to buttons where appropriate (where they don't open a browser window)

* Add missing `type="button"` to some of the desktop buttons

* Update and run prettier, linter

* Remove orphaned jslibs
---
 .../popup/accounts/environment.component.html |  4 +-
 .../src/popup/accounts/hint.component.html    |  4 +-
 .../src/popup/accounts/home.component.html    | 14 +++---
 .../src/popup/accounts/lock.component.html    |  3 +-
 .../src/popup/accounts/login.component.html   |  7 ++-
 .../popup/accounts/register.component.html    |  6 +--
 .../accounts/set-password.component.html      |  6 +--
 .../two-factor-options.component.html         |  2 +-
 .../popup/accounts/two-factor.component.html  |  3 +-
 .../update-temp-password.component.html       |  4 +-
 .../password-reprompt.component.html          |  3 +-
 .../popup/components/set-pin.component.html   |  3 +-
 .../popup/generator/generator.component.html  |  6 +--
 .../password-generator-history.component.html |  4 +-
 .../popup/send/send-add-edit.component.html   |  6 +--
 .../popup/send/send-groupings.component.html  |  3 --
 .../src/popup/send/send-type.component.html   |  3 +-
 .../settings/excluded-domains.component.html  |  7 ++-
 .../src/popup/settings/export.component.html  |  6 +--
 .../settings/folder-add-edit.component.html   |  5 +-
 .../src/popup/settings/folders.component.html | 11 ++---
 .../src/popup/settings/options.component.html |  4 +-
 .../src/popup/settings/premium.component.html |  9 ++--
 .../popup/settings/settings.component.html    | 48 ++++++++++---------
 .../src/popup/settings/sync.component.html    |  4 +-
 apps/browser/src/popup/tabs.component.html    |  5 ++
 .../add-edit-custom-fields.component.html     |  1 -
 .../src/popup/vault/add-edit.component.html   | 14 +-----
 .../popup/vault/attachments.component.html    |  7 ++-
 .../src/popup/vault/ciphers.component.html    |  6 +--
 .../popup/vault/collections.component.html    |  4 +-
 .../popup/vault/current-tab.component.html    |  3 +-
 .../vault/password-history.component.html     |  2 +-
 .../src/popup/vault/share.component.html      |  3 +-
 .../popup/vault/vault-filter.component.html   | 16 +------
 .../src/popup/vault/view.component.html       | 17 ++-----
 .../app/accounts/set-password.component.html  |  2 +-
 .../src/app/components/set-pin.component.html |  2 +-
 .../layout/account-switcher.component.html    |  2 +-
 apps/desktop/src/app/send/send.component.html |  7 ++-
 40 files changed, 110 insertions(+), 156 deletions(-)

diff --git a/apps/browser/src/popup/accounts/environment.component.html b/apps/browser/src/popup/accounts/environment.component.html
index 626c5b7b3eb..a23de6ff56a 100644
--- a/apps/browser/src/popup/accounts/environment.component.html
+++ b/apps/browser/src/popup/accounts/environment.component.html
@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()">
   <header>
     <div class="left">
-      <a routerLink="/home">{{ "close" | i18n }}</a>
+      <button type="button" routerLink="/home">{{ "close" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "appName" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "save" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
diff --git a/apps/browser/src/popup/accounts/hint.component.html b/apps/browser/src/popup/accounts/hint.component.html
index b4fbfdc05a4..828af9c5583 100644
--- a/apps/browser/src/popup/accounts/hint.component.html
+++ b/apps/browser/src/popup/accounts/hint.component.html
@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <a routerLink="/login">{{ "cancel" | i18n }}</a>
+      <button type="button" routerLink="/login">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "passwordHint" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
diff --git a/apps/browser/src/popup/accounts/home.component.html b/apps/browser/src/popup/accounts/home.component.html
index 2fb6907dccf..5f80204a27b 100644
--- a/apps/browser/src/popup/accounts/home.component.html
+++ b/apps/browser/src/popup/accounts/home.component.html
@@ -2,15 +2,17 @@
   <div class="content">
     <div class="logo-image"></div>
     <p class="lead text-center">{{ "loginOrCreateNewAccount" | i18n }}</p>
-    <a class="btn primary block" routerLink="/login"
-      ><b>{{ "login" | i18n }}</b></a
-    >
+    <button type="button" class="btn primary block" routerLink="/login">
+      <b>{{ "login" | i18n }}</b>
+    </button>
     <button type="button" (click)="launchSsoBrowser()" class="btn block">
       <i class="bwi bwi-bank" aria-hidden="true"></i> {{ "enterpriseSingleSignOn" | i18n }}
     </button>
-    <a class="btn block" routerLink="/register">{{ "createAccount" | i18n }}</a>
+    <button type="button" class="btn block" routerLink="/register">
+      {{ "createAccount" | i18n }}
+    </button>
   </div>
 </div>
-<a routerLink="/environment" class="settings-icon">
+<button type="button" routerLink="/environment" class="settings-icon">
   <i class="bwi bwi-cog-f bwi-lg" aria-hidden="true"></i><span>&nbsp;{{ "settings" | i18n }}</span>
-</a>
+</button>
diff --git a/apps/browser/src/popup/accounts/lock.component.html b/apps/browser/src/popup/accounts/lock.component.html
index 04e6eb1e102..ed47940875d 100644
--- a/apps/browser/src/popup/accounts/lock.component.html
+++ b/apps/browser/src/popup/accounts/lock.component.html
@@ -5,7 +5,7 @@
       <span class="title">{{ "verifyIdentity" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick *ngIf="!hideInput">{{ "unlock" | i18n }}</button>
+      <button type="submit" *ngIf="!hideInput">{{ "unlock" | i18n }}</button>
     </div>
   </header>
   <main tabindex="-1">
@@ -41,7 +41,6 @@
               type="button"
               class="row-btn"
               appStopClick
-              appBlurClick
               appA11yTitle="{{ 'toggleVisibility' | i18n }}"
               (click)="togglePassword()"
               [attr.aria-pressed]="showPassword"
diff --git a/apps/browser/src/popup/accounts/login.component.html b/apps/browser/src/popup/accounts/login.component.html
index d82d214fb2e..281df835093 100644
--- a/apps/browser/src/popup/accounts/login.component.html
+++ b/apps/browser/src/popup/accounts/login.component.html
@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <a routerLink="/home">{{ "cancel" | i18n }}</a>
+      <button type="button" routerLink="/home">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "appName" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "login" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -46,7 +46,6 @@
               type="button"
               class="row-btn"
               appStopClick
-              appBlurClick
               appA11yTitle="{{ 'toggleVisibility' | i18n }}"
               (click)="togglePassword()"
               [attr.aria-pressed]="showPassword"
@@ -65,7 +64,7 @@
       </div>
     </div>
     <p class="text-center">
-      <a routerLink="/hint">{{ "getMasterPasswordHint" | i18n }}</a>
+      <button type="button" routerLink="/hint">{{ "getMasterPasswordHint" | i18n }}</button>
     </p>
     <app-private-mode-warning></app-private-mode-warning>
   </main>
diff --git a/apps/browser/src/popup/accounts/register.component.html b/apps/browser/src/popup/accounts/register.component.html
index 4c8ec89aac9..82d508e5c79 100644
--- a/apps/browser/src/popup/accounts/register.component.html
+++ b/apps/browser/src/popup/accounts/register.component.html
@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" [formGroup]="formGroup">
   <header>
     <div class="left">
-      <a routerLink="/home">{{ "cancel" | i18n }}</a>
+      <button type="button" routerLink="/home">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "createAccount" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -46,7 +46,6 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appBlurClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                 (click)="togglePassword()"
                 [attr.aria-pressed]="showPassword"
@@ -94,7 +93,6 @@
               type="button"
               class="row-btn"
               appStopClick
-              appBlurClick
               appA11yTitle="{{ 'toggleVisibility' | i18n }}"
               (click)="togglePassword()"
               [attr.aria-pressed]="showPassword"
diff --git a/apps/browser/src/popup/accounts/set-password.component.html b/apps/browser/src/popup/accounts/set-password.component.html
index b8e89b7693d..969d81c2c30 100644
--- a/apps/browser/src/popup/accounts/set-password.component.html
+++ b/apps/browser/src/popup/accounts/set-password.component.html
@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <a routerLink="/home">{{ "cancel" | i18n }}</a>
+      <button type="button" routerLink="/home">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "setMasterPassword" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -64,7 +64,6 @@
                   type="button"
                   class="row-btn"
                   appStopClick
-                  appBlurClick
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                   (click)="togglePassword(false)"
                   [attr.aria-pressed]="showPassword"
@@ -116,7 +115,6 @@
                   type="button"
                   class="row-btn"
                   appStopClick
-                  appBlurClick
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                   (click)="togglePassword(true)"
                   [attr.aria-pressed]="showPassword"
diff --git a/apps/browser/src/popup/accounts/two-factor-options.component.html b/apps/browser/src/popup/accounts/two-factor-options.component.html
index e70d6a373cd..3fc510bb27c 100644
--- a/apps/browser/src/popup/accounts/two-factor-options.component.html
+++ b/apps/browser/src/popup/accounts/two-factor-options.component.html
@@ -1,6 +1,6 @@
 <header>
   <div class="left">
-    <a routerLink="/2fa">{{ "close" | i18n }}</a>
+    <button type="button" routerLink="/2fa">{{ "close" | i18n }}</button>
   </div>
   <h1 class="center">
     <span class="title">{{ "twoStepOptions" | i18n }}</span>
diff --git a/apps/browser/src/popup/accounts/two-factor.component.html b/apps/browser/src/popup/accounts/two-factor.component.html
index 84ad0cc8bb6..b2d017a9f97 100644
--- a/apps/browser/src/popup/accounts/two-factor.component.html
+++ b/apps/browser/src/popup/accounts/two-factor.component.html
@@ -1,7 +1,7 @@
 <form id="two-factor-page" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <a routerLink="/login">{{ "back" | i18n }}</a>
+      <button type="button" routerLink="/login">{{ "back" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ title }}</span>
@@ -9,7 +9,6 @@
     <div class="right">
       <button
         type="submit"
-        appBlurClick
         [disabled]="form.loading"
         *ngIf="
           selectedProviderType != null &&
diff --git a/apps/browser/src/popup/accounts/update-temp-password.component.html b/apps/browser/src/popup/accounts/update-temp-password.component.html
index f1836132f71..319cfba15af 100644
--- a/apps/browser/src/popup/accounts/update-temp-password.component.html
+++ b/apps/browser/src/popup/accounts/update-temp-password.component.html
@@ -7,7 +7,7 @@
       <span class="title">{{ "updateMasterPassword" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -53,7 +53,6 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appBlurClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                 (click)="togglePassword(false)"
                 [attr.aria-pressed]="showPassword"
@@ -100,7 +99,6 @@
               type="button"
               class="row-btn"
               appStopClick
-              appBlurClick
               appA11yTitle="{{ 'toggleVisibility' | i18n }}"
               (click)="togglePassword(true)"
               [attr.aria-pressed]="showPassword"
diff --git a/apps/browser/src/popup/components/password-reprompt.component.html b/apps/browser/src/popup/components/password-reprompt.component.html
index e57ad7d178d..ed698097356 100644
--- a/apps/browser/src/popup/components/password-reprompt.component.html
+++ b/apps/browser/src/popup/components/password-reprompt.component.html
@@ -23,7 +23,6 @@
                   type="button"
                   class="row-btn"
                   appStopClick
-                  appBlurClick
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                   (click)="togglePassword()"
                   [attr.aria-pressed]="showPassword"
@@ -43,7 +42,7 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-submit" appBlurClick>
+        <button type="submit" class="btn btn-primary btn-submit">
           <span>{{ "ok" | i18n }}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
diff --git a/apps/browser/src/popup/components/set-pin.component.html b/apps/browser/src/popup/components/set-pin.component.html
index 095b80fb8c1..66c7377aad1 100644
--- a/apps/browser/src/popup/components/set-pin.component.html
+++ b/apps/browser/src/popup/components/set-pin.component.html
@@ -25,7 +25,6 @@
                   type="button"
                   class="row-btn"
                   appStopClick
-                  appBlurClick
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                   (click)="toggleVisibility()"
                   [attr.aria-pressed]="showPin"
@@ -53,7 +52,7 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-submit" appBlurClick>
+        <button type="submit" class="btn btn-primary btn-submit">
           <span>{{ "ok" | i18n }}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
diff --git a/apps/browser/src/popup/generator/generator.component.html b/apps/browser/src/popup/generator/generator.component.html
index e3a4c51e58c..121f9a88378 100644
--- a/apps/browser/src/popup/generator/generator.component.html
+++ b/apps/browser/src/popup/generator/generator.component.html
@@ -1,7 +1,7 @@
 <header>
   <div class="left">
     <app-pop-out [show]="!comingFromAddEdit"></app-pop-out>
-    <button type="button" appBlurClick (click)="close()" *ngIf="comingFromAddEdit">
+    <button type="button" (click)="close()" *ngIf="comingFromAddEdit">
       {{ "cancel" | i18n }}
     </button>
   </div>
@@ -9,7 +9,7 @@
     <span class="title">{{ "generator" | i18n }}</span>
   </h1>
   <div class="right">
-    <button type="button" appBlurClick (click)="select()" *ngIf="comingFromAddEdit">
+    <button type="button" (click)="select()" *ngIf="comingFromAddEdit">
       {{ "select" | i18n }}
     </button>
   </div>
@@ -33,7 +33,6 @@
       <button
         type="button"
         appStopClick
-        appBlurClick
         appA11yTitle="{{ 'regeneratePassword' | i18n }}"
         (click)="regenerate()"
       >
@@ -56,7 +55,6 @@
       <button
         type="button"
         appStopClick
-        appBlurClick
         appA11yTitle="{{ 'regenerateUsername' | i18n }}"
         (click)="regenerate()"
         [disabled]="form.loading"
diff --git a/apps/browser/src/popup/generator/password-generator-history.component.html b/apps/browser/src/popup/generator/password-generator-history.component.html
index 62e5abd28e0..23a416cb81d 100644
--- a/apps/browser/src/popup/generator/password-generator-history.component.html
+++ b/apps/browser/src/popup/generator/password-generator-history.component.html
@@ -1,6 +1,6 @@
 <header>
   <div class="left">
-    <button type="button" appBlurClick type="button" (click)="close()">
+    <button type="button" type="button" (click)="close()">
       <span class="header-icon" aria-hidden="true"><i class="bwi bwi-angle-left"></i></span>
       <span>{{ "back" | i18n }}</span>
     </button>
@@ -9,7 +9,7 @@
     <span class="title">{{ "passwordHistory" | i18n }}</span>
   </h1>
   <div class="right">
-    <button type="button" appBlurClick type="button" (click)="clear()">
+    <button type="button" type="button" (click)="clear()">
       {{ "clear" | i18n }}
     </button>
   </div>
diff --git a/apps/browser/src/popup/send/send-add-edit.component.html b/apps/browser/src/popup/send/send-add-edit.component.html
index 3fea4094d6e..fb1ba6b801c 100644
--- a/apps/browser/src/popup/send/send-add-edit.component.html
+++ b/apps/browser/src/popup/send/send-add-edit.component.html
@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <button type="button" appBlurClick (click)="cancel()">{{ "cancel" | i18n }}</button>
+      <button type="button" (click)="cancel()">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ title }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading || disableSend">
+      <button type="submit" [disabled]="form.loading || disableSend">
         <span [hidden]="form.loading">{{ "save" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -226,7 +226,6 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appBlurClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                 (click)="togglePasswordVisible()"
                 [attr.aria-pressed]="showPassword"
@@ -300,7 +299,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="delete()"
           [appApiAction]="deletePromise"
           #deleteBtn
diff --git a/apps/browser/src/popup/send/send-groupings.component.html b/apps/browser/src/popup/send/send-groupings.component.html
index 72c79e7cb77..92c02ee3b34 100644
--- a/apps/browser/src/popup/send/send-groupings.component.html
+++ b/apps/browser/src/popup/send/send-groupings.component.html
@@ -18,7 +18,6 @@
   <div class="right">
     <button
       type="button"
-      appBlurClick
       (click)="addSend()"
       appA11yTitle="{{ 'addSend' | i18n }}"
       [disabled]="disableSend"
@@ -56,7 +55,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectType(sendType.Text)"
         >
           <div class="row-main">
@@ -70,7 +68,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectType(sendType.File)"
         >
           <div class="row-main">
diff --git a/apps/browser/src/popup/send/send-type.component.html b/apps/browser/src/popup/send/send-type.component.html
index 1e14dc151bf..0ad6bed2881 100644
--- a/apps/browser/src/popup/send/send-type.component.html
+++ b/apps/browser/src/popup/send/send-type.component.html
@@ -1,6 +1,6 @@
 <header>
   <div class="left">
-    <button type="button" appBlurClick (click)="back()">
+    <button type="button" (click)="back()">
       <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
       <span>{{ "back" | i18n }}</span>
     </button>
@@ -21,7 +21,6 @@
   <div class="right">
     <button
       type="button"
-      appBlurClick
       (click)="addSend()"
       appA11yTitle="{{ 'addSend' | i18n }}"
       [disabled]="disableSend"
diff --git a/apps/browser/src/popup/settings/excluded-domains.component.html b/apps/browser/src/popup/settings/excluded-domains.component.html
index 2d44de3d92d..96ec3ec2fc5 100644
--- a/apps/browser/src/popup/settings/excluded-domains.component.html
+++ b/apps/browser/src/popup/settings/excluded-domains.component.html
@@ -1,16 +1,16 @@
 <form #form (ngSubmit)="submit()">
   <header>
     <div class="left">
-      <a routerLink="/tabs/settings">
+      <button type="button" routerLink="/tabs/settings">
         <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
         <span>{{ "back" | i18n }}</span>
-      </a>
+      </button>
     </div>
     <h1 class="center">
       <span class="title">{{ "excludedDomains" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick>{{ "save" | i18n }}</button>
+      <button type="submit">{{ "save" | i18n }}</button>
     </div>
   </header>
   <main tabindex="-1">
@@ -73,7 +73,6 @@
         <button
           type="button"
           appStopClick
-          appBlurClick
           (click)="addUri()"
           class="box-content-row box-content-row-newmulti"
         >
diff --git a/apps/browser/src/popup/settings/export.component.html b/apps/browser/src/popup/settings/export.component.html
index ee74c4f7d92..ebd0e03d6f6 100644
--- a/apps/browser/src/popup/settings/export.component.html
+++ b/apps/browser/src/popup/settings/export.component.html
@@ -1,16 +1,16 @@
 <form (ngSubmit)="submit()" [formGroup]="exportForm">
   <header>
     <div class="left">
-      <a routerLink="/tabs/settings">
+      <button type="button" routerLink="/tabs/settings">
         <span class="header-icon" aria-hidden="true"><i class="bwi bwi-angle-left"></i></span>
         <span>{{ "back" | i18n }}</span>
-      </a>
+      </button>
     </div>
     <h1 class="center">
       <span class="title">{{ "exportVault" | i18n }}</span>
     </h1>
     <div class="right">
-      <button appBlurClick type="submit" [disabled]="!exportForm.enabled">
+      <button type="submit" [disabled]="!exportForm.enabled">
         {{ "submit" | i18n }}
       </button>
     </div>
diff --git a/apps/browser/src/popup/settings/folder-add-edit.component.html b/apps/browser/src/popup/settings/folder-add-edit.component.html
index 3999f6fb88d..b8aa391f0fa 100644
--- a/apps/browser/src/popup/settings/folder-add-edit.component.html
+++ b/apps/browser/src/popup/settings/folder-add-edit.component.html
@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <a routerLink="/folders">{{ "cancel" | i18n }}</a>
+      <button type="button" routerLink="/folders">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ title }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "save" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -34,7 +34,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="delete()"
           [appApiAction]="deletePromise"
           #deleteBtn
diff --git a/apps/browser/src/popup/settings/folders.component.html b/apps/browser/src/popup/settings/folders.component.html
index 23e2e227898..5052501d572 100644
--- a/apps/browser/src/popup/settings/folders.component.html
+++ b/apps/browser/src/popup/settings/folders.component.html
@@ -1,20 +1,15 @@
 <header>
   <div class="left">
-    <a routerLink="/tabs/settings">
+    <button type="button" routerLink="/tabs/settings">
       <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
       <span>{{ "back" | i18n }}</span>
-    </a>
+    </button>
   </div>
   <h1 class="center">
     <span class="title">{{ "folders" | i18n }}</span>
   </h1>
   <div class="right">
-    <button
-      type="button"
-      appBlurClick
-      (click)="addFolder()"
-      appA11yTitle="{{ 'addFolder' | i18n }}"
-    >
+    <button type="button" (click)="addFolder()" appA11yTitle="{{ 'addFolder' | i18n }}">
       <i class="bwi bwi-plus bwi-lg bwi-fw" aria-hidden="true"></i>
     </button>
   </div>
diff --git a/apps/browser/src/popup/settings/options.component.html b/apps/browser/src/popup/settings/options.component.html
index 877710438c6..8f9874faa71 100644
--- a/apps/browser/src/popup/settings/options.component.html
+++ b/apps/browser/src/popup/settings/options.component.html
@@ -1,9 +1,9 @@
 <header>
   <div class="left">
-    <a routerLink="/tabs/settings">
+    <button type="button" routerLink="/tabs/settings">
       <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
       <span>{{ "back" | i18n }}</span>
-    </a>
+    </button>
   </div>
   <h1 class="center">
     <span class="title">{{ "options" | i18n }}</span>
diff --git a/apps/browser/src/popup/settings/premium.component.html b/apps/browser/src/popup/settings/premium.component.html
index a12fd370d28..fad784da6b4 100644
--- a/apps/browser/src/popup/settings/premium.component.html
+++ b/apps/browser/src/popup/settings/premium.component.html
@@ -1,9 +1,9 @@
 <header>
   <div class="left">
-    <a routerLink="/tabs/settings">
+    <button type="button" routerLink="/tabs/settings">
       <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
       <span>{{ "back" | i18n }}</span>
-    </a>
+    </button>
   </div>
   <h1 class="center">
     <span class="title">{{ "premiumMembership" | i18n }}</span>
@@ -42,13 +42,12 @@
         </li>
       </ul>
       <p class="text-center lead">{{ priceString }}</p>
-      <button type="button" class="btn primary block" appBlurClick (click)="purchase()">
+      <button type="button" class="btn primary block" (click)="purchase()">
         <b>{{ "premiumPurchase" | i18n }}</b>
       </button>
       <button
         #refreshBtn
         type="button"
-        appBlurClick
         (click)="refresh()"
         [disabled]="refreshBtn.loading"
         [appApiAction]="refreshPromise"
@@ -65,7 +64,7 @@
     <ng-container *ngIf="isPremium">
       <p class="text-center lead">{{ "premiumCurrentMember" | i18n }}</p>
       <p class="text-center">{{ "premiumCurrentMemberThanks" | i18n }}</p>
-      <button type="button" class="btn block primary" appBlurClick (click)="manage()">
+      <button type="button" class="btn block primary" (click)="manage()">
         <b>{{ "premiumManage" | i18n }}</b>
       </button>
     </ng-container>
diff --git a/apps/browser/src/popup/settings/settings.component.html b/apps/browser/src/popup/settings/settings.component.html
index c7f4bb5042d..af601fad2cb 100644
--- a/apps/browser/src/popup/settings/settings.component.html
+++ b/apps/browser/src/popup/settings/settings.component.html
@@ -11,18 +11,30 @@
   <div class="box list">
     <h2 class="box-header">{{ "manage" | i18n }}</h2>
     <div class="box-content single-line">
-      <a class="box-content-row box-content-row-flex text-default" routerLink="/folders">
+      <button
+        type="button"
+        class="box-content-row box-content-row-flex text-default"
+        routerLink="/folders"
+      >
         <div class="row-main">{{ "folders" | i18n }}</div>
         <i class="bwi bwi-angle-right bwi-lg row-sub-icon" aria-hidden="true"></i>
-      </a>
-      <a class="box-content-row box-content-row-flex text-default" routerLink="/sync">
+      </button>
+      <button
+        type="button"
+        class="box-content-row box-content-row-flex text-default"
+        routerLink="/sync"
+      >
         <div class="row-main">{{ "sync" | i18n }}</div>
         <i class="bwi bwi-angle-right bwi-lg row-sub-icon" aria-hidden="true"></i>
-      </a>
-      <a class="box-content-row box-content-row-flex text-default" routerLink="/excluded-domains">
+      </button>
+      <button
+        type="button"
+        class="box-content-row box-content-row-flex text-default"
+        routerLink="/excluded-domains"
+      >
         <div class="row-main">{{ "excludedDomains" | i18n }}</div>
         <i class="bwi bwi-angle-right bwi-lg row-sub-icon" aria-hidden="true"></i>
-      </a>
+      </button>
     </div>
   </div>
   <div class="box list">
@@ -77,7 +89,6 @@
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="lock()"
       >
         <div class="row-main">{{ "lockNow" | i18n }}</div>
@@ -87,7 +98,6 @@
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="twoStep()"
       >
         <div class="row-main">{{ "twoStepLogin" | i18n }}</div>
@@ -98,7 +108,7 @@
   <div class="box list">
     <h2 class="box-header">{{ "account" | i18n }}</h2>
     <div class="box-content single-line">
-      <a class="box-content-row" routerLink="/premium">
+      <button type="button" class="box-content-row" routerLink="/premium">
         <div class="row-main">
           <div class="icon text-primary">
             <i class="bwi bwi-fw bwi-lg bwi-star-f" aria-hidden="true"></i>
@@ -108,12 +118,11 @@
           >
         </div>
         <span><i class="bwi bwi-angle-right bwi-lg row-sub-icon" aria-hidden="true"></i></span>
-      </a>
+      </button>
       <button
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="changePassword()"
         *ngIf="showChangeMasterPass"
       >
@@ -124,7 +133,6 @@
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="fingerprint()"
       >
         <div class="row-main">{{ "fingerprintPhrase" | i18n }}</div>
@@ -134,7 +142,6 @@
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="logOut()"
       >
         <div class="row-main">{{ "logOut" | i18n }}</div>
@@ -149,7 +156,6 @@
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="import()"
       >
         <div class="row-main">{{ "importItems" | i18n }}</div>
@@ -159,7 +165,6 @@
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="export()"
       >
         <div class="row-main">{{ "exportVault" | i18n }}</div>
@@ -169,7 +174,6 @@
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="webVault()"
       >
         <div class="row-main">{{ "bitWebVault" | i18n }}</div>
@@ -180,15 +184,18 @@
   <div class="box list">
     <h2 class="box-header">{{ "other" | i18n }}</h2>
     <div class="box-content single-line">
-      <a class="box-content-row box-content-row-flex text-default" routerLink="/options">
+      <button
+        type="button"
+        class="box-content-row box-content-row-flex text-default"
+        routerLink="/options"
+      >
         <div class="row-main">{{ "options" | i18n }}</div>
         <i class="bwi bwi-angle-right bwi-lg row-sub-icon" aria-hidden="true"></i>
-      </a>
+      </button>
       <button
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="about()"
       >
         <div class="row-main">{{ "about" | i18n }}</div>
@@ -198,7 +205,6 @@
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="share()"
       >
         <div class="row-main">{{ "learnOrg" | i18n }}</div>
@@ -208,7 +214,6 @@
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="help()"
       >
         <div class="row-main">{{ "helpFeedback" | i18n }}</div>
@@ -218,7 +223,6 @@
         type="button"
         class="box-content-row box-content-row-flex text-default"
         appStopClick
-        appBlurClick
         (click)="rate()"
       >
         <div class="row-main">{{ "rateExtension" | i18n }}</div>
diff --git a/apps/browser/src/popup/settings/sync.component.html b/apps/browser/src/popup/settings/sync.component.html
index 74f1c0ea872..c28302291f7 100644
--- a/apps/browser/src/popup/settings/sync.component.html
+++ b/apps/browser/src/popup/settings/sync.component.html
@@ -1,9 +1,9 @@
 <header>
   <div class="left">
-    <a routerLink="/tabs/settings">
+    <button type="button" routerLink="/tabs/settings">
       <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
       <span>{{ "back" | i18n }}</span>
-    </a>
+    </button>
   </div>
   <h1 class="center">
     <span class="title">{{ "sync" | i18n }}</span>
diff --git a/apps/browser/src/popup/tabs.component.html b/apps/browser/src/popup/tabs.component.html
index f64837cc732..fd04967b914 100644
--- a/apps/browser/src/popup/tabs.component.html
+++ b/apps/browser/src/popup/tabs.component.html
@@ -4,6 +4,7 @@
     <ul>
       <li routerLinkActive="active" #rlaCurrentTab="routerLinkActive" *ngIf="showCurrentTab">
         <button
+          type="button"
           routerLink="current"
           appA11yTitle="{{ 'currentTab' | i18n }}"
           [attr.aria-pressed]="rlaCurrentTab.isActive"
@@ -13,6 +14,7 @@
       </li>
       <li routerLinkActive="active" #rlaMyVault="routerLinkActive">
         <button
+          type="button"
           routerLink="vault"
           appA11yTitle="{{ 'myVault' | i18n }}"
           [attr.aria-pressed]="rlaMyVault.isActive"
@@ -22,6 +24,7 @@
       </li>
       <li routerLinkActive="active" #rlaSend="routerLinkActive">
         <button
+          type="button"
           routerLink="send"
           appA11yTitle="{{ 'send' | i18n }}"
           [attr.aria-pressed]="rlaSend.isActive"
@@ -31,6 +34,7 @@
       </li>
       <li routerLinkActive="active" #rlaGenerator="routerLinkActive">
         <button
+          type="button"
           routerLink="generator"
           appA11yTitle="{{ 'passGen' | i18n }}"
           [attr.aria-pressed]="rlaGenerator.isActive"
@@ -40,6 +44,7 @@
       </li>
       <li routerLinkActive="active" #rlaSettings="routerLinkActive">
         <button
+          type="button"
           routerLink="settings"
           appA11yTitle="{{ 'settings' | i18n }}"
           [attr.aria-pressed]="rlaSettings.isActive"
diff --git a/apps/browser/src/popup/vault/add-edit-custom-fields.component.html b/apps/browser/src/popup/vault/add-edit-custom-fields.component.html
index 92b8bfe4536..c6129233e1f 100644
--- a/apps/browser/src/popup/vault/add-edit-custom-fields.component.html
+++ b/apps/browser/src/popup/vault/add-edit-custom-fields.component.html
@@ -83,7 +83,6 @@
             type="button"
             class="row-btn"
             appStopClick
-            appBlurClick
             appA11yTitle="{{ 'toggleVisibility' | i18n }}"
             (click)="toggleFieldValue(f)"
             [attr.aria-pressed]="f.showValue"
diff --git a/apps/browser/src/popup/vault/add-edit.component.html b/apps/browser/src/popup/vault/add-edit.component.html
index 2686eb32fb8..c4f2dffabf0 100644
--- a/apps/browser/src/popup/vault/add-edit.component.html
+++ b/apps/browser/src/popup/vault/add-edit.component.html
@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <button type="button" appBlurClick (click)="cancel()">{{ "cancel" | i18n }}</button>
+      <button type="button" (click)="cancel()">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ title }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "save" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -51,7 +51,6 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appBlurClick
                 appA11yTitle="{{ 'generateUsername' | i18n }}"
                 (click)="generateUsername()"
               >
@@ -77,7 +76,6 @@
                 type="button"
                 #checkPasswordBtn
                 class="row-btn btn"
-                appBlurClick
                 appA11yTitle="{{ 'checkPassword' | i18n }}"
                 (click)="checkPassword()"
                 [appApiAction]="checkPasswordPromise"
@@ -99,7 +97,6 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appBlurClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                 (click)="togglePassword()"
                 *ngIf="cipher.viewPassword"
@@ -115,7 +112,6 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appBlurClick
                 appA11yTitle="{{ 'generatePassword' | i18n }}"
                 (click)="generatePassword()"
                 *ngIf="cipher.viewPassword"
@@ -165,7 +161,6 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appBlurClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                 (click)="toggleCardNumber()"
                 [attr.aria-pressed]="showCardNumber"
@@ -219,7 +214,6 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appBlurClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                 (click)="toggleCardCode()"
                 [attr.aria-pressed]="showCardCode"
@@ -486,7 +480,6 @@
         <button
           type="button"
           appStopClick
-          appBlurClick
           (click)="addUri()"
           class="box-content-row box-content-row-newmulti"
         >
@@ -546,7 +539,6 @@
           type="button"
           class="box-content-row box-content-row-flex text-default"
           appStopClick
-          appBlurClick
           (click)="attachments()"
           *ngIf="editMode && showAttachments && !cloneMode"
         >
@@ -566,7 +558,6 @@
           type="button"
           class="box-content-row box-content-row-flex text-default"
           appStopClick
-          appBlurClick
           (click)="editCollections()"
           *ngIf="editMode && cipher.organizationId && !cloneMode"
         >
@@ -641,7 +632,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="delete()"
           [appApiAction]="deletePromise"
           #deleteBtn
diff --git a/apps/browser/src/popup/vault/attachments.component.html b/apps/browser/src/popup/vault/attachments.component.html
index 4b687dc10b5..8ae4e49a692 100644
--- a/apps/browser/src/popup/vault/attachments.component.html
+++ b/apps/browser/src/popup/vault/attachments.component.html
@@ -1,10 +1,10 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <button type="button" appBlurClick (click)="close()" *ngIf="openedAttachmentsInPopup">
+      <button type="button" (click)="close()" *ngIf="openedAttachmentsInPopup">
         {{ "close" | i18n }}
       </button>
-      <button type="button" appBlurClick (click)="back()" *ngIf="!openedAttachmentsInPopup">
+      <button type="button" (click)="back()" *ngIf="!openedAttachmentsInPopup">
         <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
         <span>{{ "back" | i18n }}</span>
       </button>
@@ -13,7 +13,7 @@
       <span class="title">{{ "attachments" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "save" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -33,7 +33,6 @@
               class="row-btn btn"
               type="button"
               appStopClick
-              appBlurClick
               appA11yTitle="{{ 'deleteAttachment' | i18n }}"
               (click)="delete(a)"
               #deleteBtn
diff --git a/apps/browser/src/popup/vault/ciphers.component.html b/apps/browser/src/popup/vault/ciphers.component.html
index d6b87568663..340e7db8dd4 100644
--- a/apps/browser/src/popup/vault/ciphers.component.html
+++ b/apps/browser/src/popup/vault/ciphers.component.html
@@ -1,6 +1,6 @@
 <header>
   <div class="left">
-    <button type="button" appBlurClick (click)="back()">
+    <button type="button" (click)="back()">
       <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
       <span>{{ "back" | i18n }}</span>
     </button>
@@ -19,7 +19,7 @@
     <i class="bwi bwi-search" aria-hidden="true"></i>
   </div>
   <div class="right">
-    <button type="button" appBlurClick (click)="addCipher()" appA11yTitle="{{ 'addItem' | i18n }}">
+    <button type="button" (click)="addCipher()" appA11yTitle="{{ 'addItem' | i18n }}">
       <i class="bwi bwi-plus bwi-lg bwi-fw" aria-hidden="true"></i>
     </button>
   </div>
@@ -40,7 +40,6 @@
           *ngFor="let f of nestedFolders"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectFolder(f.node)"
         >
           <div class="row-main">
@@ -63,7 +62,6 @@
           *ngFor="let c of nestedCollections"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectCollection(c.node)"
         >
           <div class="row-main">
diff --git a/apps/browser/src/popup/vault/collections.component.html b/apps/browser/src/popup/vault/collections.component.html
index 35d7b082610..d8bcf9a0292 100644
--- a/apps/browser/src/popup/vault/collections.component.html
+++ b/apps/browser/src/popup/vault/collections.component.html
@@ -1,7 +1,7 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <button type="button" appBlurClick (click)="back()">
+      <button type="button" (click)="back()">
         <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
         <span>{{ "back" | i18n }}</span>
       </button>
@@ -10,7 +10,7 @@
       <span class="title">{{ "collections" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "save" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
diff --git a/apps/browser/src/popup/vault/current-tab.component.html b/apps/browser/src/popup/vault/current-tab.component.html
index f4cfd9f4bc1..c1029abffb3 100644
--- a/apps/browser/src/popup/vault/current-tab.component.html
+++ b/apps/browser/src/popup/vault/current-tab.component.html
@@ -4,7 +4,6 @@
     <app-pop-out *ngIf="!inSidebar"></app-pop-out>
     <button
       type="button"
-      appBlurClick
       (click)="refresh()"
       appA11yTitle="{{ 'refresh' | i18n }}"
       *ngIf="inSidebar"
@@ -25,7 +24,7 @@
     <i class="bwi bwi-search" aria-hidden="true"></i>
   </div>
   <div class="right">
-    <button type="button" appBlurClick (click)="addCipher()" appA11yTitle="{{ 'addItem' | i18n }}">
+    <button type="button" (click)="addCipher()" appA11yTitle="{{ 'addItem' | i18n }}">
       <i class="bwi bwi-plus bwi-lg bwi-fw" aria-hidden="true"></i>
     </button>
   </div>
diff --git a/apps/browser/src/popup/vault/password-history.component.html b/apps/browser/src/popup/vault/password-history.component.html
index 009b7089baa..73a28bb2520 100644
--- a/apps/browser/src/popup/vault/password-history.component.html
+++ b/apps/browser/src/popup/vault/password-history.component.html
@@ -1,6 +1,6 @@
 <header>
   <div class="left">
-    <button type="button" appBlurClick (click)="close()">{{ "close" | i18n }}</button>
+    <button type="button" (click)="close()">{{ "close" | i18n }}</button>
   </div>
   <h1 class="center">
     <span class="title">{{ "passwordHistory" | i18n }}</span>
diff --git a/apps/browser/src/popup/vault/share.component.html b/apps/browser/src/popup/vault/share.component.html
index 7e6d6e38af3..ad1447f6f65 100644
--- a/apps/browser/src/popup/vault/share.component.html
+++ b/apps/browser/src/popup/vault/share.component.html
@@ -1,7 +1,7 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <button type="button" appBlurClick (click)="cancel()">{{ "cancel" | i18n }}</button>
+      <button type="button" (click)="cancel()">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "moveToOrganization" | i18n }}</span>
@@ -9,7 +9,6 @@
     <div class="right">
       <button
         type="submit"
-        appBlurClick
         [disabled]="form.loading || !canSave"
         *ngIf="organizations && organizations.length"
       >
diff --git a/apps/browser/src/popup/vault/vault-filter.component.html b/apps/browser/src/popup/vault/vault-filter.component.html
index 4c2ce65f42f..c92ae9e1abc 100644
--- a/apps/browser/src/popup/vault/vault-filter.component.html
+++ b/apps/browser/src/popup/vault/vault-filter.component.html
@@ -17,7 +17,7 @@
     <i class="bwi bwi-search"></i>
   </div>
   <div class="right">
-    <button type="button" appBlurClick (click)="addCipher()" appA11yTitle="{{ 'addItem' | i18n }}">
+    <button type="button" (click)="addCipher()" appA11yTitle="{{ 'addItem' | i18n }}">
       <i class="bwi bwi-plus bwi-lg bwi-fw" aria-hidden="true"></i>
     </button>
   </div>
@@ -61,7 +61,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectType(cipherType.Login)"
         >
           <div class="row-main">
@@ -75,7 +74,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectType(cipherType.Card)"
         >
           <div class="row-main">
@@ -89,7 +87,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectType(cipherType.Identity)"
         >
           <div class="row-main">
@@ -103,7 +100,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectType(cipherType.SecureNote)"
         >
           <div class="row-main">
@@ -126,7 +122,6 @@
           *ngFor="let f of nestedFolders"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectFolder(f.node)"
         >
           <div class="row-main">
@@ -151,7 +146,6 @@
           *ngFor="let nestedCollection of nestedCollections"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectCollection(nestedCollection.node)"
         >
           <div class="row-main">
@@ -187,13 +181,7 @@
         <span class="flex-right">{{ deletedCount }}</span>
       </h2>
       <div class="box-content single-line">
-        <button
-          type="button"
-          class="box-content-row"
-          appStopClick
-          appBlurClick
-          (click)="selectTrash()"
-        >
+        <button type="button" class="box-content-row" appStopClick (click)="selectTrash()">
           <div class="row-main">
             <div class="icon"><i class="bwi bwi-fw bwi-lg bwi-trash"></i></div>
             <span class="text">{{ "trash" | i18n }}</span>
diff --git a/apps/browser/src/popup/vault/view.component.html b/apps/browser/src/popup/vault/view.component.html
index fa69a3c34ae..feb17606669 100644
--- a/apps/browser/src/popup/vault/view.component.html
+++ b/apps/browser/src/popup/vault/view.component.html
@@ -1,12 +1,12 @@
 <header>
   <div class="left">
-    <button type="button" appBlurClick (click)="close()">{{ "close" | i18n }}</button>
+    <button type="button" (click)="close()">{{ "close" | i18n }}</button>
   </div>
   <h1 class="center">
     <span class="title">{{ "viewItem" | i18n }}</span>
   </h1>
   <div class="right" *ngIf="cipher">
-    <button type="button" appBlurClick (click)="edit()" *ngIf="!cipher.isDeleted">
+    <button type="button" (click)="edit()" *ngIf="!cipher.isDeleted">
       {{ "edit" | i18n }}
     </button>
   </div>
@@ -79,7 +79,6 @@
               type="button"
               #checkPasswordBtn
               class="row-btn btn"
-              appBlurClick
               appA11yTitle="{{ 'checkPassword' | i18n }}"
               (click)="checkPassword()"
               [appApiAction]="checkPasswordPromise"
@@ -397,7 +396,6 @@
         class="box-content-row box-content-row-flex text-default"
         *ngFor="let attachment of cipher.attachments"
         appStopClick
-        appBlurCLick
         (click)="downloadAttachment(attachment)"
       >
         <span class="row-main">{{ attachment.fileName }}</span>
@@ -421,7 +419,6 @@
         type="button"
         class="box-content-row"
         appStopClick
-        appBlurClick
         (click)="fillCipher()"
         *ngIf="cipher.type !== cipherType.SecureNote && !cipher.isDeleted && !inPopout"
       >
@@ -436,7 +433,6 @@
         type="button"
         class="box-content-row"
         appStopClick
-        appBlurClick
         (click)="fillCipherAndSave()"
         *ngIf="cipher.type === cipherType.Login && !cipher.isDeleted && !inPopout"
       >
@@ -451,7 +447,6 @@
         type="button"
         class="box-content-row"
         appStopClick
-        appBlurClick
         (click)="clone()"
         *ngIf="!cipher.organizationId && !cipher.isDeleted"
       >
@@ -466,7 +461,6 @@
         type="button"
         class="box-content-row"
         appStopClick
-        appBlurClick
         (click)="share()"
         *ngIf="!cipher.organizationId"
       >
@@ -481,7 +475,6 @@
         type="button"
         class="box-content-row"
         appStopClick
-        appBlurClick
         (click)="restore()"
         *ngIf="cipher.isDeleted"
       >
@@ -492,7 +485,7 @@
           <span>{{ "restoreItem" | i18n }}</span>
         </div>
       </button>
-      <button type="button" class="box-content-row" appStopClick appBlurClick (click)="delete()">
+      <button type="button" class="box-content-row" appStopClick (click)="delete()">
         <div class="row-main text-danger">
           <div class="icon text-danger" aria-hidden="true">
             <i class="bwi bwi-trash bwi-lg bwi-fw"></i>
@@ -514,14 +507,14 @@
       </div>
       <div *ngIf="cipher.hasPasswordHistory">
         <b class="font-weight-semibold">{{ "passwordHistory" | i18n }}:</b>
-        <a
+        <button
           routerLink="/cipher-password-history"
           [queryParams]="{ cipherId: cipher.id }"
           appStopClick
           title="{{ 'passwordHistory' | i18n }}"
         >
           {{ cipher.passwordHistory.length }}
-        </a>
+        </button>
       </div>
     </div>
   </div>
diff --git a/apps/desktop/src/app/accounts/set-password.component.html b/apps/desktop/src/app/accounts/set-password.component.html
index 0e51f5f2774..340a4701c04 100644
--- a/apps/desktop/src/app/accounts/set-password.component.html
+++ b/apps/desktop/src/app/accounts/set-password.component.html
@@ -147,7 +147,7 @@
             ></i>
             <span>{{ "submit" | i18n }}</span>
           </button>
-          <button class="btn block" (click)="logOut()">
+          <button type="button" class="btn block" (click)="logOut()">
             <span>{{ "logOut" | i18n }}</span>
           </button>
         </div>
diff --git a/apps/desktop/src/app/components/set-pin.component.html b/apps/desktop/src/app/components/set-pin.component.html
index 5bd50bbc352..4c23ad3dde2 100644
--- a/apps/desktop/src/app/components/set-pin.component.html
+++ b/apps/desktop/src/app/components/set-pin.component.html
@@ -53,7 +53,7 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-submit" appBlurClick>
+        <button type="submit" class="btn btn-primary btn-submit">
           <span>{{ "ok" | i18n }}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
diff --git a/apps/desktop/src/app/layout/account-switcher.component.html b/apps/desktop/src/app/layout/account-switcher.component.html
index 0d52b719c96..ecf4bba78c1 100644
--- a/apps/desktop/src/app/layout/account-switcher.component.html
+++ b/apps/desktop/src/app/layout/account-switcher.component.html
@@ -88,7 +88,7 @@
     <ng-container *ngIf="activeAccountEmail != null">
       <div class="border" *ngIf="numberOfAccounts > 0"></div>
       <ng-container *ngIf="numberOfAccounts < 4">
-        <button class="add" routerLink="/login" (click)="addAccount()">
+        <button type="button" class="add" routerLink="/login" (click)="addAccount()">
           <i class="bwi bwi-plus" aria-hidden="true"></i> {{ "addAccount" | i18n }}
         </button>
       </ng-container>
diff --git a/apps/desktop/src/app/send/send.component.html b/apps/desktop/src/app/send/send.component.html
index e4d5dc0d69b..eabdb8bccb4 100644
--- a/apps/desktop/src/app/send/send.component.html
+++ b/apps/desktop/src/app/send/send.component.html
@@ -130,7 +130,12 @@
         </ng-container>
       </div>
       <div class="footer">
-        <button (click)="addSend()" class="block primary" appA11yTitle="{{ 'addItem' | i18n }}">
+        <button
+          type="button"
+          (click)="addSend()"
+          class="block primary"
+          appA11yTitle="{{ 'addItem' | i18n }}"
+        >
           <i class="bwi bwi-plus bwi-lg" aria-hidden="true"></i>
         </button>
       </div>