diff --git a/libs/vault/src/cipher-form/components/identity/identity.component.html b/libs/vault/src/cipher-form/components/identity/identity.component.html
index f55397ce464..09abfb6b157 100644
--- a/libs/vault/src/cipher-form/components/identity/identity.component.html
+++ b/libs/vault/src/cipher-form/components/identity/identity.component.html
@@ -53,14 +53,26 @@
           {{ "ssn" | i18n }}
         </bit-label>
         <input formControlName="ssn" bitInput type="password" />
-        <button type="button" bitIconButton bitPasswordInputToggle></button>
+        <button
+          type="button"
+          bitIconButton
+          bitSuffix
+          bitPasswordInputToggle
+          data-testid="visibility-for-ssn"
+        ></button>
       </bit-form-field>
       <bit-form-field>
         <bit-label>
           {{ "passportNumber" | i18n }}
         </bit-label>
         <input formControlName="passportNumber" bitInput type="password" />
-        <button type="button" bitIconButton bitPasswordInputToggle></button>
+        <button
+          type="button"
+          bitIconButton
+          bitSuffix
+          bitPasswordInputToggle
+          data-testid="visibility-for-passport-number"
+        ></button>
       </bit-form-field>
       <bit-form-field>
         <bit-label>
diff --git a/libs/vault/src/cipher-form/components/identity/identity.component.ts b/libs/vault/src/cipher-form/components/identity/identity.component.ts
index c1f44503610..a5545815e30 100644
--- a/libs/vault/src/cipher-form/components/identity/identity.component.ts
+++ b/libs/vault/src/cipher-form/components/identity/identity.component.ts
@@ -15,6 +15,7 @@ import {
   FormFieldModule,
   IconButtonModule,
   SelectModule,
+  TypographyModule,
 } from "@bitwarden/components";
 
 import { CipherFormContainer } from "../../cipher-form-container";
@@ -34,6 +35,7 @@ import { CipherFormContainer } from "../../cipher-form-container";
     FormFieldModule,
     IconButtonModule,
     SelectModule,
+    TypographyModule,
   ],
 })
 export class IdentitySectionComponent implements OnInit {