diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html
index 4008c9505a0..9d99980f75c 100644
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -16,7 +16,7 @@
                             class="monospaced" [(ngModel)]="masterPassword" required appAutofocus>
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick appBlurClick
+                        <a class="row-btn" href="#" appStopClick appBlurClick role="button"
                             appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
                             <i class="fa fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html
index 86bcc02af09..142c6cc46c7 100644
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -15,7 +15,7 @@
                             class="monospaced" [(ngModel)]="masterPassword" required>
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick appBlurClick
+                        <a class="row-btn" href="#" appStopClick appBlurClick role="button"
                             appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
                             <i class="fa fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html
index cccf073a95d..6ff8d465cb9 100644
--- a/src/app/accounts/register.component.html
+++ b/src/app/accounts/register.component.html
@@ -23,7 +23,7 @@
                                 [appAutofocus]="email !== ''" (input)="updatePasswordStrength()">
                         </div>
                         <div class="action-buttons">
-                            <a class="row-btn" href="#" appStopClick appBlurClick
+                            <a class="row-btn" href="#" appStopClick appBlurClick role="button"
                                 appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)">
                                 <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
@@ -50,7 +50,7 @@
                             name="MasterPasswordRetype" class="monospaced" [(ngModel)]="confirmMasterPassword" required>
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick appBlurClick
+                        <a class="row-btn" href="#" appStopClick appBlurClick role="button"
                             appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
                             <i class="fa fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html
index 7b0866e4007..90ffdcb78c8 100644
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -64,8 +64,8 @@
             <a routerLink="/login" class="btn block">{{'cancel' | i18n}}</a>
         </div>
         <div class="sub-options">
-            <a href="#" appStopClick (click)="anotherMethod()">{{'useAnotherTwoStepMethod' | i18n}}</a>
-            <a href="#" appStopClick (click)="sendEmail(true)" [appApiAction]="emailPromise"
+            <a href="#" appStopClick (click)="anotherMethod()" role="button">{{'useAnotherTwoStepMethod' | i18n}}</a>
+            <a href="#" appStopClick (click)="sendEmail(true)" [appApiAction]="emailPromise" role="button"
                 *ngIf="selectedProviderType === providerType.Email">
                 {{'sendVerificationCodeEmailAgain' | i18n}}
             </a>
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index be916685d23..1687cd1d90c 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -39,12 +39,12 @@
                                     <i class="fa fa-lg fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"
                                         aria-hidden="true"></i>
                                 </button>
