diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/social/social_button.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/social/social_button.dart
index 39ab3b6e289..8c08bd33e73 100644
--- a/packages/authenticator/amplify_authenticator/lib/src/widgets/social/social_button.dart
+++ b/packages/authenticator/amplify_authenticator/lib/src/widgets/social/social_button.dart
@@ -3,15 +3,14 @@
 
 import 'dart:math';
 
-import 'package:amplify_auth_cognito/amplify_auth_cognito.dart';
 import 'package:amplify_authenticator/src/l10n/auth_strings_resolver.dart';
 import 'package:amplify_authenticator/src/state/authenticator_state.dart';
 import 'package:amplify_authenticator/src/utils/list.dart';
 import 'package:amplify_authenticator/src/widgets/button.dart';
 import 'package:amplify_authenticator/src/widgets/component.dart';
 import 'package:amplify_authenticator/src/widgets/social/social_icons.dart';
-import 'package:aws_common/aws_common.dart';
-import 'package:flutter/foundation.dart';
+import 'package:amplify_flutter/amplify_flutter.dart';
+import 'package:flutter/foundation.dart' hide Category;
 import 'package:flutter/material.dart';
 
 class SocialSignInButtons extends StatelessAuthenticatorComponent {
@@ -133,6 +132,9 @@ class SocialSignInButton extends AuthenticatorButton<SocialSignInButton> {
 class _SocialSignInButtonState
     extends AuthenticatorButtonState<SocialSignInButton> {
   static const _spacing = 5.0;
+  static final logger = AmplifyLogger.category(Category.auth)
+      .createChild('Authenticator')
+      .createChild('SocialSignInButton');
 
   Widget get icon {
     final isDark = Theme.of(context).brightness == Brightness.dark;
@@ -164,7 +166,7 @@ class _SocialSignInButtonState
         ],
       );
     }
-    safePrint('Unsupported provider: ${widget.provider}');
+    logger.error('Unsupported provider: ${widget.provider}');
     return const SizedBox.shrink();
   }
 
@@ -219,10 +221,15 @@ class _SocialSignInButtonState
                     ),
                   ),
                   const SizedBox(width: _spacing),
