diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_1.8.0_202.txt
index c7f77511..b5db86e9 100644
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_1.8.0_202.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_1.8.0_202.txt
@@ -794,7 +794,7 @@ PasswordField.border           [lazy] 3,7,3,7  false    com.apple.laf.AquaTextFi
 PasswordField.capsLockIconColor #64000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         ●
+PasswordField.echoChar         '\u25cf'
 PasswordField.focusInputMap    [lazy] 66    javax.swing.plaf.InputMapUIResource [UI]
     alt pressed BACK_SPACE          delete-previous-word
     alt pressed DELETE              delete-next-word
diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_10.0.2.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_10.0.2.txt
index 47486d60..a28215d1 100644
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_10.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_10.0.2.txt
@@ -789,7 +789,7 @@ PasswordField.border           [lazy] 3,7,3,7  false    com.apple.laf.AquaTextFi
 PasswordField.capsLockIconColor #64000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         ●
+PasswordField.echoChar         '\u25cf'
 PasswordField.focusInputMap    [lazy] 66    javax.swing.plaf.InputMapUIResource [UI]
     alt pressed BACK_SPACE          delete-previous-word
     alt pressed DELETE              delete-next-word
diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_11.0.2.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_11.0.2.txt
index d42b0820..29ce7131 100644
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_11.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_11.0.2.txt
@@ -790,7 +790,7 @@ PasswordField.border           [lazy] 3,7,3,7  false    com.apple.laf.AquaTextFi
 PasswordField.capsLockIconColor #64000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         ●
+PasswordField.echoChar         '\u25cf'
 PasswordField.focusInputMap    [lazy] 66    javax.swing.plaf.InputMapUIResource [UI]
     alt pressed BACK_SPACE          delete-previous-word
     alt pressed DELETE              delete-next-word
diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_12.0.2.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_12.0.2.txt
index ffee83fb..83c32812 100644
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_12.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_12.0.2.txt
@@ -790,7 +790,7 @@ PasswordField.border           [lazy] 3,7,3,7  false    com.apple.laf.AquaTextFi
 PasswordField.capsLockIconColor #64000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         ●
+PasswordField.echoChar         '\u25cf'
 PasswordField.focusInputMap    [lazy] 66    javax.swing.plaf.InputMapUIResource [UI]
     alt pressed BACK_SPACE          delete-previous-word
     alt pressed DELETE              delete-next-word
diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_13.0.2.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_13.0.2.txt
index 563b2b45..5f1e5daa 100644
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_13.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_13.0.2.txt
@@ -792,7 +792,7 @@ PasswordField.border           [lazy] 3,7,3,7  false    com.apple.laf.AquaTextFi
 PasswordField.capsLockIconColor #64000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         ●
+PasswordField.echoChar         '\u25cf'
 PasswordField.focusInputMap    [lazy] 67    javax.swing.plaf.InputMapUIResource [UI]
     alt pressed BACK_SPACE          delete-previous-word
     alt pressed DELETE              delete-next-word
diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_9.0.4.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_9.0.4.txt
index 45211da2..3c025c7b 100644
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_9.0.4.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/AquaLookAndFeel_9.0.4.txt
@@ -789,7 +789,7 @@ PasswordField.border           [lazy] 3,7,3,7  false    com.apple.laf.AquaTextFi
 PasswordField.capsLockIconColor #64000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         ●
+PasswordField.echoChar         '\u25cf'
 PasswordField.focusInputMap    [lazy] 66    javax.swing.plaf.InputMapUIResource [UI]
     alt pressed BACK_SPACE          delete-previous-word
     alt pressed DELETE              delete-next-word
diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt
index 50b376c2..fc225431 100644
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt
@@ -1034,7 +1034,7 @@ PasswordField.capsLockIconColor #64000000    javax.swing.plaf.ColorUIResource [U
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         ●
+PasswordField.echoChar         '\u25cf'
 PasswordField.focusInputMap    [lazy] 66    javax.swing.plaf.InputMapUIResource [UI]
     alt pressed BACK_SPACE          delete-previous-word
     alt pressed DELETE              delete-next-word
diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt
index f4f5e545..aa7d85b7 100644
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt
@@ -1036,7 +1036,7 @@ PasswordField.capsLockIconColor #64000000    javax.swing.plaf.ColorUIResource [U
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         ●
+PasswordField.echoChar         '\u25cf'
 PasswordField.focusInputMap    [lazy] 66    javax.swing.plaf.InputMapUIResource [UI]
     alt pressed BACK_SPACE          delete-previous-word
     alt pressed DELETE              delete-next-word