diff --git a/src/app/accounts/environment.component.html b/src/app/accounts/environment.component.html
index 319f691747..390efbb971 100644
--- a/src/app/accounts/environment.component.html
+++ b/src/app/accounts/environment.component.html
@@ -25,11 +25,7 @@
         </div>
         <div class="box">
           <div class="box-header">
-            <button
-              type="button"
-              (click)="toggleCustom()"
-              appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-            >
+            <button type="button" (click)="toggleCustom()" [attr.aria-expanded]="showCustom">
               <i class="bwi bwi-plus-square" [hidden]="showCustom" aria-hidden="true"></i>
               <i class="bwi bwi-minus-square" [hidden]="!showCustom" aria-hidden="true"></i>
               {{ "customEnvironment" | i18n }}
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index ace7321e52..8301cef53a 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -26,11 +26,7 @@
         </div>
         <div class="box">
           <div class="box-header">
-            <button
-              type="button"
-              (click)="toggleOptions()"
-              appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-            >
+            <button type="button" (click)="toggleOptions()" [attr.aria-expanded]="showOptions">
               <i class="bwi bwi-plus-square" aria-hidden="true" [hidden]="showOptions"></i>
               <i class="bwi bwi-minus-square" aria-hidden="true" [hidden]="!showOptions"></i>
               {{ "options" | i18n }}