-                  Text(
-                    resolver.resolve(
-                      context,
-                      ButtonResolverKey.signInWith(widget.provider),
+                  Flexible(
+                    child: FittedBox(
+                      fit: BoxFit.fitWidth,
+                      child: Text(
+                        resolver.resolve(
+                          context,
+                          ButtonResolverKey.signInWith(widget.provider),
+                        ),
+                      ),
                     ),
                   ),
                 ],
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..c7932cad523
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_desktopGeometry.png
index d2dc32fdd45..3a6fdba1a74 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_laptopGeometry.png
index c61b37dd3d5..2c6e408b93c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_miniGeometry.png
index 721efc86812..efa6c81debb 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_mobileGeometry.png
index 65509dbd9ad..85569616004 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_tabletGeometry.png
index 9dd197eec4b..e68e7ea365b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..beb43a4776d
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_desktopGeometry.png
index 5f30d4988fe..d4956249761 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_laptopGeometry.png
index 06ac63958d7..26e526d0f16 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_miniGeometry.png
index 215c19879a6..b7155f76373 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_mobileGeometry.png
index 1fa34066107..5a64555b963 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_tabletGeometry.png
index 1d21473aa02..fbcfa48544f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..fb69f13d289
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_desktopGeometry.png
index 48c0a46bde7..39e622bb115 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_laptopGeometry.png
index 6239b29fdd0..ca90aea3e14 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_miniGeometry.png
index a7f3c3d908b..7de696e7ae7 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_mobileGeometry.png
index ad63f865f9b..cf9bbdf4e5a 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_tabletGeometry.png
index 444c594f5c5..e35c198a7e8 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..50a0e589d05
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_desktopGeometry.png
index 285942d8088..9fec8a71aa5 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_laptopGeometry.png
index ab84586c1ac..1c2d7775b73 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_miniGeometry.png
index bf41b65d82c..c593957fad4 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_mobileGeometry.png
index e7f684a536a..7ce52a37219 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_tabletGeometry.png
index df5544607c0..bbffcdd65a1 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..c9f5e79a9a3
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_desktopGeometry.png
index 246568b1bd1..52f78df49fd 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_laptopGeometry.png
index a6b537f3376..90e5d42a07d 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_miniGeometry.png
index 76f94c9f1da..ee6fbb0fcee 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_mobileGeometry.png
index d9860c707c3..703f780caef 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_tabletGeometry.png
index 877f38e00ed..e003f1d241c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..9c4788fd70e
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_desktopGeometry.png
index c4a6ab8835a..12752fd312c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_laptopGeometry.png
index fba73057d18..3a701536ce2 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_miniGeometry.png
index 7905931be78..29ed0e56eca 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_mobileGeometry.png
index 92e21171c19..78899818563 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_tabletGeometry.png
index d93179dd1b0..a8c7d1598a8 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..6d75313c162
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_desktopGeometry.png
index 440c8f6e51b..d4714159665 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_laptopGeometry.png
index c8db748f7e6..8c8f010bfd8 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_miniGeometry.png
index f9d22b126c7..dca17bcfdc3 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_mobileGeometry.png
index be5b35f826a..ca6a2320b74 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_tabletGeometry.png
index c10236c492a..1ac4be82f70 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..498acf340f8
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_desktopGeometry.png
index 822c06f08fa..8094ff754fa 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_laptopGeometry.png
index 0cb9a158fca..d8d1225a76e 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_miniGeometry.png
index 6fae3dd279b..62b0473833c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_mobileGeometry.png
index fe1a8d26271..e4bd260333b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_tabletGeometry.png
index f07c2f0b69c..8f2bd9f2380 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..0fe7537c38b
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_desktopGeometry.png
index 67156dc52ce..da0a56fecb0 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_laptopGeometry.png
index 3fcd980d36e..1cabb1d84cd 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_miniGeometry.png
index 4f664dd2187..5abdad97240 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_mobileGeometry.png
index c071f6c4976..9c92029c228 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_tabletGeometry.png
index 4c29efa98c4..0bee4e96b79 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..c7932cad523
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_desktopGeometry.png
index d2dc32fdd45..3a6fdba1a74 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_laptopGeometry.png
index c61b37dd3d5..2c6e408b93c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_miniGeometry.png
index 721efc86812..efa6c81debb 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_mobileGeometry.png
index 65509dbd9ad..85569616004 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_tabletGeometry.png
index 9dd197eec4b..e68e7ea365b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..ab1a762d598
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_desktopGeometry.png
index da82437b142..d7ad8bb6e59 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_laptopGeometry.png
index 07207588edf..638807fa97c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_miniGeometry.png
index f94bb2083b2..fee549971e1 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_mobileGeometry.png
index 28011030a9e..21ab4c42f14 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_tabletGeometry.png
index ab6b8dead61..45a729969c4 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..fb69f13d289
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_desktopGeometry.png
index 48c0a46bde7..39e622bb115 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_laptopGeometry.png
index 6239b29fdd0..ca90aea3e14 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_miniGeometry.png
index a7f3c3d908b..7de696e7ae7 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_mobileGeometry.png
index ad63f865f9b..cf9bbdf4e5a 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_tabletGeometry.png
index 444c594f5c5..e35c198a7e8 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..cd129af732b
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_desktopGeometry.png
index cef2294129b..93bff01a320 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_laptopGeometry.png
index 47b165bd860..d65086697f0 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_miniGeometry.png
index 806a6d40dd5..68ae3b64aaa 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_mobileGeometry.png
index d0039d81492..4dea1324c41 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_tabletGeometry.png
index a9ff8df0916..76139e30138 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..bc56344d116
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_desktopGeometry.png
index 4bc9b8d637f..db57b11b481 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_laptopGeometry.png
index 67cbe973399..b155700d75f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_miniGeometry.png
index 993bf1e889f..5a8390b58c0 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_mobileGeometry.png
index 79d1abf9531..2a0c1d5760f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_tabletGeometry.png
index 1c811ce98b5..5ad6a3fd6b7 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_constrainedWidthGeometry.png
new file mode 100644
index 00000000000..e26ecf53503
Binary files /dev/null and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_desktopGeometry.png
index f711ce98094..8dcafb82d44 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_laptopGeometry.png
index ee9a5aba1be..7bd462facdb 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_miniGeometry.png
index 0f9f76827ee..a1fc63c0377 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_mobileGeometry.png
index 7c78939fe71..04133fd5cce 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_tabletGeometry.png
index 9fc0fded2c0..3da179873ce 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png
index 102954f7f5f..0d72d746611 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png
index 1bc693ff47e..e461d81cb53 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png
index ffc26904c30..4aa5c68777f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png
index ec136cad310..7cfe568bafc 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_darkMode_laptopGeometry.png
index 3a1c1faa0a2..832ed2a05eb 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_darkMode_mobileGeometry.png
index 6f799014253..d1607e914e7 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_lightMode_laptopGeometry.png
index 0a1192ae716..bb23a44466e 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_lightMode_mobileGeometry.png
index 18ce74b2249..9ca31cde1cc 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_customTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png
index ffb2a4a25a6..81318f4bd23 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index 108f322d732..2a1cdf00008 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png
index 06ac63958d7..26e526d0f16 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index 1fa34066107..5a64555b963 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png
index 80f2ba1fab1..ad463750e66 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png
index 6447ea3e7da..8594ad114bb 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png
index 887a8cc66c4..93cbedc73d1 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png
index 4fe26a589bd..9d7bf06b959 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_darkMode_laptopGeometry.png
index abe61a501f1..5d1d15dcc91 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_darkMode_mobileGeometry.png
index 6eab86a41e9..bb3ebf33590 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_lightMode_laptopGeometry.png
index 77b56a6b7ef..2b669e3cfca 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_lightMode_mobileGeometry.png
index 557b6e2aeae..822bd9792b4 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material3Theme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png
index 2b06382a1c1..65a5be8354e 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png
index 5e919d0626c..ec7878f0d09 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png
index 4507f5fdc7f..deb58fbef0d 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png
index 103cdc9ea5e..32db853ea97 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_darkMode_laptopGeometry.png
index cff5ab324fc..ef83b04e20a 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_darkMode_mobileGeometry.png
index fb941719ef0..87c2d1b041f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_lightMode_laptopGeometry.png
index 588d4e105be..ed747606e39 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_lightMode_mobileGeometry.png
index 4a0705485b0..5851d21d741 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_customTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png
index db2ee42acdf..8d742290bcd 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index f524530bd70..30d9bf2c14f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png
index 6239b29fdd0..ca90aea3e14 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index ad63f865f9b..cf9bbdf4e5a 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png
index bbc3d1fe4fc..05324299c28 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png
index ac3f01db027..f11b2684b2d 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png
index 20cd937497d..bab8d5a5e02 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png
index 56851800861..0d8d65c697b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png
index 778ad317caa..53a5e2b1a23 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png
index 7b3c4bf83ff..935b086c936 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png
index 184385a184d..d68e59b16c1 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png
index 3ee8f796f95..ca244ae2f05 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png
index 2850ae5ad5a..0ad3424d8f0 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png
index cd22a21c413..f8970aaed3c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png
index 9375857e2d2..0cd0e22a863 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png
index 4a3edb5d10a..ad7086128b7 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_darkMode_laptopGeometry.png
index a0454467533..0fa3114c49c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_darkMode_mobileGeometry.png
index 543ca271a03..1b11c3a6021 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_lightMode_laptopGeometry.png
index 39dc40ef5f3..be8d69d172f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_lightMode_mobileGeometry.png
index 67ba90ef8d4..48df2e40dfc 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_customTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png
index 4f785363fb3..c0a6282d9e0 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index ed424a9b66e..9dd92e1c542 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png
index a6b537f3376..90e5d42a07d 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index d9860c707c3..703f780caef 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png
index bb53fe64cd2..08199aa1339 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png
index de422017674..29f806f141f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png
index 469b7d03fda..1986cf5afac 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png
index fb6443f3857..6d7329dbc09 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_darkMode_laptopGeometry.png
index d1295823305..37031d4e357 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_darkMode_mobileGeometry.png
index c434f4ac8c7..cb413fa5464 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_lightMode_laptopGeometry.png
index f57900d52cb..fab4b258cbb 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_lightMode_mobileGeometry.png
index 9a447b2f354..e89aa6c3454 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material3Theme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png
index 45fa7e3ed3a..f5bd5202721 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png
index 4f53a373bde..8a52b50dc98 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png
index 3268bcd033f..c885e0f3542 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png
index 8855c84b568..decfc715807 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_darkMode_laptopGeometry.png
index ccbb79fa4b9..86f4b84d175 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_darkMode_mobileGeometry.png
index 7b71637b2c3..5b6449b8dff 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_lightMode_laptopGeometry.png
index 166d6954304..67fd04413e5 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_lightMode_mobileGeometry.png
index aee37c49f01..582f19f5f83 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_customTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png
index f3082c3c804..3b51b8aab3e 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index c845c8e265d..bd57a67b94a 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png
index fba73057d18..3a701536ce2 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index 92e21171c19..78899818563 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png
index e400ebbeee5..488e066ad78 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png
index a5c7f5e18b6..035f7dd1b4b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png
index c9712fea2f9..999bcc7a10e 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png
index 9a4190d3b10..4407f9578c9 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png
index 8a6f809c154..1399a285cfd 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png
index 0f6662abe13..50824ebbe3c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png
index 9db00eb0146..3bac5dfbd5f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png
index 890547686b9..2a548c50aca 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png
index bd432734ef1..8a6e9c2ea3c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png
index 50ffa774504..d87eabb6e00 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png
index 3899dfb838f..dbdbeed9d78 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png
index c4f58d72ca3..225103d71b2 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customSwatchTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_darkMode_laptopGeometry.png
index 9e2aaa67b48..92f5332c068 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_darkMode_mobileGeometry.png
index 81edc5308eb..3506b55b407 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_lightMode_laptopGeometry.png
index a5b99f96e07..a31df039b02 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_lightMode_mobileGeometry.png
index 28ddfef9f77..69f8153a156 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_customTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png
index a01a24e0c12..91e5e07b64d 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index 31497e0b1c6..340e48a9ee4 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png
index 07207588edf..638807fa97c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index 28011030a9e..21ab4c42f14 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png
index 95ed39c5c07..d38c92d89b3 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png
index 2a27e4ebd9a..bef535cfb76 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png
index a1d568afb0d..8c740836ca9 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png
index a2e667637dd..2dc2a721389 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_highContrastTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_darkMode_laptopGeometry.png
index 39b1bea6eff..114f57df631 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_darkMode_mobileGeometry.png
index f9eafff904a..a6262f86c51 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_lightMode_laptopGeometry.png
index 46c7a11cf3f..3b4218b8f3f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_lightMode_mobileGeometry.png
index 59af699da9f..d1cf1ce385b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material3Theme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png
index 2b06382a1c1..65a5be8354e 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png
index 5e919d0626c..ec7878f0d09 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png
index 4507f5fdc7f..deb58fbef0d 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png
index 103cdc9ea5e..32db853ea97 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customSwatchTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_darkMode_laptopGeometry.png
index cff5ab324fc..ef83b04e20a 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_darkMode_mobileGeometry.png
index fb941719ef0..87c2d1b041f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_lightMode_laptopGeometry.png
index 588d4e105be..ed747606e39 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_lightMode_mobileGeometry.png
index 4a0705485b0..5851d21d741 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_customTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png
index db2ee42acdf..8d742290bcd 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index f524530bd70..30d9bf2c14f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png
index 6239b29fdd0..ca90aea3e14 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index ad63f865f9b..cf9bbdf4e5a 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png
index bbc3d1fe4fc..05324299c28 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png
index ac3f01db027..f11b2684b2d 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png
index 20cd937497d..bab8d5a5e02 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png
index 56851800861..0d8d65c697b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_highContrastTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png
index 778ad317caa..53a5e2b1a23 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png
index 7b3c4bf83ff..935b086c936 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png
index 184385a184d..d68e59b16c1 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png
index 3ee8f796f95..ca244ae2f05 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material3Theme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/main_test.dart b/packages/authenticator/amplify_authenticator/test/ui/main_test.dart
index 86805376fed..ea48212c072 100644
--- a/packages/authenticator/amplify_authenticator/test/ui/main_test.dart
+++ b/packages/authenticator/amplify_authenticator/test/ui/main_test.dart
@@ -27,6 +27,10 @@ enum TestConfig {
 }
 
 enum ScreenGeometry {
+  /// Geometry for an abitrarily constrained screen width, e.g. when
+  /// using a `ConstrainedBox` widget.
+  constrainedWidth(size: Size(200, 1000), pixelRatio: 1),
+
   // Geometry based off of an iPhone SE 2022
   mini(size: Size(750, 1334), pixelRatio: 2),