diff --git a/themes/src/main/resources/theme/keycloak.v2/login/field.ftl b/themes/src/main/resources/theme/keycloak.v2/login/field.ftl
index d7e2e46e31e..1349ff5b0af 100644
--- a/themes/src/main/resources/theme/keycloak.v2/login/field.ftl
+++ b/themes/src/main/resources/theme/keycloak.v2/login/field.ftl
@@ -65,9 +65,9 @@
       <div class="${properties.kcInputGroupItemClass}">
         <button class="${properties.kcFormPasswordVisibilityButtonClass}" type="button" aria-label="${msg('showPassword')}"
                 aria-controls="${name}" data-password-toggle
-                data-icon-show="fa-eye fas" data-icon-hide="fa-eye-slash fas"
+                data-icon-show="${properties.kcFormPasswordVisibilityIconShow}" data-icon-hide="${properties.kcFormPasswordVisibilityIconHide}"
                 data-label-show="${msg('showPassword')}" data-label-hide="${msg('hidePassword')}" id="${name}-show-password">
-            <i class="fa-eye fas" aria-hidden="true"></i>
+            <i class="${properties.kcFormPasswordVisibilityIconShow}" aria-hidden="true"></i>
         </button>
       </div>
     </div>
diff --git a/themes/src/main/resources/theme/keycloak.v2/login/theme.properties b/themes/src/main/resources/theme/keycloak.v2/login/theme.properties
index 42d41fa4f07..b297547d076 100644
--- a/themes/src/main/resources/theme/keycloak.v2/login/theme.properties
+++ b/themes/src/main/resources/theme/keycloak.v2/login/theme.properties
@@ -39,6 +39,8 @@ kcAlertIconClass=pf-v5-c-alert__icon
 kcAlertTitleClass=pf-v5-c-alert__title
 kcAlertDescriptionClass=pf-v5-c-alert__description
 kcFormPasswordVisibilityButtonClass=pf-v5-c-button pf-m-control
+kcFormPasswordVisibilityIconShow=fa-eye fas
+kcFormPasswordVisibilityIconHide=fa-eye-slash fas
 kcFormControlToggleIcon=pf-v5-c-form-control__toggle-icon
 kcFormActionGroupClass=pf-v5-c-form__actions pf-v5-u-pt-xs
 kcFormReadOnlyClass=pf-m-readonly