-                                <a class="row-btn" href="#" appStopClick appBlurClick
+                                <a class="row-btn" href="#" appStopClick appBlurClick role="button"
                                     appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
                                     <i class="fa fa-lg" aria-hidden="true"
                                         [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                                 </a>
-                                <a class="row-btn" href="#" appStopClick appBlurClick
+                                <a class="row-btn" href="#" appStopClick appBlurClick role="button"
                                     appA11yTitle="{{'generatePassword' | i18n}}" (click)="generatePassword()">
                                     <i class="fa fa-lg fa-refresh" aria-hidden="true"></i>
                                 </a>
@@ -91,7 +91,7 @@
                                     name="Card.Code" [(ngModel)]="cipher.card.code">
                             </div>
                             <div class="action-buttons">
-                                <a class="row-btn" href="#" appStopClick appBlurClick
+                                <a class="row-btn" href="#" appStopClick appBlurClick role="button"
                                     appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleCardCode()">
                                     <i class="fa fa-lg" aria-hidden="true"
                                         [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
@@ -196,7 +196,7 @@
                         <div class="box-content-row box-content-row-multi" appBoxRow
                             *ngFor="let u of cipher.login.uris; let i = index; trackBy:trackByFunction">
                             <a href="#" appStopClick (click)="removeUri(u)" appA11yTitle="{{'remove' | i18n}}">
-                                <i class="fa fa-minus-circle fa-lg" aria-hidden="true"></i>
+                                <i class="fa fa-minus-circle fa-lg" aria-hidden="true" role="button"></i>
                             </a>
                             <div class="row-main">
                                 <label for="loginUri{{i}}">{{'uriPosition' | i18n : (i + 1)}}</label>
@@ -212,14 +212,14 @@
                                 </select>
                             </div>
                             <div class="action-buttons">
-                                <a class="row-btn" href="#" appStopClick appBlurClick
+                                <a class="row-btn" href="#" appStopClick appBlurClick role="button"
                                     appA11yTitle="{{'toggleOptions' | i18n}}" (click)="toggleUriOptions(u)">
                                     <i class="fa fa-lg fa-cog" aria-hidden="true"></i>
                                 </a>
                             </div>
                         </div>
                     </ng-container>
-                    <a href="#" appStopClick appBlurClick (click)="addUri()" class="box-content-row">
+                    <a href="#" appStopClick appBlurClick (click)="addUri()" class="box-content-row" role="button">
                         <i class="fa fa-plus-circle fa-fw fa-lg" aria-hidden="true"></i> {{'newUri' | i18n}}
                     </a>
                 </div>
@@ -237,12 +237,12 @@
                         <input id="favorite" type="checkbox" name="Favorite" [(ngModel)]="cipher.favorite">
                     </div>
                     <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
-                        (click)="attachments()" *ngIf="editMode">
+                        (click)="attachments()" *ngIf="editMode" role="button">
                         <div class="row-main">{{'attachments' | i18n}}</div>
                         <i class="fa fa-chevron-right row-sub-icon" aria-hidden="true"></i>
                     </a>
                     <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
-                        (click)="editCollections()" *ngIf="editMode && cipher.organizationId">
+                        (click)="editCollections()" *ngIf="editMode && cipher.organizationId" role="button">
                         <div class="row-main">{{'collections' | i18n}}</div>
                         <i class="fa fa-chevron-right row-sub-icon" aria-hidden="true"></i>
                     </a>
@@ -267,7 +267,8 @@
                         <div class="box-content-row box-content-row-multi box-draggable-row" cdkDrag
                             *ngFor="let f of cipher.fields; let i = index; trackBy:trackByFunction"
                             [ngClass]="{'box-content-row-checkbox': f.type === fieldType.Boolean}">
-                            <a href="#" appStopClick (click)="removeField(f)" appA11yTitle="{{'remove' | i18n}}">
+                            <a href="#" appStopClick (click)="removeField(f)" appA11yTitle="{{'remove' | i18n}}"
+                                role="button">
                                 <i class="fa fa-minus-circle fa-lg" aria-hidden="true"></i>
                             </a>
                             <label for="fieldName{{i}}" class="sr-only">{{'name' | i18n}}</label>
@@ -285,7 +286,7 @@
                                 *ngIf="f.type === fieldType.Boolean" appTrueFalseValue trueValue="true"
                                 falseValue="false">
                             <div class="action-buttons" *ngIf="f.type === fieldType.Hidden">
-                                <a class="row-btn" href="#" appStopClick appBlurClick
+                                <a class="row-btn" href="#" appStopClick appBlurClick role="button"
                                     appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleFieldValue(f)">
                                     <i class="fa fa-lg" aria-hidden="true"
                                         [ngClass]="{'fa-eye': !f.showValue, 'fa-eye-slash': f.showValue}"></i>
@@ -297,7 +298,7 @@
                         </div>
                     </div>
                     <div class="box-content-row" appBoxRow>
-                        <a href="#" appStopClick (click)="addField()">
+                        <a href="#" appStopClick (click)="addField()" role="button">
                             <i class="fa fa-plus-circle fa-fw fa-lg" aria-hidden="true"></i> {{'newCustomField' | i18n}}
                         </a>
                         <label for="addFieldType" class="sr-only">{{'type' | i18n}}</label>
diff --git a/src/app/vault/export.component.html b/src/app/vault/export.component.html
index 7f015b2e9aa..513acf791da 100644
--- a/src/app/vault/export.component.html
+++ b/src/app/vault/export.component.html
@@ -22,7 +22,7 @@
                                     appAutofocus>
                             </div>
                             <div class="action-buttons">
-                                <a class="row-btn" href="#" appStopClick appBlurClick
+                                <a class="row-btn" href="#" appStopClick appBlurClick role="button"
                                     appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
                                     <i class="fa fa-lg" aria-hidden="true"
                                         [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html
index db23bad831a..76db376c9d7 100644
--- a/src/app/vault/groupings.component.html
+++ b/src/app/vault/groupings.component.html
@@ -53,7 +53,7 @@
                                 [ngClass]="{'fa-caret-right': isCollapsed(f.node), 'fa-caret-down': !isCollapsed(f.node)}"
                                 (click)="collapse(f.node)" appStopProp></i>
                             {{f.node.name}}
-                            <span appStopProp appStopClick (click)="editFolder(f.node)"
+                            <span appStopProp appStopClick (click)="editFolder(f.node)" role="button"
                                 appA11yTitle="{{'editFolder' | i18n}}" *ngIf="f.node.id">
                                 <i class="fa fa-pencil fa-fw" aria-hidden="true"></i>
                             </span>
diff --git a/src/app/vault/password-generator-history.component.html b/src/app/vault/password-generator-history.component.html
index 74f43801eaf..f8797e18d5a 100644
--- a/src/app/vault/password-generator-history.component.html
+++ b/src/app/vault/password-generator-history.component.html
@@ -15,7 +15,7 @@
                             </div>
                             <div class="action-buttons">
                                 <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyPassword' | i18n}}"
-                                    (click)="copy(h.password)">
+                                    (click)="copy(h.password)" role="button">
                                     <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                                 </a>
                             </div>
diff --git a/src/app/vault/password-history.component.html b/src/app/vault/password-history.component.html
index 6589751eb8f..a856097bba3 100644
--- a/src/app/vault/password-history.component.html
+++ b/src/app/vault/password-history.component.html
@@ -16,7 +16,7 @@
                             </div>
                             <div class="action-buttons">
                                 <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyPassword' | i18n}}"
-                                    (click)="copy(h.password)">
+                                    (click)="copy(h.password)" role="button">
                                     <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                                 </a>
                             </div>
diff --git a/src/app/vault/view.component.html b/src/app/vault/view.component.html
index 76bc894563c..1e8e5d302b8 100644
--- a/src/app/vault/view.component.html
+++ b/src/app/vault/view.component.html
@@ -18,7 +18,7 @@
                         </div>
                         <div class="action-buttons">
                             <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyUsername' | i18n}}"
-                                (click)="copy(cipher.login.username, 'username', 'Username')">
+                                (click)="copy(cipher.login.username, 'username', 'Username')" role="button">
                                 <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                             </a>
                         </div>
@@ -41,12 +41,12 @@
                                     aria-hidden="true"></i>
                             </button>
                             <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
-                                (click)="togglePassword()">
+                                (click)="togglePassword()" role="button">
                                 <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </a>
                             <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyPassword' | i18n}}"
-                                (click)="copy(cipher.login.password, 'password', 'Password')">
+                                (click)="copy(cipher.login.password, 'password', 'Password')" role="button">
                                 <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                             </a>
                         </div>
@@ -69,7 +69,7 @@
                         </span>
                         <div class="action-buttons">
                             <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyValue' | i18n}}"
-                                (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')">
+                                (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')" role="button">
                                 <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                             </a>
                         </div>
@@ -88,7 +88,7 @@
                         </div>
                         <div class="action-buttons">
                             <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyNumber' | i18n}}"
-                                (click)="copy(cipher.card.number, 'number', 'Number')">
+                                (click)="copy(cipher.card.number, 'number', 'Number')" role="button">
                                 <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                             </a>
                         </div>
@@ -109,12 +109,12 @@
                         </div>
                         <div class="action-buttons">
                             <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
-                                (click)="toggleCardCode()">
+                                (click)="toggleCardCode()" role="button">
                                 <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
                             </a>
                             <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copySecurityCode' | i18n}}"
-                                (click)="copy(cipher.card.code, 'securityCode', 'Security Code')">
+                                (click)="copy(cipher.card.code, 'securityCode', 'Security Code')" role="button">
                                 <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                             </a>
                         </div>
@@ -180,11 +180,11 @@
                     </div>
                     <div class="action-buttons">
                         <a class="row-btn" href="#" appStopClick appA11yTitle="{{'launch' | i18n}}" *ngIf="u.canLaunch"
-                            (click)="launch(u)">
+                            (click)="launch(u)" role="button">
                             <i class="fa fa-lg fa-share-square-o" aria-hidden="true"></i>
                         </a>
                         <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyUri' | i18n}}"
-                            (click)="copy(u.uri, u.isWebsite ? 'website' : 'uri', 'URI')">
+                            (click)="copy(u.uri, u.isWebsite ? 'website' : 'uri', 'URI')" role="button">
                             <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                         </a>
                     </div>
@@ -222,13 +222,13 @@
                     </div>
                     <div class="action-buttons">
                         <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
-                            *ngIf="field.type === fieldType.Hidden" (click)="toggleFieldValue(field)">
+                            *ngIf="field.type === fieldType.Hidden" (click)="toggleFieldValue(field)" role="button">
                             <i class="fa fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-eye': !field.showValue, 'fa-eye-slash': field.showValue}"></i>
                         </a>
                         <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyValue' | i18n}}"
                             *ngIf="field.value && field.type !== fieldType.Boolean"
-                            (click)="copy(field.value, 'value', 'Field')">
+                            (click)="copy(field.value, 'value', 'Field')" role="button">
                             <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                         </a>
                     </div>
@@ -263,7 +263,7 @@
                 </div>
                 <div *ngIf="cipher.hasPasswordHistory">
                     <b class="font-weight-semibold">{{'passwordHistory' | i18n}}:</b>
-                    <a href="#" (click)="viewHistory()" appStopClick
+                    <a href="#" (click)="viewHistory()" appStopClick role="button"
                         appA11yTitle="{{'passwordHistory' | i18n}}, {{cipher.passwordHistory.length}}">
                         <span aria-hidden="true">{{cipher.passwordHistory.length}}</span>
                     </a>