diff --git a/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift
index df4e34387c..c8a58b0965 100644
--- a/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,7 +6,6 @@ import FlutterMacOS
 import Foundation
 
 import amplify_auth_cognito
-import amplify_secure_storage
 import connectivity_plus
 import device_info_plus
 import package_info_plus
@@ -14,7 +13,6 @@ import path_provider_foundation
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin"))
-  AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin"))
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
diff --git a/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift
index df4e34387c..c8a58b0965 100644
--- a/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,7 +6,6 @@ import FlutterMacOS
 import Foundation
 
 import amplify_auth_cognito
-import amplify_secure_storage
 import connectivity_plus
 import device_info_plus
 import package_info_plus
@@ -14,7 +13,6 @@ import path_provider_foundation
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin"))
-  AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin"))
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
diff --git a/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift
index 723ec8543e..c5b0ceae21 100644
--- a/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,7 +6,6 @@ import FlutterMacOS
 import Foundation
 
 import amplify_auth_cognito
-import amplify_secure_storage
 import connectivity_plus
 import device_info_plus
 import package_info_plus
@@ -15,7 +14,6 @@ import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin"))
-  AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin"))
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
diff --git a/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift
index 723ec8543e..c5b0ceae21 100644
--- a/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,7 +6,6 @@ import FlutterMacOS
 import Foundation
 
 import amplify_auth_cognito
-import amplify_secure_storage
 import connectivity_plus
 import device_info_plus
 import package_info_plus
@@ -15,7 +14,6 @@ import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin"))
-  AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin"))
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
diff --git a/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift
index 723ec8543e..c5b0ceae21 100644
--- a/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,7 +6,6 @@ import FlutterMacOS
 import Foundation
 
 import amplify_auth_cognito
-import amplify_secure_storage
 import connectivity_plus
 import device_info_plus
 import package_info_plus
