diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html
index eba102a4..e503282c 100644
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -37,6 +37,7 @@
               appBlurClick
               role="button"
               appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+              [attr.aria-pressed]="showPassword"
               (click)="togglePassword()"
             >
               <i
diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html
index 5f44a6e5..d4495781 100644
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -55,6 +55,7 @@
                 appBlurClick
                 role="button"
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                [attr.aria-pressed]="showPassword"
                 (click)="togglePassword()"
               >
                 <i
diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html
index 8839af6b..c0c3ce14 100644
--- a/src/app/accounts/register.component.html
+++ b/src/app/accounts/register.component.html
@@ -47,6 +47,7 @@
                 appBlurClick
                 role="button"
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                [attr.aria-pressed]="showPassword"
                 (click)="togglePassword(false)"
               >
                 <i
@@ -97,6 +98,7 @@
               appBlurClick
               role="button"
               appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+              [attr.aria-pressed]="showPassword"
               (click)="togglePassword(true)"
             >
               <i
diff --git a/src/app/accounts/set-password.component.html b/src/app/accounts/set-password.component.html
index a4d949fd..d7afcda8 100644
--- a/src/app/accounts/set-password.component.html
+++ b/src/app/accounts/set-password.component.html
@@ -63,6 +63,7 @@
                     appBlurClick
                     role="button"
                     appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                    [attr.aria-pressed]="showPassword"
                     (click)="togglePassword(false)"
                   >
                     <i
@@ -115,6 +116,7 @@
                     appBlurClick
                     role="button"
                     appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                    [attr.aria-pressed]="showPassword"
                     (click)="togglePassword(true)"
                   >
                     <i
diff --git a/src/app/accounts/update-temp-password.component.html b/src/app/accounts/update-temp-password.component.html
index 2fe336f4..26ee4672 100644
--- a/src/app/accounts/update-temp-password.component.html
+++ b/src/app/accounts/update-temp-password.component.html
@@ -43,6 +43,7 @@
                 appBlurClick
                 role="button"
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                [attr.aria-pressed]="showPassword"
                 (click)="togglePassword(false)"
               >
                 <i
@@ -90,6 +91,7 @@
               appBlurClick
               role="button"
               appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+              [attr.aria-pressed]="showPassword"
               (click)="togglePassword(true)"
             >
               <i
diff --git a/src/app/components/password-reprompt.component.html b/src/app/components/password-reprompt.component.html
index 6350c36a..f2805761 100644
--- a/src/app/components/password-reprompt.component.html
+++ b/src/app/components/password-reprompt.component.html
@@ -26,6 +26,7 @@
                   appBlurClick
                   role="button"
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                  [attr.aria-pressed]="showPassword"
                   (click)="togglePassword()"
                 >
                   <i
diff --git a/src/app/components/set-pin.component.html b/src/app/components/set-pin.component.html
index 0b790d0c..538eb0a2 100644
--- a/src/app/components/set-pin.component.html
+++ b/src/app/components/set-pin.component.html
@@ -28,6 +28,7 @@
                   appStopClick
                   appBlurClick
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                  [attr.aria-pressed]="showPin"
                   (click)="toggleVisibility()"
                 >
                   <i
diff --git a/src/app/send/add-edit.component.html b/src/app/send/add-edit.component.html
index 2a52320f..7a43aacb 100644
--- a/src/app/send/add-edit.component.html
+++ b/src/app/send/add-edit.component.html
@@ -164,6 +164,7 @@
                   appBlurClick
                   role="button"
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                  [attr.aria-pressed]="showPassword"
                   (click)="togglePasswordVisible()"
                   [disabled]="disableSend"
                 >
diff --git a/src/app/vault/add-edit-custom-fields.component.html b/src/app/vault/add-edit-custom-fields.component.html
index 3f3493c3..9f5fc24a 100644
--- a/src/app/vault/add-edit-custom-fields.component.html
+++ b/src/app/vault/add-edit-custom-fields.component.html
@@ -85,6 +85,7 @@
             appBlurClick
             role="button"
             appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+            [attr.aria-pressed]="f.showValue"
             (click)="toggleFieldValue(f)"
           >
             <i
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 0c923a32..50e636f0 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -79,6 +79,7 @@
                   appBlurClick
                   role="button"
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                  [attr.aria-pressed]="showPassword"
                   (click)="togglePassword()"
                 >
                   <i
@@ -144,6 +145,7 @@
                   appBlurClick
                   role="button"
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                  [attr.aria-pressed]="showCardNumber"
                   (click)="toggleCardNumber()"
                 >
                   <i
@@ -198,6 +200,7 @@
                   appBlurClick
                   role="button"
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                  [attr.aria-pressed]="showCardCode"
                   (click)="toggleCardCode()"
                 >
                   <i
diff --git a/src/app/vault/view.component.html b/src/app/vault/view.component.html
index 3c1d8cb6..982a1159 100644
--- a/src/app/vault/view.component.html
+++ b/src/app/vault/view.component.html
@@ -79,6 +79,7 @@
                 href="#"
                 appStopClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                [attr.aria-pressed]="showPassword"
                 (click)="togglePassword()"
                 role="button"
               >
@@ -161,6 +162,7 @@
                 href="#"
                 appStopClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                [attr.aria-pressed]="showCardNumber"
                 (click)="toggleCardNumber()"
                 role="button"
               >
@@ -202,6 +204,7 @@
                 href="#"
                 appStopClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                [attr.aria-pressed]="showCardCode"
                 (click)="toggleCardCode()"
                 role="button"
               >