@@ -15,7 +14,6 @@ import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin"))
-  AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin"))
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
diff --git a/packages/authenticator/amplify_authenticator/lib/amplify_authenticator.dart b/packages/authenticator/amplify_authenticator/lib/amplify_authenticator.dart
index d53a76ac5a..a0eb4faae8 100644
--- a/packages/authenticator/amplify_authenticator/lib/amplify_authenticator.dart
+++ b/packages/authenticator/amplify_authenticator/lib/amplify_authenticator.dart
@@ -554,7 +554,7 @@ class _AuthenticatorState extends State<Authenticator> {
     final resolver = widget.stringResolver.messages;
     _infoSub = _stateMachineBloc.infoMessages.listen((key) {
       final context = scaffoldMessengerKey.currentContext;
-      if (mounted && context != null) {
+      if (context != null && context.mounted) {
         final message = resolver.resolve(context, key);
         _logger.info(message);
         _showExceptionBanner(
@@ -821,6 +821,8 @@ class _AuthenticatorBody extends StatelessWidget {
       builder: (state, child) {
         if (state is AuthenticatedState) return child;
         return Navigator(
+          // TODO(hahnand): onPopupPage to use onDidRemovePage
+          // ignore: deprecated_member_use
           onPopPage: (_, dynamic __) => true,
           pages: [
             MaterialPage<void>(
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
index 937a53354f..8a870fcc78 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_resetPasswordStep_constrainedWidthGeometry.png 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 16f5b37b60..3d71e2be16 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 08af0ac8c0..eff7b0cc54 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 934b60b986..9cc4790038 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 3e4815c9c8..1b50d49ebf 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 8018f912d7..2c458a3c24 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
index 05d2ccea4d..7a6d4e3ebf 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signInStep_constrainedWidthGeometry.png 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 7bc717fbf9..7777ef98cf 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 9e0e7ed9dd..91b4a611f3 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 376386ad57..7da0767501 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 9fe39d2260..9d05d8a61f 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 021a2d35f5..0828a8e7c3 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
index 89bb42a86b..30ebeaa652 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailConfig_signUpStep_constrainedWidthGeometry.png 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 c9f2d58ddb..7271ce2d71 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 dca7b437ca..2c82a65bc1 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 d1aa745b83..eb928c552c 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 5dedba10e9..f26f769a13 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 c53f2840ce..f81d80c7f7 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
index 408b0a1c0d..bfd54c6cb0 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_resetPasswordStep_constrainedWidthGeometry.png 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 e01a6f4ec7..4c43404e89 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 9060cbac42..4a26057b3e 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 0b6c93d250..c942935030 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 96077bc796..bdbbf2b72e 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 25f30d8cc6..4cedfcff0f 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
index c35b26a60e..dd8f3eced8 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signInStep_constrainedWidthGeometry.png 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 1d738c304d..c827b80476 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 4a9a27ef28..4f249e2715 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 f5d9e60774..bfcf890617 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 34fd8df7db..7e0b10d5cb 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 841c677672..6c255775a1 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
index 4f4a3ccfe2..c8e18eedeb 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_emailOrPhoneConfig_signUpStep_constrainedWidthGeometry.png 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 b402603639..80d8c49bb9 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 728d660a00..0b1f9bf883 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 8b12778fd8..7e3595c958 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 bd8e19186e..ed3900a066 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 eab5a72e05..4adfe8cf76 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
index a3bae003e2..34df32062c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_resetPasswordStep_constrainedWidthGeometry.png 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 4ef27a1e0a..20df63e775 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 5be8892112..e1c566459a 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 eeb6b12276..6f7bd073d2 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 3bf3c8b5fe..ac60dd3cdd 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 2dc5f51079..069d8ca538 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
index 2f445662f7..668d73bc15 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signInStep_constrainedWidthGeometry.png 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 708bb3eb22..c6fe1d9a54 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 96f29680ba..3176d416dd 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 039821fd98..ec6bbf3aab 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 658d6233ba..4f3491d74f 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 3e35835c2c..97ee9cefab 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
index 95276acf26..1f69480599 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_phoneNumberConfig_signUpStep_constrainedWidthGeometry.png 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 6bbf2ae709..78f23b6116 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 d1fc0b288f..342a17f138 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 a60313b5a8..78af6870fc 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 9c5136e174..2749a491e3 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 110dc5c672..7f6cf8c31c 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_smsOrTotpConfig_resetPasswordStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_constrainedWidthGeometry.png
index 6b1a5da259..30e4a06bf1 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_constrainedWidthGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_desktopGeometry.png
index b264f7da56..457152c847 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_laptopGeometry.png
index 398d07b4ac..f1050acd97 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_miniGeometry.png
index c018f8fa44..2dd048a29d 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_mobileGeometry.png
index de7690f15f..5c9234d172 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_tabletGeometry.png
index d3847ffe59..b54bdff40d 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_resetPasswordStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_constrainedWidthGeometry.png
index f4a7cf7fb8..7059980f23 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_constrainedWidthGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_desktopGeometry.png
index 43b91e78de..bd94541647 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_laptopGeometry.png
index 0c72d37ff7..1490f4e4ae 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_miniGeometry.png
index f09cb0507c..43007fce6e 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_mobileGeometry.png
index 76528d6819..d0421dcb6e 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_tabletGeometry.png
index b61e6da39a..a96f68ba39 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signInStep_tabletGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_constrainedWidthGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_constrainedWidthGeometry.png
index 23655cc607..953de779a7 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_constrainedWidthGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_constrainedWidthGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_desktopGeometry.png
index f4b7b961fd..e9a8b892e2 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_laptopGeometry.png
index ac79bb3a47..6016d0070b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_miniGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_miniGeometry.png
index 58362bdb55..12d633613c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_miniGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_miniGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_mobileGeometry.png
index 86d3f8e71e..b6fc03cdd5 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_tabletGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_tabletGeometry.png
index 9147e3e136..4fe4dfee77 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_signUpStep_tabletGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_smsOrTotpConfig_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
index 937a53354f..8a870fcc78 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_resetPasswordStep_constrainedWidthGeometry.png 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 16f5b37b60..3d71e2be16 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 08af0ac8c0..eff7b0cc54 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 934b60b986..9cc4790038 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 3e4815c9c8..1b50d49ebf 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 8018f912d7..2c458a3c24 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
index 2cc4eb6197..875acd8045 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signInStep_constrainedWidthGeometry.png 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 c6adc2e0fb..07ee7e1be3 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 13bb4c2533..363188a9ff 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 44fc59328a..8f616a098e 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 39d2d04e41..19981a8538 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 e18bc1028b..b3873a9b78 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
index 89bb42a86b..30ebeaa652 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_socialProviderConfig_signUpStep_constrainedWidthGeometry.png 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 c9f2d58ddb..7271ce2d71 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 dca7b437ca..2c82a65bc1 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 d1aa745b83..eb928c552c 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 5dedba10e9..f26f769a13 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 c53f2840ce..f81d80c7f7 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
index 6b1a5da259..30e4a06bf1 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_resetPasswordStep_constrainedWidthGeometry.png 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 b264f7da56..457152c847 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 398d07b4ac..f1050acd97 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 c018f8fa44..2dd048a29d 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 de7690f15f..5c9234d172 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 d3847ffe59..b54bdff40d 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
index f4a7cf7fb8..7059980f23 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signInStep_constrainedWidthGeometry.png 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 43b91e78de..bd94541647 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 0c72d37ff7..1490f4e4ae 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 f09cb0507c..43007fce6e 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 76528d6819..d0421dcb6e 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 b61e6da39a..a96f68ba39 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
index 52f56bb665..5f120d76e7 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/layout_usernameWithAttributesConfig_signUpStep_constrainedWidthGeometry.png 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 d8fea1680a..3ae0ac3ea2 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 a3316f1035..7cd1165188 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 cf63f99f42..e72f05ba86 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 e299515d42..7501c7d980 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 bf6237fb34..16e1793645 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_confirmResetPasswordStep_defaultMaterialTheme_darkMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_darkMode_desktopGeometry.png
index 3389b06e83..856ba7f776 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_darkMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_darkMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index 0040e384c6..77f976ae07 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_lightMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_lightMode_desktopGeometry.png
index 296bc43cf2..42da47bca3 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_lightMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_lightMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index 2b299b7edf..8879820ff1 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmResetPasswordStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_darkMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_darkMode_desktopGeometry.png
index 41d2e0b442..fdbfe56dab 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_darkMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_darkMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index 0a4b2e8f33..77f664ec28 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_lightMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_lightMode_desktopGeometry.png
index 8d55d6b79d..e2bd99fe01 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_lightMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_lightMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index b94afd1eee..71d8ec7532 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInCustomAuthStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_darkMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_darkMode_desktopGeometry.png
index db781a42e2..4129e3eb5a 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_darkMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_darkMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index 5e84b9e084..62e6bb32f2 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_lightMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_lightMode_desktopGeometry.png
index 161c0a8d60..d07b4ed48b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_lightMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_lightMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index 5e5354e8e1..1ffeea58bc 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInMfaStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_darkMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_darkMode_desktopGeometry.png
index b760fb0881..2a2d9996c1 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_darkMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_darkMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index 35214ff5fd..4f937b1a49 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_lightMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_lightMode_desktopGeometry.png
index c9a3ab6f03..2b26179361 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_lightMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_lightMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index 7c4a6ed98b..5ad576dbb3 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInNewPasswordStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_darkMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_darkMode_desktopGeometry.png
index d0bf1530b1..0ac650646b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_darkMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_darkMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index 2bd7444883..1ee5e4e876 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_lightMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_lightMode_desktopGeometry.png
index 1d0df0b345..55b79d28f7 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_lightMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_lightMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index ba6c53b97b..570c0643de 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignInWithTotpMfaCodeStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_darkMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_darkMode_desktopGeometry.png
index da49f5eee3..cba090136f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_darkMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_darkMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index 7ada2ead20..73df4a6295 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_lightMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_lightMode_desktopGeometry.png
index d6baff5d40..d272368861 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_lightMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_lightMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index d57a3b9751..e19b5e1c55 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmSignUpStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_darkMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_darkMode_desktopGeometry.png
index 09fdc357cc..34132ad3c6 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_darkMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_darkMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index beae482205..3fffb4836d 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_lightMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_lightMode_desktopGeometry.png
index 72b48b88aa..f6a83530bf 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_lightMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_lightMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index 8698a85ea7..20bc6149fc 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_confirmVerifyUserStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_darkMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_darkMode_desktopGeometry.png
index 52d1b68ade..53c27c7301 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_darkMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_darkMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index 1c964fcf4a..21795345c9 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_lightMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_lightMode_desktopGeometry.png
index 97bbedadb4..17569d4a11 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_lightMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_lightMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index 2a3bd47fc1..1a8803016a 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithMfaSelectionStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_darkMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_darkMode_desktopGeometry.png
index f6390059f2..549004b013 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_darkMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_darkMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index b60c526277..4e457ec96c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_lightMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_lightMode_desktopGeometry.png
index e3ef085ca1..0fc9a407f4 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_lightMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_lightMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index 2c999eb837..dfdcc0c515 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_continueSignInWithTotpSetupStep_defaultMaterialTheme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_darkMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_darkMode_desktopGeometry.png
index c0535b59a5..4950b6dac2 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_darkMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_darkMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index a081dcf85b..6a0584d90e 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_lightMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_lightMode_desktopGeometry.png
index 7bc717fbf9..7777ef98cf 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_lightMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_lightMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index 9fe39d2260..9d05d8a61f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_onboardingStep_defaultMaterialTheme_lightMode_mobileGeometry.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 1d2b238996..fcce3d9fcd 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 2ad218ec80..b097cccc13 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 f96a24c52a..e3937ddb1a 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 5e48dcd32f..34dd8e166c 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 0f815a14be..e66e56faac 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 e565961066..f2b5172c58 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 e3b3598ce8..4955f8f539 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 67d8da16fa..8b9ddf0ec3 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 30d1001424..d62cc04296 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 a081dcf85b..6a0584d90e 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 9e0e7ed9dd..91b4a611f3 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 9fe39d2260..9d05d8a61f 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 7492481470..617829e7ea 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 246bdb1352..31201dbae9 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 1f31062eb5..a4123b6e3d 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 16285ea3e4..7da42e35ec 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_material2Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_darkMode_laptopGeometry.png
index 9cdb87caa2..6ea76a5314 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_darkMode_mobileGeometry.png
index 34e5c48e86..e4d8bcb14f 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_lightMode_laptopGeometry.png
index 89b091bb31..e5415f71f2 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_lightMode_mobileGeometry.png
index 96c12232ab..9ae628fe03 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signInStep_material2Theme_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 2903e1a4ec..bddf481c6f 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 92d2106394..284df0649c 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 ebe369fe4b..c11ca08a93 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 0275329e61..31ac3334e0 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 123e0ae783..d10eb60d33 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 7f4529bbc3..1d82a5d556 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 9f157b29b4..b8dc4f968e 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 fcb8a5367e..3580dba3ee 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 539aab2c3d..a26d85187c 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 2e950ed961..f662360264 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 dca7b437ca..2c82a65bc1 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 5dedba10e9..f26f769a13 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 2db351c5fb..0c86bb3b0d 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 8be38687ec..830b0aeb2a 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 db330b3632..749cd868af 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 1de4da223e..27978d9e2c 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_material2Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_darkMode_laptopGeometry.png
index 0f750e428b..a6bb102021 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png
index 7b3e985abb..fe7f347721 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png
index 1d7a063465..bd5f4eb7d6 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_lightMode_mobileGeometry.png
index 0c2dfb3902..1db52525fc 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_signUpStep_material2Theme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_darkMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_darkMode_desktopGeometry.png
index b5f72e06a1..37a0d8e7d9 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_darkMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_darkMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_darkMode_mobileGeometry.png
index d6ce7b219b..ff86b9a6b0 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_lightMode_desktopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_lightMode_desktopGeometry.png
index d97bd32b1e..f27ebd0e20 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_lightMode_desktopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_lightMode_desktopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_lightMode_mobileGeometry.png
index b0b5bf8df7..39399f08d6 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailConfig_verifyUserStep_defaultMaterialTheme_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 d3d67f79c8..a43368872f 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 628432ab53..808b5ae7a4 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 b76dfb5762..8c7ad2bf28 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 0722ce0fc9..ba748b138c 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 587cc14bf7..44a91e901f 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 852cf8c85f..11ceb8c826 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 c2826c78fa..61a1329b90 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 a9d6eafcb7..64b31bd500 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 b3c6336cc2..d993fda6bb 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 e53d2ad28a..278d387186 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 4a9a27ef28..4f249e2715 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 34fd8df7db..7e0b10d5cb 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 10b3eee11b..67a70a537a 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 22e776134b..39e03d8cdb 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 168b7d4798..2b26e1be80 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 d2a2510967..77c5f5bc04 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_material2Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_darkMode_laptopGeometry.png
index 7347beeba2..e4fd267365 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_darkMode_mobileGeometry.png
index d18c1c99c8..d033a9dd1c 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_lightMode_laptopGeometry.png
index 02bf0b5d69..2e38b15585 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_lightMode_mobileGeometry.png
index 17c82adfb2..3458803549 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signInStep_material2Theme_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 f7cab452be..6408d3c85e 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 495e5b211a..3ad11e30ff 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 609b700d07..1f4961b4cb 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 64749ca46d..dcb52deff2 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 d201280b68..f166b9c645 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 084742c477..5d7b2bf41c 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 e6f0d233c4..7aa1510366 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 9159fe6023..116cf38bd4 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 d4c9c52929..bf817650a9 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 99753f2953..99b40fc3dd 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 728d660a00..0b1f9bf883 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 bd8e19186e..ed3900a066 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 f1176334f9..74576ba5c0 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 42c275fa72..9bfc56141f 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 a4f33e3096..9e8231ff40 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 dde577f31b..11beb1342f 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_material2Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_darkMode_laptopGeometry.png
index 6890f175c6..c58967a61b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png
index 90ef5715f0..0d5251a576 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png
index de5b2cfe28..6e640ad4e2 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_lightMode_mobileGeometry.png
index 1e7f7f7e7a..64dd01dc5e 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_emailOrPhoneConfig_signUpStep_material2Theme_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 8dda33575d..d4adaed4ce 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 db17c96656..14ee71ca5b 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 ad0e04f1a7..3bcc0b18d1 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 717edc8522..95caf3bc45 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 ddef3eccaf..3e30fe0655 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 9821a23cd5..71d27945ac 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 d6b94174b8..006b2bd11d 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 afd4a10926..361ee53c1d 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 c8b57e0483..37d4ab504d 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 9b21215b0b..474573b96a 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 13bb4c2533..363188a9ff 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 39d2d04e41..19981a8538 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 904aab7812..096c14701c 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 39f5e40254..5755d740be 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 dbf58e49e3..c560aaef1b 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 f3e3faaed0..6063b96fbc 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_material2Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_darkMode_laptopGeometry.png
index eeb4527c9d..5f791cdfec 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_darkMode_mobileGeometry.png
index 09991873ef..e43711e200 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_lightMode_laptopGeometry.png
index 583841e652..23b65cbd0b 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_lightMode_mobileGeometry.png
index a3fe14f92e..8a46ec2c4a 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signInStep_material2Theme_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 2903e1a4ec..bddf481c6f 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 92d2106394..284df0649c 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 ebe369fe4b..c11ca08a93 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 0275329e61..31ac3334e0 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 123e0ae783..d10eb60d33 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 7f4529bbc3..1d82a5d556 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 9f157b29b4..b8dc4f968e 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 fcb8a5367e..3580dba3ee 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 539aab2c3d..a26d85187c 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 2e950ed961..f662360264 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 dca7b437ca..2c82a65bc1 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 5dedba10e9..f26f769a13 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 2db351c5fb..0c86bb3b0d 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 8be38687ec..830b0aeb2a 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 db330b3632..749cd868af 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 1de4da223e..27978d9e2c 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_material2Theme_darkMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_darkMode_laptopGeometry.png
index 0f750e428b..a6bb102021 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_darkMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_darkMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png
index 7b3e985abb..fe7f347721 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_darkMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png
index 1d7a063465..bd5f4eb7d6 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_lightMode_laptopGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_lightMode_mobileGeometry.png b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_lightMode_mobileGeometry.png
index 0c2dfb3902..1db52525fc 100644
Binary files a/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_lightMode_mobileGeometry.png and b/packages/authenticator/amplify_authenticator/test/ui/goldens/theme_socialProviderConfig_signUpStep_material2Theme_lightMode_mobileGeometry.png differ
diff --git a/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift
index c33812bc70..c52c93b11a 100644
--- a/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,7 +6,6 @@ import FlutterMacOS
 import Foundation
 
 import amplify_auth_cognito
-import amplify_secure_storage
 import device_info_plus
 import package_info_plus
 import path_provider_foundation
@@ -14,7 +13,6 @@ import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin"))
-  AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
diff --git a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift
index c33812bc70..c52c93b11a 100644
--- a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,7 +6,6 @@ import FlutterMacOS
 import Foundation
 
 import amplify_auth_cognito
-import amplify_secure_storage
 import device_info_plus
 import package_info_plus
 import path_provider_foundation
@@ -14,7 +13,6 @@ import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin"))
-  AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))