diff --git a/app/components/UI/Card/Views/CardWelcome/CardWelcome.styles.ts b/app/components/UI/Card/Views/CardWelcome/CardWelcome.styles.ts
index 8f2771b8dd6..8c99821fef3 100644
--- a/app/components/UI/Card/Views/CardWelcome/CardWelcome.styles.ts
+++ b/app/components/UI/Card/Views/CardWelcome/CardWelcome.styles.ts
@@ -1,30 +1,120 @@
-import { StyleSheet } from 'react-native';
+import { Platform, StyleSheet, Dimensions } from 'react-native';
+import { colors as importedColors } from '../../../../../styles/common';
 import { Theme } from '@metamask/design-tokens';
 
-const createStyles = (theme: Theme, deviceWidth: number) =>
+// Responsive scaling utilities
+const { width: screenWidth, height: screenHeight } = Dimensions.get('window');
+
+// Platform-specific base dimensions
+const BASE_WIDTH = 375;
+const BASE_HEIGHT_IOS = 812; // iPhone X/11/12/13/14/15 Pro base
+const BASE_HEIGHT_ANDROID = 736; // Common Android base
+
+const MIN_SCREEN_HEIGHT_FOR_SMALL_SCREEN_STYLES = 750;
+
+// Calculate platform-aware scaling factors
+const isIOS = Platform.OS === 'ios';
+const baseHeight = isIOS ? BASE_HEIGHT_IOS : BASE_HEIGHT_ANDROID;
+
+const widthScale = screenWidth / BASE_WIDTH;
+const heightScale = screenHeight / baseHeight;
+
+// Use more conservative scaling to prevent excessive padding
+const scale = Math.min(widthScale, heightScale);
+const conservativeScale = Math.min(scale, 1.2); // Cap scaling at 120%
+
+// Platform-aware responsive scaling functions
+const scaleSize = (size: number) => Math.ceil(size * conservativeScale);
+const scaleFont = (size: number) => Math.ceil(size * conservativeScale);
+
+// For vertical spacing, use percentage of available height instead of pure scaling
+const scaleVertical = (size: number) => {
+  // Use percentage of screen height for more consistent spacing
+  const percentage = size / baseHeight;
+  return Math.ceil(screenHeight * percentage);
+};
+
+const scaleHorizontal = (size: number) => Math.ceil(size * widthScale);
+
+const createStyles = (theme: Theme) =>
   StyleSheet.create({
-    safeAreaView: {
+    pageContainer: {
       flex: 1,
+      position: 'relative',
+      maxHeight: '100%',
+      width: '100%',
+      backgroundColor: theme.colors.accent03.dark,
     },
-    container: {
+    imageContainer: {
       flex: 1,
-      backgroundColor: theme.colors.background.default,
-      paddingHorizontal: 16,
-      justifyContent: 'space-between',
-    },
-    wrapper: {
       alignItems: 'center',
+      justifyContent: 'center',
+      marginBottom: scaleVertical(16),
     },
-    imageWrapper: {
+    image: {
+      width: '100%',
+      height: '100%',
+      resizeMode: 'cover',
+    },
+    contentContainer: {
+      flex: 1,
+    },
+    headerContainer: {
       alignItems: 'center',
+      paddingHorizontal: scaleHorizontal(16),
+      paddingVertical: scaleVertical(16),
     },
-    image: {
-      width: deviceWidth * 0.9,
-      height: deviceWidth,
+    title: {
+      fontFamily: Platform.OS === 'ios' ? 'MM Poly' : 'MM Poly Regular',
+      fontWeight: '400',
+      // make it smaller on smaller screens
+      fontSize:
+        screenHeight < MIN_SCREEN_HEIGHT_FOR_SMALL_SCREEN_STYLES ? 40 : 50,
+      lineHeight:
+        screenHeight < MIN_SCREEN_HEIGHT_FOR_SMALL_SCREEN_STYLES ? 40 : 50, // 100% of font size
+      letterSpacing: 0,
+      textAlign: 'center',
+      paddingTop: scaleVertical(
+        screenHeight < MIN_SCREEN_HEIGHT_FOR_SMALL_SCREEN_STYLES ? 8 : 12,
+      ),
+      color: theme.colors.accent03.light,
+    },
+    titleDescription: {
+      // make it smaller on smaller screens
+      fontSize:
+        screenHeight < MIN_SCREEN_HEIGHT_FOR_SMALL_SCREEN_STYLES ? 14 : 16,
+      paddingTop: scaleVertical(10),
+      paddingHorizontal: scaleHorizontal(8),
+      textAlign: 'center',
+      fontFamily: Platform.OS === 'ios' ? 'System' : 'Roboto', // Default system font
+      fontWeight: '500',
+      lineHeight: 24, // Line Height BodyMd
+      letterSpacing: 0,
+      color: theme.colors.accent03.light,
+    },
+    footerContainer: {
+      display: 'flex',
+      rowGap: scaleVertical(8),
+      paddingHorizontal: scaleHorizontal(30),
+    },
+    getStartedButton: {
+      borderRadius: scaleSize(12),
+      backgroundColor: importedColors.white,
+    },
+    getStartedButtonText: {
+      color: importedColors.btnBlack,
+      fontWeight: '600',
+      fontSize: scaleFont(16),
+    },
+    notNowButton: {
+      borderRadius: scaleSize(12),
+      backgroundColor: importedColors.transparent,
+      borderWidth: 0,
     },
-    button: {
-      marginTop: 48,
-      marginBottom: 32,
+    notNowButtonText: {
+      color: importedColors.white,
+      fontWeight: '500',
+      fontSize: scaleFont(16),
     },
   });
 
diff --git a/app/components/UI/Card/Views/CardWelcome/CardWelcome.test.tsx b/app/components/UI/Card/Views/CardWelcome/CardWelcome.test.tsx
index 7cac336f11f..86d686b565d 100644
--- a/app/components/UI/Card/Views/CardWelcome/CardWelcome.test.tsx
+++ b/app/components/UI/Card/Views/CardWelcome/CardWelcome.test.tsx
@@ -6,9 +6,16 @@ import CardWelcome from './CardWelcome';
 import { CardWelcomeSelectors } from '../../../../../../e2e/selectors/Card/CardWelcome.selectors';
 import { strings } from '../../../../../../locales/i18n';
 import Routes from '../../../../../constants/navigation/Routes';
+import { MetaMetricsEvents } from '../../../../hooks/useMetrics';
 
 // Mocks
 const mockNavigate = jest.fn();
+const mockTrackEvent = jest.fn();
+const mockBuild = jest.fn();
+const mockAddProperties = jest.fn(() => ({ build: mockBuild }));
+const mockCreateEventBuilder = jest.fn(() => ({
+  addProperties: mockAddProperties,
+}));
 
 jest.mock('@react-navigation/native', () => {
   const actual = jest.requireActual('@react-navigation/native');
@@ -20,25 +27,31 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
+jest.mock('../../../../hooks/useMetrics', () => ({
+  useMetrics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  }),
+  MetaMetricsEvents: {
+    CARD_VIEWED: 'Card Viewed',
+    CARD_BUTTON_CLICKED: 'Card Button Clicked',
+  },
+}));
+
 jest.mock('../../../../../../locales/i18n', () => ({
   strings: (key: string) => {
     const map: Record<string, string> = {
       'card.card_onboarding.title': 'Enable MetaMask Card features',
       'card.card_onboarding.description':
         'Change your spending token and network by signing in with your Crypto Life email and password.',
-      'card.card_onboarding.verify_account_button': 'Sign in',
-      'card.card_onboarding.non_cardholder_title': 'Welcome to MetaMask Card',
-      'card.card_onboarding.non_cardholder_description':
-        'MetaMask Card is the free and easy way to spend your crypto, with rich onchain rewards.',
-      'card.card_onboarding.non_cardholder_verify_account_button':
-        'Get started',
-      'card.card': 'Card',
+      'card.card_onboarding.apply_now_button': 'Sign in',
+      'predict.gtm_content.not_now': 'Not now',
     };
     return map[key] || key;
   },
 }));
 
-jest.mock('../../../../../images/metal-card.png', () => 1);
+jest.mock('../../../../../images/mm-card-welcome.png', () => 1);
 
 jest.mock('../../../../../util/theme', () => ({
   useTheme: () => ({ colors: { background: { default: '#fff' } } }),
@@ -57,9 +70,11 @@ describe('CardWelcome', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockNavigate.mockClear();
+    mockTrackEvent.mockClear();
+    mockCreateEventBuilder.mockClear();
   });
 
-  describe('Non-cardholder flow', () => {
+  describe('Render', () => {
     beforeEach(() => {
       store = createTestStore({ cardholderAccounts: [] });
     });
@@ -81,9 +96,10 @@ describe('CardWelcome', () => {
       expect(
         getByTestId(CardWelcomeSelectors.VERIFY_ACCOUNT_BUTTON),
       ).toBeTruthy();
+      expect(getByTestId('predict-gtm-not-now-button')).toBeTruthy();
     });
 
-    it('displays non-cardholder title when no cardholder accounts exist', () => {
+    it('displays correct title and description', () => {
       const { getByTestId } = render(
         <Provider store={store}>
           <CardWelcome />
@@ -92,69 +108,62 @@ describe('CardWelcome', () => {
 
       expect(
         getByTestId(CardWelcomeSelectors.WELCOME_TO_CARD_TITLE_TEXT),
-      ).toHaveTextContent(strings('card.card_onboarding.non_cardholder_title'));
+      ).toHaveTextContent(strings('card.card_onboarding.title'));
+      expect(
+        getByTestId(CardWelcomeSelectors.WELCOME_TO_CARD_DESCRIPTION_TEXT),
+      ).toHaveTextContent(strings('card.card_onboarding.description'));
     });
 
-    it('displays non-cardholder description when no cardholder accounts exist', () => {
-      const { getByTestId } = render(
+    it('tracks view event on mount', () => {
+      render(
         <Provider store={store}>
           <CardWelcome />
         </Provider>,
       );
 
-      expect(
-        getByTestId(CardWelcomeSelectors.WELCOME_TO_CARD_DESCRIPTION_TEXT),
-      ).toHaveTextContent(
-        strings('card.card_onboarding.non_cardholder_description'),
+      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+        MetaMetricsEvents.CARD_VIEWED,
       );
+      expect(mockTrackEvent).toHaveBeenCalled();
     });
+  });
 
-    it('navigates to onboarding root when verify account button pressed', () => {
+  describe('Interactions', () => {
+    it('navigates to wallet home when "Not Now" is pressed', () => {
+      store = createTestStore();
       const { getByTestId } = render(
         <Provider store={store}>
           <CardWelcome />
         </Provider>,
       );
 
-      fireEvent.press(getByTestId(CardWelcomeSelectors.VERIFY_ACCOUNT_BUTTON));
+      fireEvent.press(getByTestId('predict-gtm-not-now-button'));
 
-      expect(mockNavigate).toHaveBeenCalledTimes(1);
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.CARD.ONBOARDING.ROOT);
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
     });
   });
 
-  describe('Cardholder flow', () => {
-    beforeEach(() => {
-      store = createTestStore({
-        cardholderAccounts: ['0x1234567890abcdef'],
-      });
-    });
-
-    it('displays cardholder title when cardholder accounts exist', () => {
+  describe('Navigation Flow', () => {
+    it('navigates to onboarding root when verify account button pressed (Non-cardholder)', () => {
+      store = createTestStore({ cardholderAccounts: [] });
       const { getByTestId } = render(
         <Provider store={store}>
           <CardWelcome />
         </Provider>,
       );
 
-      expect(
-        getByTestId(CardWelcomeSelectors.WELCOME_TO_CARD_TITLE_TEXT),
-      ).toHaveTextContent(strings('card.card_onboarding.title'));
-    });
+      fireEvent.press(getByTestId(CardWelcomeSelectors.VERIFY_ACCOUNT_BUTTON));
 
-    it('displays cardholder description when cardholder accounts exist', () => {
-      const { getByTestId } = render(
-        <Provider store={store}>
-          <CardWelcome />
-        </Provider>,
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.CARD.ONBOARDING.ROOT);
+      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+        MetaMetricsEvents.CARD_BUTTON_CLICKED,
       );
-
-      expect(
-        getByTestId(CardWelcomeSelectors.WELCOME_TO_CARD_DESCRIPTION_TEXT),
-      ).toHaveTextContent(strings('card.card_onboarding.description'));
     });
 
-    it('navigates to authentication when verify account button pressed', () => {
+    it('navigates to authentication when verify account button pressed (Cardholder)', () => {
+      store = createTestStore({
+        cardholderAccounts: ['0x1234567890abcdef'],
+      });
       const { getByTestId } = render(
         <Provider store={store}>
           <CardWelcome />
@@ -163,8 +172,10 @@ describe('CardWelcome', () => {
 
       fireEvent.press(getByTestId(CardWelcomeSelectors.VERIFY_ACCOUNT_BUTTON));
 
-      expect(mockNavigate).toHaveBeenCalledTimes(1);
       expect(mockNavigate).toHaveBeenCalledWith(Routes.CARD.AUTHENTICATION);
+      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+        MetaMetricsEvents.CARD_BUTTON_CLICKED,
+      );
     });
   });
 });
diff --git a/app/components/UI/Card/Views/CardWelcome/CardWelcome.tsx b/app/components/UI/Card/Views/CardWelcome/CardWelcome.tsx
index e351f7c0fe3..22ea8d30001 100644
--- a/app/components/UI/Card/Views/CardWelcome/CardWelcome.tsx
+++ b/app/components/UI/Card/Views/CardWelcome/CardWelcome.tsx
@@ -1,6 +1,6 @@
 import { useNavigation } from '@react-navigation/native';
-import React, { useCallback, useMemo, useEffect } from 'react';
-import { Image, useWindowDimensions, View } from 'react-native';
+import React, { useCallback, useEffect } from 'react';
+import { Image, View } from 'react-native';
 
 import { strings } from '../../../../../../locales/i18n';
 import Button, {
@@ -9,10 +9,9 @@ import Button, {
   ButtonWidthTypes,
 } from '../../../../../component-library/components/Buttons/Button';
 import Text, {
-  TextColor,
   TextVariant,
 } from '../../../../../component-library/components/Texts/Text';
-import MM_CARDS_MOCKUP from '../../../../../images/mm-cards-mockup.png';
+import MM_CARDS_WELCOME from '../../../../../images/mm-card-welcome.png';
 import { useTheme } from '../../../../../util/theme';
 import createStyles from './CardWelcome.styles';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -22,14 +21,14 @@ import { MetaMetricsEvents, useMetrics } from '../../../../hooks/useMetrics';
 import { CardActions, CardScreens } from '../../util/metrics';
 import { selectHasCardholderAccounts } from '../../../../../core/redux/slices/card';
 import { useSelector } from 'react-redux';
+import ButtonBase from '../../../../../component-library/components/Buttons/Button/foundation/ButtonBase';
 
 const CardWelcome = () => {
   const { trackEvent, createEventBuilder } = useMetrics();
   const { navigate } = useNavigation();
   const hasCardholderAccounts = useSelector(selectHasCardholderAccounts);
   const theme = useTheme();
-  const deviceWidth = useWindowDimensions().width;
-  const styles = createStyles(theme, deviceWidth);
+  const styles = createStyles(theme);
 
   useEffect(() => {
     trackEvent(
@@ -41,25 +40,9 @@ const CardWelcome = () => {
     );
   }, [trackEvent, createEventBuilder]);
 
-  const cardWelcomeCopies = useMemo(() => {
-    if (hasCardholderAccounts) {
-      return {
-        title: strings('card.card_onboarding.title'),
-        description: strings('card.card_onboarding.description'),
-        verify_account_button: strings(
-          'card.card_onboarding.verify_account_button',
-        ),
-      };
-    }
-
-    return {
-      title: strings('card.card_onboarding.non_cardholder_title'),
-      description: strings('card.card_onboarding.non_cardholder_description'),
-      verify_account_button: strings(
-        'card.card_onboarding.non_cardholder_verify_account_button',
-      ),
-    };
-  }, [hasCardholderAccounts]);
+  const handleClose = useCallback(() => {
+    navigate(Routes.WALLET.HOME);
+  }, [navigate]);
 
   const handleButtonPress = useCallback(() => {
     trackEvent(
@@ -78,43 +61,74 @@ const CardWelcome = () => {
   }, [hasCardholderAccounts, navigate, trackEvent, createEventBuilder]);
 
   return (
-    <SafeAreaView style={styles.safeAreaView} edges={['bottom']}>
-      <View style={styles.container}>
-        <View style={styles.imageWrapper}>
-          <Image
-            source={MM_CARDS_MOCKUP}
-            style={styles.image}
-            resizeMode="contain"
-            testID={CardWelcomeSelectors.CARD_IMAGE}
-          />
-        </View>
-        <View>
+    <View style={[styles.pageContainer]} testID="card-gtm-modal-container">
+      <SafeAreaView style={styles.contentContainer}>
+        {/* Header Section */}
+        <View style={styles.headerContainer}>
           <Text
+            style={styles.title}
             variant={TextVariant.HeadingLG}
             testID={CardWelcomeSelectors.WELCOME_TO_CARD_TITLE_TEXT}
           >
-            {cardWelcomeCopies.title}
+            {strings('card.card_onboarding.title')}
           </Text>
           <Text
             variant={TextVariant.BodyMD}
-            color={TextColor.Alternative}
+            style={styles.titleDescription}
             testID={CardWelcomeSelectors.WELCOME_TO_CARD_DESCRIPTION_TEXT}
           >
-            {cardWelcomeCopies.description}
+            {strings('card.card_onboarding.description')}
           </Text>
+        </View>
 
-          <Button
-            variant={ButtonVariants.Primary}
-            label={cardWelcomeCopies.verify_account_button}
-            size={ButtonSize.Lg}
-            testID={CardWelcomeSelectors.VERIFY_ACCOUNT_BUTTON}
+        {/* Image Section */}
+        <View style={styles.imageContainer}>
+          <Image
+            source={MM_CARDS_WELCOME}
+            style={styles.image}
+            resizeMode="cover"
+            testID={CardWelcomeSelectors.CARD_IMAGE}
+          />
+        </View>
+
+        {/* Footer Section */}
+        <View style={styles.footerContainer}>
+          <ButtonBase
             onPress={handleButtonPress}
-            style={styles.button}
+            testID={CardWelcomeSelectors.VERIFY_ACCOUNT_BUTTON}
+            size={ButtonSize.Lg}
+            width={ButtonWidthTypes.Full}
+            style={styles.getStartedButton}
+            activeOpacity={0.6}
+            label={
+              <Text
+                variant={TextVariant.BodyMDMedium}
+                style={styles.getStartedButtonText}
+              >
+                {strings('card.card_onboarding.apply_now_button')}
+              </Text>
+            }
+          />
+          <Button
+            variant={ButtonVariants.Secondary}
+            onPress={handleClose}
+            testID="predict-gtm-not-now-button"
             width={ButtonWidthTypes.Full}
+            size={ButtonSize.Lg}
+            style={styles.notNowButton}
+            activeOpacity={0.6}
+            label={
+              <Text
+                variant={TextVariant.BodyMDMedium}
+                style={styles.notNowButtonText}
+              >
+                {strings('predict.gtm_content.not_now')}
+              </Text>
+            }
           />
         </View>
-      </View>
-    </SafeAreaView>
+      </SafeAreaView>
+    </View>
   );
 };
 
diff --git a/app/components/UI/Card/components/Onboarding/Complete.test.tsx b/app/components/UI/Card/components/Onboarding/Complete.test.tsx
index 3b577d5d164..eb7760b25d4 100644
--- a/app/components/UI/Card/components/Onboarding/Complete.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/Complete.test.tsx
@@ -81,6 +81,49 @@ jest.mock('./OnboardingStep', () => {
     );
 });
 
+// Mock design system components
+jest.mock('@metamask/design-system-react-native', () => {
+  // eslint-disable-next-line @typescript-eslint/no-shadow
+  const React = jest.requireActual('react');
+  const { View, Text } = jest.requireActual('react-native');
+
+  return {
+    Box: ({
+      children,
+      ...props
+    }: React.PropsWithChildren<Record<string, unknown>>) =>
+      React.createElement(View, props, children),
+    Text: ({
+      children,
+      testID,
+      ...props
+    }: React.PropsWithChildren<
+      { testID?: string } & Record<string, unknown>
+    >) => React.createElement(Text, { testID, ...props }, children),
+    TextVariant: {
+      BodyMd: 'BodyMd',
+      DisplayLg: 'DisplayLg',
+    },
+    FontFamily: {
+      Accent: 'accent',
+      Default: 'default',
+      Hero: 'hero',
+    },
+    FontWeight: {
+      Regular: '400',
+      Medium: '500',
+      Bold: '700',
+    },
+  };
+});
+
+// Mock useTailwind hook
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({
+    style: jest.fn(() => ({})),
+  }),
+}));
+
 // Mock Button component
 jest.mock('../../../../../component-library/components/Buttons/Button', () => {
   // eslint-disable-next-line @typescript-eslint/no-shadow
@@ -153,7 +196,7 @@ jest.mock('../../../../../../locales/i18n', () => ({
       'card.card_onboarding.complete.title': 'Complete',
       'card.card_onboarding.complete.description':
         'Your card setup is complete!',
-      'card.card_onboarding.confirm_button': 'Continue',
+      'card.card_onboarding.complete.confirm_button': 'Continue',
     };
     return translations[key] || key;
   }),
@@ -200,16 +243,18 @@ describe('Complete Component', () => {
       expect(getByTestId('onboarding-step')).toBeTruthy();
     });
 
-    it('renders with correct title and description', () => {
+    it('renders with empty title and description props to OnboardingStep', () => {
       const { getByTestId } = render(<Complete />);
 
+      // OnboardingStep receives empty strings for title and description
+      // as they are now rendered inside formFields
       const title = getByTestId('onboarding-step-title');
       expect(title).toBeTruthy();
-      expect(title.props.children).toBe('Complete');
+      expect(title.props.children).toBe('');
 
       const description = getByTestId('onboarding-step-description');
       expect(description).toBeTruthy();
-      expect(description.props.children).toBe('Your card setup is complete!');
+      expect(description.props.children).toBe('');
     });
 
     it('renders OnboardingStep with correct structure', () => {
@@ -217,7 +262,8 @@ describe('Complete Component', () => {
 
       const formFields = getByTestId('onboarding-step-form-fields');
       expect(formFields).toBeTruthy();
-      expect(formFields.props.children).toBeNull();
+      // formFields now contains the image, title, and description
+      expect(formFields.props.children).not.toBeNull();
 
       const actions = getByTestId('onboarding-step-actions');
       expect(actions).toBeTruthy();
@@ -326,17 +372,16 @@ describe('Complete Component', () => {
       const onboardingStep = getByTestId('onboarding-step');
       expect(onboardingStep).toBeTruthy();
 
-      // Verify title is passed correctly
+      // Verify title and description are empty strings (content is in formFields)
       const title = getByTestId('onboarding-step-title');
-      expect(title.props.children).toBe('Complete');
+      expect(title.props.children).toBe('');
 
-      // Verify description is passed correctly
       const description = getByTestId('onboarding-step-description');
-      expect(description.props.children).toBe('Your card setup is complete!');
+      expect(description.props.children).toBe('');
 
-      // Verify form fields are passed (null in this case)
+      // Verify form fields contain content (image, title, and description)
       const formFields = getByTestId('onboarding-step-form-fields');
-      expect(formFields.props.children).toBeNull();
+      expect(formFields.props.children).not.toBeNull();
 
       // Verify actions are passed
       const actions = getByTestId('onboarding-step-actions');
@@ -373,22 +418,24 @@ describe('Complete Component', () => {
         'card.card_onboarding.complete.description',
       );
       expect(strings).toHaveBeenCalledWith(
-        'card.card_onboarding.confirm_button',
+        'card.card_onboarding.complete.confirm_button',
       );
     });
 
-    it('renders translated title', () => {
+    it('renders empty OnboardingStep title prop', () => {
       const { getByTestId } = render(<Complete />);
 
+      // Title is now rendered in formFields, not passed to OnboardingStep
       const title = getByTestId('onboarding-step-title');
-      expect(title.props.children).toBe('Complete');
+      expect(title.props.children).toBe('');
     });
 
-    it('renders translated description', () => {
+    it('renders empty OnboardingStep description prop', () => {
       const { getByTestId } = render(<Complete />);
 
+      // Description is now rendered in formFields, not passed to OnboardingStep
       const description = getByTestId('onboarding-step-description');
-      expect(description.props.children).toBe('Your card setup is complete!');
+      expect(description.props.children).toBe('');
     });
 
     it('renders translated button label', () => {
diff --git a/app/components/UI/Card/components/Onboarding/Complete.tsx b/app/components/UI/Card/components/Onboarding/Complete.tsx
index 9fee9f72478..03f0d7c56df 100644
--- a/app/components/UI/Card/components/Onboarding/Complete.tsx
+++ b/app/components/UI/Card/components/Onboarding/Complete.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from 'react';
+import { Image } from 'react-native';
 import { StackActions, useNavigation } from '@react-navigation/native';
 import OnboardingStep from './OnboardingStep';
 import { strings } from '../../../../../../locales/i18n';
@@ -14,10 +15,20 @@ import { MetaMetricsEvents, useMetrics } from '../../../../hooks/useMetrics';
 import { CardActions, CardScreens } from '../../util/metrics';
 import { getCardBaanxToken } from '../../util/cardTokenVault';
 import Logger from '../../../../../util/Logger';
+import MM_CARD_ONBOARDING_SUCCESS from '../../../../../images/mm-card-onboarding-success.png';
+import {
+  Box,
+  FontFamily,
+  FontWeight,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 
 const Complete = () => {
   const navigation = useNavigation();
   const dispatch = useDispatch();
+  const tw = useTailwind();
   const [isLoading, setIsLoading] = useState(false);
   const { trackEvent, createEventBuilder } = useMetrics();
 
@@ -57,12 +68,35 @@ const Complete = () => {
     }
   };
 
-  const renderFormFields = () => null;
+  const renderFormFields = () => (
+    <>
+      <Box twClassName="flex flex-1 items-center justify-center">
+        <Image
+          source={MM_CARD_ONBOARDING_SUCCESS}
+          resizeMode="contain"
+          style={tw.style('w-full h-full')}
+        />
+      </Box>
+      <Text
+        fontFamily={FontFamily.Accent}
+        fontWeight={FontWeight.Regular}
+        twClassName="text-[36px] text-center leading-1"
+      >
+        {strings('card.card_onboarding.complete.title')}
+      </Text>
+      <Text
+        variant={TextVariant.BodyMd}
+        twClassName="text-center text-text-alternative px-4"
+      >
+        {strings('card.card_onboarding.complete.description')}
+      </Text>
+    </>
+  );
 
   const renderActions = () => (
     <Button
       variant={ButtonVariants.Primary}
-      label={strings('card.card_onboarding.confirm_button')}
+      label={strings('card.card_onboarding.complete.confirm_button')}
       size={ButtonSize.Lg}
       onPress={handleContinue}
       disabled={isLoading}
@@ -74,8 +108,8 @@ const Complete = () => {
 
   return (
     <OnboardingStep
-      title={strings('card.card_onboarding.complete.title')}
-      description={strings('card.card_onboarding.complete.description')}
+      title=""
+      description=""
       formFields={renderFormFields()}
       actions={renderActions()}
     />
diff --git a/app/components/UI/Card/components/Onboarding/ConfirmEmail.test.tsx b/app/components/UI/Card/components/Onboarding/ConfirmEmail.test.tsx
index e4d2f733845..cb0e21fc022 100644
--- a/app/components/UI/Card/components/Onboarding/ConfirmEmail.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/ConfirmEmail.test.tsx
@@ -306,6 +306,8 @@ jest.mock('../../../../../../locales/i18n', () => ({
           'Resend verification code',
         'card.card_onboarding.confirm_email.resend_cooldown':
           'Resend in {seconds}s',
+        'card.card_onboarding.confirm_email.didnt_receive_code':
+          "Didn't receive a code? ",
         'card.card_onboarding.continue_button': 'Continue',
       };
 
@@ -478,7 +480,7 @@ describe('ConfirmEmail Component', () => {
   });
 
   describe('Form Fields', () => {
-    it('should render confirmation code field with correct properties', () => {
+    it('renders confirmation code field with correct properties', () => {
       const store = createTestStore();
       const { getByTestId } = render(
         <Provider store={store}>
@@ -488,13 +490,9 @@ describe('ConfirmEmail Component', () => {
 
       const codeField = getByTestId('confirm-email-code-field');
       expect(codeField).toBeTruthy();
-      expect(codeField.props.keyboardType).toBe('number-pad');
-      expect(codeField.props.textContentType).toBe('oneTimeCode');
-      expect(codeField.props.autoComplete).toBe('one-time-code');
-      expect(codeField.props.maxLength).toBe(6);
     });
 
-    it('should render confirmation code label', () => {
+    it('renders code field input element', () => {
       const store = createTestStore();
       const { getByTestId } = render(
         <Provider store={store}>
@@ -502,23 +500,6 @@ describe('ConfirmEmail Component', () => {
         </Provider>,
       );
 
-      const label = getByTestId('label');
-      expect(label).toBeTruthy();
-      expect(label).toHaveTextContent('Confirmation code');
-    });
-
-    it('should render code field cells', () => {
-      const store = createTestStore();
-      const { getByTestId } = render(
-        <Provider store={store}>
-          <ConfirmEmail />
-        </Provider>,
-      );
-
-      const codeField = getByTestId('code-field');
-      expect(codeField).toBeTruthy();
-
-      // The code field should be present - cells are rendered internally
       const codeFieldInput = getByTestId('confirm-email-code-field');
       expect(codeFieldInput).toBeTruthy();
     });
@@ -795,9 +776,11 @@ describe('ConfirmEmail Component', () => {
     });
 
     it('calls sendEmailVerification when resend is pressed', async () => {
-      const mockSendEmailVerification = jest.fn().mockResolvedValue({});
+      const mockSendEmailVerificationLocal = jest.fn().mockResolvedValue({
+        contactVerificationId: 'new-contact-123',
+      });
       mockUseEmailVerificationSend.mockReturnValue({
-        sendEmailVerification: mockSendEmailVerification,
+        sendEmailVerification: mockSendEmailVerificationLocal,
         isLoading: false,
         isError: false,
         error: null,
@@ -805,14 +788,12 @@ describe('ConfirmEmail Component', () => {
       });
 
       const store = createTestStore();
-      const { getByTestId } = render(
+      const { getByText } = render(
         <Provider store={store}>
           <ConfirmEmail />
         </Provider>,
       );
 
-      const resendElement = getByTestId('confirm-email-resend-verification');
-
       // First, advance timer to end initial cooldown
       for (let i = 0; i < 60; i++) {
         act(() => {
@@ -820,11 +801,13 @@ describe('ConfirmEmail Component', () => {
         });
       }
 
+      // Press the resend link (inner Text element with onPress)
+      const resendLink = getByText('Resend verification code');
       await act(async () => {
-        fireEvent.press(resendElement);
+        fireEvent.press(resendLink);
       });
 
-      expect(mockSendEmailVerification).toHaveBeenCalledWith(
+      expect(mockSendEmailVerificationLocal).toHaveBeenCalledWith(
         'test@example.com',
       );
     });
@@ -855,7 +838,7 @@ describe('ConfirmEmail Component', () => {
 
       const resendElement = getByTestId('confirm-email-resend-verification');
 
-      // Should start with cooldown
+      // During cooldown, shows countdown text
       expect(resendElement).toHaveTextContent('Resend in 60s');
 
       // Advance timer by 60 seconds, one second at a time to trigger all timer callbacks
@@ -865,12 +848,14 @@ describe('ConfirmEmail Component', () => {
         });
       }
 
-      expect(resendElement).toHaveTextContent('Resend verification code');
+      // After cooldown, shows both "Didn't receive a code?" and "Resend verification code"
+      expect(resendElement).toHaveTextContent(/receive a code/i);
+      expect(resendElement).toHaveTextContent(/Resend verification code/i);
     });
 
     it('allows resend after initial cooldown expires', async () => {
       const store = createTestStore();
-      const { getByTestId } = render(
+      const { getByTestId, getByText } = render(
         <Provider store={store}>
           <ConfirmEmail />
         </Provider>,
@@ -885,12 +870,14 @@ describe('ConfirmEmail Component', () => {
         });
       }
 
-      // Should be able to resend now
-      expect(resendElement).toHaveTextContent('Resend verification code');
+      // After cooldown, shows both texts
+      expect(resendElement).toHaveTextContent(/receive a code/i);
+      expect(resendElement).toHaveTextContent(/Resend verification code/i);
 
-      // Press resend
+      // Press the resend link (inner Text element with onPress)
+      const resendLink = getByText('Resend verification code');
       await act(async () => {
-        fireEvent.press(resendElement);
+        fireEvent.press(resendLink);
         // Allow the async sendEmailVerification to complete
         await Promise.resolve();
         // Allow one timer tick to process
@@ -909,10 +896,14 @@ describe('ConfirmEmail Component', () => {
         });
       }
 
-      // Should be able to resend again
-      expect(resendElement).toHaveTextContent('Resend verification code');
+      // After cooldown, shows both texts again
+      expect(resendElement).toHaveTextContent(/receive a code/i);
+      expect(resendElement).toHaveTextContent(/Resend verification code/i);
+
+      // Press resend again
+      const resendLinkAgain = getByText('Resend verification code');
       await act(async () => {
-        fireEvent.press(resendElement);
+        fireEvent.press(resendLinkAgain);
         // Allow the async sendEmailVerification to complete
         await Promise.resolve();
         // Allow one timer tick to process
diff --git a/app/components/UI/Card/components/Onboarding/ConfirmEmail.tsx b/app/components/UI/Card/components/Onboarding/ConfirmEmail.tsx
index 23bed409cdb..c7a87b91cc2 100644
--- a/app/components/UI/Card/components/Onboarding/ConfirmEmail.tsx
+++ b/app/components/UI/Card/components/Onboarding/ConfirmEmail.tsx
@@ -6,7 +6,9 @@ import Button, {
   ButtonVariants,
   ButtonWidthTypes,
 } from '../../../../../component-library/components/Buttons/Button';
-import Label from '../../../../../component-library/components/Form/Label';
+import TextField, {
+  TextFieldSize,
+} from '../../../../../component-library/components/Form/TextField';
 import Routes from '../../../../../constants/navigation/Routes';
 import { strings } from '../../../../../../locales/i18n';
 import OnboardingStep from './OnboardingStep';
@@ -30,17 +32,9 @@ import {
 } from '../../../../../component-library/components/Toast';
 import { IconName } from '../../../../../component-library/components/Icons/Icon';
 import { useTheme } from '../../../../../util/theme';
-import { useStyles } from '../../../../hooks/useStyles';
-import { createOTPStyles } from './ConfirmPhoneNumber';
-import { Platform, TextInput, TextInputProps, View } from 'react-native';
-import {
-  CodeField,
-  Cursor,
-  useBlurOnFulfill,
-  useClearByFocusCell,
-} from 'react-native-confirmation-code-field';
+import { Platform, TextInputProps } from 'react-native';
 
-const CELL_COUNT = 6;
+const CODE_LENGTH = 6;
 const autoComplete = Platform.select<TextInputProps['autoComplete']>({
   android: 'sms-otp',
   default: 'one-time-code',
@@ -55,7 +49,6 @@ const ConfirmEmail = () => {
   const contactVerificationId = useSelector(selectContactVerificationId);
   const { trackEvent, createEventBuilder } = useMetrics();
   const { toastRef } = useContext(ToastContext);
-  const { styles } = useStyles(createOTPStyles, {});
   const [latestValueSubmitted, setLatestValueSubmitted] = useState<
     string | null
   >(null);
@@ -85,7 +78,9 @@ const ConfirmEmail = () => {
   const handleConfirmCodeChange = useCallback(
     (text: string) => {
       resetVerifyEmailVerification();
-      setConfirmCode(text);
+      // Filter to only allow numeric input and limit to CODE_LENGTH digits
+      const cleanedText = text.replace(/\D/g, '').slice(0, CODE_LENGTH);
+      setConfirmCode(cleanedText);
       setLatestValueSubmitted(null);
     },
     [resetVerifyEmailVerification],
@@ -213,21 +208,10 @@ const ConfirmEmail = () => {
     }
   }, [resendCooldown]);
 
-  const inputRef =
-    useBlurOnFulfill({
-      value: confirmCode,
-      cellCount: CELL_COUNT,
-    }) || null;
-
-  // Focus management
-  useEffect(() => {
-    inputRef.current?.focus();
-  }, [inputRef]);
-
   // Auto-submit when all digits are entered
   useEffect(() => {
     if (
-      confirmCode.length === CELL_COUNT &&
+      confirmCode.length === CODE_LENGTH &&
       latestValueSubmitted !== confirmCode
     ) {
       setLatestValueSubmitted(confirmCode);
@@ -235,11 +219,6 @@ const ConfirmEmail = () => {
     }
   }, [confirmCode, handleContinue, latestValueSubmitted]);
 
-  const [props, getCellOnLayoutHandler] = useClearByFocusCell({
-    value: confirmCode,
-    setValue: handleConfirmCodeChange,
-  });
-
   const isDisabled =
     verifyLoading ||
     verifyIsError ||
@@ -252,34 +231,22 @@ const ConfirmEmail = () => {
   const renderFormFields = () => (
     <>
       <Box>
-        <Label>
-          {strings('card.card_onboarding.confirm_email.confirm_code_label')}
-        </Label>
-        <CodeField
-          ref={inputRef as React.RefObject<TextInput>}
-          {...props}
-          value={confirmCode}
+        <TextField
+          autoCapitalize={'none'}
           onChangeText={handleConfirmCodeChange}
-          cellCount={CELL_COUNT}
-          rootStyle={styles.codeFieldRoot}
+          numberOfLines={1}
+          size={TextFieldSize.Lg}
+          value={confirmCode}
           keyboardType="number-pad"
           textContentType="oneTimeCode"
           autoComplete={autoComplete}
-          renderCell={({ index, symbol, isFocused }) => (
-            <View
-              onLayout={getCellOnLayoutHandler(index)}
-              key={index}
-              style={[styles.cellRoot, isFocused && styles.focusCell]}
-            >
-              <Text
-                variant={TextVariant.BodyLg}
-                twClassName="text-text-default font-bold text-center"
-              >
-                {symbol || (isFocused ? <Cursor /> : null)}
-              </Text>
-            </View>
+          maxLength={CODE_LENGTH}
+          accessibilityLabel={strings(
+            'card.card_onboarding.confirm_email.code_label',
           )}
+          isError={verifyIsError}
           testID="confirm-email-code-field"
+          autoFocus
         />
         {verifyIsError && (
           <Text
@@ -293,28 +260,38 @@ const ConfirmEmail = () => {
       </Box>
 
       {/* Resend verification */}
-      <Box twClassName="mt-4 items-center">
+      <Box twClassName="mt-2">
         <Text
-          variant={TextVariant.BodyMd}
-          twClassName={`${
-            resendCooldown > 0
-              ? 'text-text-alternative'
-              : 'text-primary-default cursor-pointer'
-          }`}
-          onPress={resendCooldown > 0 ? undefined : handleResendVerification}
-          disabled={
-            resendCooldown > 0 ||
-            !email ||
-            !selectedCountry ||
-            emailVerificationIsLoading
-          }
+          variant={TextVariant.BodySm}
+          twClassName="text-text-alternative"
           testID="confirm-email-resend-verification"
         >
-          {resendCooldown > 0
-            ? strings('card.card_onboarding.confirm_email.resend_cooldown', {
-                seconds: resendCooldown,
-              })
-            : strings('card.card_onboarding.confirm_email.resend_verification')}
+          {resendCooldown > 0 ? (
+            strings('card.card_onboarding.confirm_email.resend_cooldown', {
+              seconds: resendCooldown,
+            })
+          ) : (
+            <>
+              {strings('card.card_onboarding.confirm_email.didnt_receive_code')}
+              <Text
+                variant={TextVariant.BodySm}
+                twClassName="text-text-alternative underline"
+                onPress={
+                  resendCooldown > 0 ? undefined : handleResendVerification
+                }
+                disabled={
+                  resendCooldown > 0 ||
+                  !email ||
+                  !selectedCountry ||
+                  emailVerificationIsLoading
+                }
+              >
+                {strings(
+                  'card.card_onboarding.confirm_email.resend_verification',
+                )}
+              </Text>
+            </>
+          )}
         </Text>
         {emailVerificationIsError && (
           <Text
diff --git a/app/components/UI/Card/components/Onboarding/ConfirmPhoneNumber.test.tsx b/app/components/UI/Card/components/Onboarding/ConfirmPhoneNumber.test.tsx
index 170adc8f960..c63711d0591 100644
--- a/app/components/UI/Card/components/Onboarding/ConfirmPhoneNumber.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/ConfirmPhoneNumber.test.tsx
@@ -150,110 +150,59 @@ jest.mock('../../../../../component-library/components/Buttons/Button', () => {
   };
 });
 
-// Mock Label component
-jest.mock('../../../../../component-library/components/Form/Label', () => {
+// Mock TextField component
+jest.mock('../../../../../component-library/components/Form/TextField', () => {
   const React = jest.requireActual('react');
-  const { Text } = jest.requireActual('react-native');
+  const { View, TextInput } = jest.requireActual('react-native');
 
-  return ({
-    children,
+  const MockTextField = ({
+    value,
+    onChangeText,
     testID,
+    isError,
+    size,
+    ...props
   }: {
-    children: React.ReactNode;
+    value: string;
+    onChangeText?: (text: string) => void;
     testID?: string;
-  }) => React.createElement(Text, { testID: testID || 'label' }, children);
-});
-
-// Mock CodeField and related components
-jest.mock('react-native-confirmation-code-field', () => {
-  const React = jest.requireActual('react');
-  const { TextInput, View, Text } = jest.requireActual('react-native');
-
-  const MockCodeField = React.forwardRef(
-    (
-      {
-        value,
-        onChangeText,
-        cellCount,
-        keyboardType,
-        textContentType,
-        autoComplete,
-        renderCell,
-        rootStyle,
-        ...props
-      }: {
-        value: string;
-        onChangeText?: (text: string) => void;
-        cellCount: number;
-        keyboardType?: string;
-        textContentType?: string;
-        autoComplete?: string;
-        renderCell?: (params: {
-          index: number;
-          symbol: string;
-          isFocused: boolean;
-        }) => React.ReactNode;
-        rootStyle?: unknown;
-        [key: string]: unknown;
-      },
-      ref: React.Ref<typeof TextInput>,
-    ) =>
+    isError?: boolean;
+    size?: string;
+    [key: string]: unknown;
+  }) =>
+    React.createElement(
+      View,
+      { testID: 'textfield', accessible: true },
       React.createElement(
         View,
-        { testID: 'code-field', style: rootStyle },
+        null,
         React.createElement(TextInput, {
-          ref,
-          testID: 'confirm-phone-number-code-field',
+          testID: testID || 'textfield-input',
           value,
           onChangeText,
-          keyboardType,
-          textContentType,
-          autoComplete,
-          maxLength: cellCount,
+          editable: true,
           ...props,
         }),
-        // Render cells for visual representation
-        Array.from({ length: cellCount }, (_, index) => {
-          const symbol = value[index] || '';
-          const isFocused = index === value.length;
-          return renderCell
-            ? renderCell({ index, symbol, isFocused })
-            : React.createElement(
-                View,
-                { key: index, testID: `code-cell-${index}` },
-                React.createElement(Text, null, symbol),
-              );
-        }),
       ),
-  );
-
-  const MockCursor = () => React.createElement(Text, { testID: 'cursor' }, '|');
-
-  const mockUseBlurOnFulfill = jest.fn(() => {
-    const ref = React.useRef({
-      focus: jest.fn(),
-      blur: jest.fn(),
-    });
-    return ref;
-  });
+    );
 
   return {
-    CodeField: MockCodeField,
-    Cursor: MockCursor,
-    useClearByFocusCell: jest.fn(() => [{}, jest.fn()]),
-    useBlurOnFulfill: mockUseBlurOnFulfill,
+    __esModule: true,
+    default: MockTextField,
+    TextFieldSize: {
+      Lg: 'Lg',
+      Md: 'Md',
+      Sm: 'Sm',
+    },
   };
 });
 
-// Mock useStyles hook
-jest.mock('../../../../../component-library/hooks', () => ({
-  useStyles: jest.fn(() => ({
-    styles: {
-      codeFieldRoot: {},
-      cellRoot: {},
-      focusCell: {},
-    },
-  })),
+jest.mock('../../../../hooks/useMetrics', () => ({
+  useMetrics: jest.fn(),
+  MetaMetricsEvents: {
+    CARD_BUTTON_CLICKED: 'card_button_clicked',
+    CARD_VIEWED: 'card_viewed',
+  },
 }));
 
 // Mock i18n strings
@@ -267,10 +216,13 @@ jest.mock('../../../../../../locales/i18n', () => ({
           'We sent a 6-digit code to {phoneNumber}. Enter it below to verify your phone number.',
         'card.card_onboarding.confirm_phone_number.confirm_code_label':
           'Confirmation code',
-        'card.card_onboarding.confirm_phone_number.resend_verification':
+        // The component uses confirm_email strings for resend functionality
+        'card.card_onboarding.confirm_email.resend_verification':
           'Resend verification code',
-        'card.card_onboarding.confirm_phone_number.resend_cooldown':
+        'card.card_onboarding.confirm_email.resend_cooldown':
           'Resend in {seconds}s',
+        'card.card_onboarding.confirm_email.didnt_receive_code':
+          "Didn't receive a code? ",
         'card.card_onboarding.continue_button': 'Continue',
       };
 
@@ -366,6 +318,17 @@ describe('ConfirmPhoneNumber Component', () => {
       phoneNumber: '1234567890',
     });
 
+    // Set up useMetrics mock
+    const { useMetrics } = jest.requireMock('../../../../hooks/useMetrics');
+    useMetrics.mockReturnValue({
+      trackEvent: jest.fn(),
+      createEventBuilder: jest.fn(() => ({
+        addProperties: jest.fn(() => ({
+          build: jest.fn(() => ({})),
+        })),
+      })),
+    });
+
     // Set up default mock returns for hooks
     const mockVerifyPhoneVerification = jest.fn().mockResolvedValue({
       user: { id: 'user-123', name: 'Test User' },
@@ -431,7 +394,7 @@ describe('ConfirmPhoneNumber Component', () => {
   });
 
   describe('Form Fields', () => {
-    it('should render confirmation code field with correct properties', () => {
+    it('renders confirmation code field with correct properties', () => {
       const store = createTestStore();
       const { getByTestId } = render(
         <Provider store={store}>
@@ -441,26 +404,9 @@ describe('ConfirmPhoneNumber Component', () => {
 
       const codeField = getByTestId('confirm-phone-number-code-field');
       expect(codeField).toBeTruthy();
-      expect(codeField.props.keyboardType).toBe('number-pad');
-      expect(codeField.props.textContentType).toBe('oneTimeCode');
-      expect(codeField.props.autoComplete).toBe('one-time-code');
-      expect(codeField.props.maxLength).toBe(6);
-    });
-
-    it('should render confirmation code label', () => {
-      const store = createTestStore();
-      const { getByTestId } = render(
-        <Provider store={store}>
-          <ConfirmPhoneNumber />
-        </Provider>,
-      );
-
-      const label = getByTestId('label');
-      expect(label).toBeTruthy();
-      expect(label).toHaveTextContent('Confirmation code');
     });
 
-    it('should render code field cells', () => {
+    it('renders code field input element', () => {
       const store = createTestStore();
       const { getByTestId } = render(
         <Provider store={store}>
@@ -468,10 +414,6 @@ describe('ConfirmPhoneNumber Component', () => {
         </Provider>,
       );
 
-      const codeField = getByTestId('code-field');
-      expect(codeField).toBeTruthy();
-
-      // The code field should be present - cells are rendered internally
       const codeFieldInput = getByTestId('confirm-phone-number-code-field');
       expect(codeFieldInput).toBeTruthy();
     });
@@ -817,18 +759,16 @@ describe('ConfirmPhoneNumber Component', () => {
 
       const codeField = getByTestId('confirm-phone-number-code-field');
 
-      // Test normal input
+      // Test normal input - component filters non-numeric and limits to 6 digits
       fireEvent.changeText(codeField, '123456');
       expect(codeField.props.value).toBe('123456');
 
-      // The CodeField component itself handles the 6-digit limit internally
-      // We can't test the limit behavior directly as it's handled by the library
-      // Instead, we test that the component accepts the expected input format
+      // Test partial input
       fireEvent.changeText(codeField, '123');
       expect(codeField.props.value).toBe('123');
     });
 
-    it('has correct input properties for verification code', () => {
+    it('renders code field input element', () => {
       const store = createTestStore();
       const { getByTestId } = render(
         <Provider store={store}>
@@ -837,9 +777,7 @@ describe('ConfirmPhoneNumber Component', () => {
       );
 
       const codeField = getByTestId('confirm-phone-number-code-field');
-      expect(codeField.props.keyboardType).toBe('number-pad');
-      expect(codeField.props.textContentType).toBe('oneTimeCode');
-      expect(codeField.props.autoComplete).toBe('one-time-code');
+      expect(codeField).toBeTruthy();
     });
 
     it('shows error message when verification fails', () => {
@@ -1053,7 +991,7 @@ describe('ConfirmPhoneNumber Component', () => {
       });
     });
 
-    it('navigates to VERIFY_IDENTITY on successful verification', async () => {
+    it('navigates to VERIFY_IDENTITYon successful verification', async () => {
       const mockVerifyPhoneVerification = jest.fn().mockResolvedValue({
         user: { id: 'user-123' },
       });
@@ -1146,7 +1084,7 @@ describe('ConfirmPhoneNumber Component', () => {
       });
 
       const store = createTestStore();
-      const { getByTestId } = render(
+      const { getByTestId, getByText } = render(
         <Provider store={store}>
           <ConfirmPhoneNumber />
         </Provider>,
@@ -1163,13 +1101,15 @@ describe('ConfirmPhoneNumber Component', () => {
         });
       }
 
-      // Ensure UI reflects expired cooldown
+      // Ensure UI reflects expired cooldown (shows both "Didn't receive a code?" and "Resend verification code")
       await waitFor(() => {
-        expect(resendElement).toHaveTextContent('Resend verification code');
+        expect(resendElement).toHaveTextContent(/Resend verification code/);
       });
 
+      // Press the resend link (the inner Text element with onPress handler)
+      const resendLink = getByText('Resend verification code');
       await act(async () => {
-        fireEvent.press(resendElement);
+        fireEvent.press(resendLink);
       });
 
       expect(mockSendPhoneVerification).toHaveBeenCalledWith({
@@ -1272,7 +1212,7 @@ describe('ConfirmPhoneNumber Component', () => {
         reset: jest.fn(),
       });
 
-      const { getByTestId } = render(
+      const { getByText } = render(
         <Provider store={store}>
           <ConfirmPhoneNumber />
         </Provider>,
@@ -1285,12 +1225,11 @@ describe('ConfirmPhoneNumber Component', () => {
         });
       }
 
-      const resendElementAfterCooldown = getByTestId(
-        'confirm-phone-number-resend-verification',
-      );
+      // Find the resend link text within the resend verification element
+      const resendLink = getByText('Resend verification code');
 
       await act(async () => {
-        fireEvent.press(resendElementAfterCooldown);
+        fireEvent.press(resendLink);
         await Promise.resolve();
       });
 
@@ -1415,15 +1354,6 @@ describe('ConfirmPhoneNumber Component', () => {
     });
 
     it('shows "Resend verification code" when cooldown expires', async () => {
-      const mockSendPhoneVerification = jest.fn().mockResolvedValue({});
-      (mockUsePhoneVerificationSend as jest.Mock).mockReturnValue({
-        sendPhoneVerification: mockSendPhoneVerification,
-        isLoading: false,
-        isError: false,
-        error: null,
-        reset: jest.fn(),
-      });
-
       const store = createTestStore();
       const { getByTestId } = render(
         <Provider store={store}>
@@ -1435,16 +1365,7 @@ describe('ConfirmPhoneNumber Component', () => {
         'confirm-phone-number-resend-verification',
       );
 
-      // Trigger resend and wait for state updates
-      await act(async () => {
-        fireEvent.press(resendElement);
-        // Allow the async sendPhoneVerification to complete
-        await Promise.resolve();
-        // Allow one timer tick to process
-        jest.advanceTimersByTime(0);
-      });
-
-      // Should start at 60 seconds
+      // Initial state shows cooldown (60s on mount)
       expect(resendElement).toHaveTextContent('Resend in 60s');
 
       // Advance timer by 60 seconds to expire cooldown (step per second)
@@ -1454,7 +1375,9 @@ describe('ConfirmPhoneNumber Component', () => {
         });
       }
 
-      expect(resendElement).toHaveTextContent('Resend verification code');
+      // After cooldown expires, shows both "Didn't receive a code?" and "Resend verification code"
+      expect(resendElement).toHaveTextContent(/receive a code/i);
+      expect(resendElement).toHaveTextContent(/Resend verification code/i);
     });
 
     it('allows resend after cooldown expires', async () => {
@@ -1468,7 +1391,7 @@ describe('ConfirmPhoneNumber Component', () => {
       });
 
       const store = createTestStore();
-      const { getByTestId } = render(
+      const { getByTestId, getByText } = render(
         <Provider store={store}>
           <ConfirmPhoneNumber />
         </Provider>,
@@ -1478,14 +1401,17 @@ describe('ConfirmPhoneNumber Component', () => {
         'confirm-phone-number-resend-verification',
       );
 
-      // Expire initial cooldown and perform first resend
+      // Expire initial cooldown
       for (let i = 0; i < 60; i++) {
         act(() => {
           jest.advanceTimersByTime(1000);
         });
       }
+
+      // Press the resend link
+      const resendLink = getByText('Resend verification code');
       await act(async () => {
-        fireEvent.press(resendElement);
+        fireEvent.press(resendLink);
         await Promise.resolve();
       });
       expect(mockSendPhoneVerification).toHaveBeenCalledTimes(1);
@@ -1501,10 +1427,10 @@ describe('ConfirmPhoneNumber Component', () => {
       }
 
       // Should be able to resend again
-      expect(resendElement).toHaveTextContent('Resend verification code');
+      expect(resendElement).toHaveTextContent(/Resend verification code/);
+      const resendLinkAgain = getByText('Resend verification code');
       await act(async () => {
-        fireEvent.press(resendElement);
-        // Allow the async sendPhoneVerification to complete
+        fireEvent.press(resendLinkAgain);
         await Promise.resolve();
       });
       expect(mockSendPhoneVerification).toHaveBeenCalledTimes(2);
@@ -1521,7 +1447,7 @@ describe('ConfirmPhoneNumber Component', () => {
       });
 
       const store = createTestStore();
-      const { getByTestId } = render(
+      const { getByTestId, getByText } = render(
         <Provider store={store}>
           <ConfirmPhoneNumber />
         </Provider>,
@@ -1531,22 +1457,24 @@ describe('ConfirmPhoneNumber Component', () => {
         'confirm-phone-number-resend-verification',
       );
 
-      // Expire initial cooldown and perform first resend
+      // Expire initial cooldown
       for (let i = 0; i < 60; i++) {
         act(() => {
           jest.advanceTimersByTime(1000);
         });
       }
+
+      // Perform first resend
+      const resendLink = getByText('Resend verification code');
       await act(async () => {
-        fireEvent.press(resendElement);
+        fireEvent.press(resendLink);
         await Promise.resolve();
       });
       expect(mockSendPhoneVerification).toHaveBeenCalledTimes(1);
 
-      // Try to resend during cooldown
+      // Now in cooldown - try to resend (pressing the container won't work during cooldown)
       await act(async () => {
         fireEvent.press(resendElement);
-        // Allow the async sendPhoneVerification to complete
         await Promise.resolve();
       });
       expect(mockSendPhoneVerification).toHaveBeenCalledTimes(1); // Should not increase
@@ -1606,7 +1534,7 @@ describe('ConfirmPhoneNumber Component', () => {
       });
 
       const store = createTestStore();
-      const { getByTestId } = render(
+      const { getByTestId, getByText } = render(
         <Provider store={store}>
           <ConfirmPhoneNumber />
         </Provider>,
@@ -1618,22 +1546,24 @@ describe('ConfirmPhoneNumber Component', () => {
           jest.advanceTimersByTime(1000);
         });
       }
-      // Re-query element after re-render
-      const resendElementAfterCooldown = getByTestId(
+
+      // Press the resend link
+      const resendLink = getByText('Resend verification code');
+      const resendElement = getByTestId(
         'confirm-phone-number-resend-verification',
       );
 
       // Multiple rapid presses
       await act(async () => {
-        fireEvent.press(resendElementAfterCooldown);
-        fireEvent.press(resendElementAfterCooldown);
-        fireEvent.press(resendElementAfterCooldown);
+        fireEvent.press(resendLink);
+        fireEvent.press(resendElement);
+        fireEvent.press(resendElement);
         await Promise.resolve();
       });
 
-      // Should only send once
+      // Should only send once due to ref guard
       expect(mockSendPhoneVerification).toHaveBeenCalledTimes(1);
-      expect(resendElementAfterCooldown).toHaveTextContent('Resend in 60s');
+      expect(resendElement).toHaveTextContent('Resend in 60s');
     });
 
     it('maintains cooldown state during loading', async () => {
@@ -1647,7 +1577,7 @@ describe('ConfirmPhoneNumber Component', () => {
       });
 
       const store = createTestStore();
-      const { getByTestId } = render(
+      const { getByTestId, getByText } = render(
         <Provider store={store}>
           <ConfirmPhoneNumber />
         </Provider>,
@@ -1660,18 +1590,17 @@ describe('ConfirmPhoneNumber Component', () => {
         });
       }
       // Re-query element after re-render
-      const resendElementAfterCooldownLoading = getByTestId(
+      const resendElement = getByTestId(
         'confirm-phone-number-resend-verification',
       );
 
-      // Should show original text when loading (no cooldown)
-      expect(resendElementAfterCooldownLoading).toHaveTextContent(
-        'Resend verification code',
-      );
+      // Should show text when cooldown expires (even during loading)
+      expect(resendElement).toHaveTextContent(/Resend verification code/);
 
       // Should not be able to press during loading
+      const resendLink = getByText('Resend verification code');
       await act(async () => {
-        fireEvent.press(resendElementAfterCooldownLoading);
+        fireEvent.press(resendLink);
         await Promise.resolve();
       });
 
diff --git a/app/components/UI/Card/components/Onboarding/ConfirmPhoneNumber.tsx b/app/components/UI/Card/components/Onboarding/ConfirmPhoneNumber.tsx
index c7f7be783b2..1f774b06e47 100644
--- a/app/components/UI/Card/components/Onboarding/ConfirmPhoneNumber.tsx
+++ b/app/components/UI/Card/components/Onboarding/ConfirmPhoneNumber.tsx
@@ -1,31 +1,19 @@
 import React, { useState, useCallback, useEffect, useRef } from 'react';
 import { useNavigation } from '@react-navigation/native';
-import {
-  View,
-  TextInput,
-  StyleSheet,
-  TextInputProps,
-  Platform,
-} from 'react-native';
+import { Platform, TextInputProps } from 'react-native';
 import { Box, Text, TextVariant } from '@metamask/design-system-react-native';
 import Button, {
   ButtonSize,
   ButtonVariants,
   ButtonWidthTypes,
 } from '../../../../../component-library/components/Buttons/Button';
-import Label from '../../../../../component-library/components/Form/Label';
+import TextField, {
+  TextFieldSize,
+} from '../../../../../component-library/components/Form/TextField';
 import Routes from '../../../../../constants/navigation/Routes';
 import { strings } from '../../../../../../locales/i18n';
 import OnboardingStep from './OnboardingStep';
 import { useParams } from '../../../../../util/navigation/navUtils';
-import {
-  CodeField,
-  Cursor,
-  useBlurOnFulfill,
-  useClearByFocusCell,
-} from 'react-native-confirmation-code-field';
-import { useStyles } from '../../../../../component-library/hooks';
-import { Theme } from '../../../../../util/theme/models';
 import usePhoneVerificationVerify from '../../hooks/usePhoneVerificationVerify';
 import {
   resetOnboardingState,
@@ -39,45 +27,16 @@ import { useCardSDK } from '../../sdk';
 import { MetaMetricsEvents, useMetrics } from '../../../../hooks/useMetrics';
 import { CardActions, CardScreens } from '../../util/metrics';
 
-const CELL_COUNT = 6;
+const CODE_LENGTH = 6;
 const autoComplete = Platform.select<TextInputProps['autoComplete']>({
   android: 'sms-otp',
   default: 'one-time-code',
 });
 
-// Styles for the OTP CodeField
-export const createOTPStyles = (params: { theme: Theme }) => {
-  const { theme } = params;
-
-  return StyleSheet.create({
-    codeFieldRoot: {
-      marginTop: 8,
-      gap: 8,
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-    },
-    cellRoot: {
-      width: 48,
-      height: 48,
-      justifyContent: 'center',
-      alignItems: 'center',
-      backgroundColor: theme.colors.background.default,
-      borderWidth: 1,
-      borderColor: theme.colors.border.default,
-      borderRadius: 8,
-    },
-    focusCell: {
-      borderColor: theme.colors.primary.default,
-      borderWidth: 2,
-    },
-  });
-};
-
 const ConfirmPhoneNumber = () => {
   const navigation = useNavigation();
   const dispatch = useDispatch();
   const { setUser } = useCardSDK();
-  const { styles } = useStyles(createOTPStyles, {});
   const [resendCooldown, setResendCooldown] = useState(60);
   const [confirmCode, setConfirmCode] = useState('');
   const resendInProgressRef = useRef(false);
@@ -111,7 +70,7 @@ const ConfirmPhoneNumber = () => {
   const handleContinue = useCallback(async () => {
     if (
       !confirmCode ||
-      confirmCode.length !== CELL_COUNT ||
+      confirmCode.length !== CODE_LENGTH ||
       !onboardingId ||
       !phoneNumber ||
       !phoneCountryCode ||
@@ -175,7 +134,9 @@ const ConfirmPhoneNumber = () => {
   const handleValueChange = useCallback(
     (text: string) => {
       resetVerifyPhoneVerification();
-      setConfirmCode(text);
+      // Filter to only allow numeric input and limit to CODE_LENGTH digits
+      const cleanedText = text.replace(/\D/g, '').slice(0, CODE_LENGTH);
+      setConfirmCode(cleanedText);
       setLatestValueSubmitted(null);
     },
     [resetVerifyPhoneVerification],
@@ -248,21 +209,10 @@ const ConfirmPhoneNumber = () => {
     }
   }, [resendCooldown]);
 
-  const inputRef =
-    useBlurOnFulfill({
-      value: confirmCode,
-      cellCount: CELL_COUNT,
-    }) || null;
-
-  // Focus management
-  useEffect(() => {
-    inputRef.current?.focus();
-  }, [inputRef]);
-
   // Auto-submit when all digits are entered
   useEffect(() => {
     if (
-      confirmCode.length === CELL_COUNT &&
+      confirmCode.length === CODE_LENGTH &&
       latestValueSubmitted !== confirmCode
     ) {
       setLatestValueSubmitted(confirmCode);
@@ -270,16 +220,11 @@ const ConfirmPhoneNumber = () => {
     }
   }, [confirmCode, handleContinue, latestValueSubmitted]);
 
-  const [props, getCellOnLayoutHandler] = useClearByFocusCell({
-    value: confirmCode,
-    setValue: handleValueChange,
-  });
-
   const isDisabled =
     verifyLoading ||
     verifyIsError ||
     !confirmCode ||
-    confirmCode.length !== CELL_COUNT ||
+    confirmCode.length !== CODE_LENGTH ||
     !onboardingId ||
     !phoneNumber ||
     !phoneCountryCode;
@@ -287,36 +232,22 @@ const ConfirmPhoneNumber = () => {
   const renderFormFields = () => (
     <>
       <Box>
-        <Label>
-          {strings(
-            'card.card_onboarding.confirm_phone_number.confirm_code_label',
-          )}
-        </Label>
-        <CodeField
-          ref={inputRef as React.RefObject<TextInput>}
-          {...props}
-          value={confirmCode}
+        <TextField
+          autoCapitalize={'none'}
           onChangeText={handleValueChange}
-          cellCount={CELL_COUNT}
-          rootStyle={styles.codeFieldRoot}
+          numberOfLines={1}
+          size={TextFieldSize.Lg}
+          value={confirmCode}
           keyboardType="number-pad"
           textContentType="oneTimeCode"
           autoComplete={autoComplete}
-          renderCell={({ index, symbol, isFocused }) => (
-            <View
-              onLayout={getCellOnLayoutHandler(index)}
-              key={index}
-              style={[styles.cellRoot, isFocused && styles.focusCell]}
-            >
-              <Text
-                variant={TextVariant.BodyLg}
-                twClassName="text-text-default font-bold text-center"
-              >
-                {symbol || (isFocused ? <Cursor /> : null)}
-              </Text>
-            </View>
+          maxLength={CODE_LENGTH}
+          accessibilityLabel={strings(
+            'card.card_onboarding.confirm_phone_number.confirm_code_label',
           )}
+          isError={verifyIsError}
           testID="confirm-phone-number-code-field"
+          autoFocus
         />
         {verifyIsError && (
           <Text
@@ -330,34 +261,39 @@ const ConfirmPhoneNumber = () => {
       </Box>
 
       {/* Resend verification */}
-      <Box twClassName="mt-4 items-center">
+      <Box twClassName="mt-2">
         <Text
-          variant={TextVariant.BodyMd}
-          twClassName={`${
-            resendCooldown > 0
-              ? 'text-text-alternative'
-              : 'text-primary-default cursor-pointer'
-          }`}
-          onPress={resendCooldown > 0 ? undefined : handleResendVerification}
-          disabled={
-            resendCooldown > 0 ||
-            !phoneNumber ||
-            !phoneCountryCode ||
-            !contactVerificationId ||
-            phoneVerificationIsLoading
-          }
+          variant={TextVariant.BodySm}
+          twClassName="text-text-alternative"
           testID="confirm-phone-number-resend-verification"
         >
-          {resendCooldown > 0
-            ? strings(
-                'card.card_onboarding.confirm_phone_number.resend_cooldown',
-                {
-                  seconds: resendCooldown,
-                },
-              )
-            : strings(
-                'card.card_onboarding.confirm_phone_number.resend_verification',
-              )}
+          {resendCooldown > 0 ? (
+            strings('card.card_onboarding.confirm_email.resend_cooldown', {
+              seconds: resendCooldown,
+            })
+          ) : (
+            <>
+              {strings('card.card_onboarding.confirm_email.didnt_receive_code')}
+              <Text
+                variant={TextVariant.BodySm}
+                twClassName="text-text-alternative underline"
+                onPress={
+                  resendCooldown > 0 ? undefined : handleResendVerification
+                }
+                disabled={
+                  resendCooldown > 0 ||
+                  !phoneNumber ||
+                  !phoneCountryCode ||
+                  !contactVerificationId ||
+                  phoneVerificationIsLoading
+                }
+              >
+                {strings(
+                  'card.card_onboarding.confirm_email.resend_verification',
+                )}
+              </Text>
+            </>
+          )}
         </Text>
         {phoneVerificationIsError && (
           <Text
diff --git a/app/components/UI/Card/components/Onboarding/KYCFailed.test.tsx b/app/components/UI/Card/components/Onboarding/KYCFailed.test.tsx
index 93630d33ec3..c4eb6040ed8 100644
--- a/app/components/UI/Card/components/Onboarding/KYCFailed.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/KYCFailed.test.tsx
@@ -3,12 +3,20 @@ import { render, fireEvent } from '@testing-library/react-native';
 import { useNavigation } from '@react-navigation/native';
 import KYCFailed from './KYCFailed';
 import Routes from '../../../../../constants/navigation/Routes';
+import { useMetrics } from '../../../../hooks/useMetrics';
 
 // Mock dependencies
 jest.mock('@react-navigation/native', () => ({
   useNavigation: jest.fn(),
 }));
 
+jest.mock('../../../../hooks/useMetrics', () => ({
+  useMetrics: jest.fn(),
+  MetaMetricsEvents: {
+    CARD_VIEWED: 'CARD_VIEWED',
+  },
+}));
+
 // Mock OnboardingStep component
 jest.mock('./OnboardingStep', () => {
   const React = jest.requireActual('react');
@@ -43,6 +51,51 @@ jest.mock('./OnboardingStep', () => {
     );
 });
 
+// Mock design system components
+jest.mock('@metamask/design-system-react-native', () => {
+  const React = jest.requireActual('react');
+  const { View, Text } = jest.requireActual('react-native');
+
+  return {
+    Box: ({
+      children,
+      ...props
+    }: React.PropsWithChildren<Record<string, unknown>>) =>
+      React.createElement(View, props, children),
+    Text: ({
+      children,
+      ...props
+    }: React.PropsWithChildren<Record<string, unknown>>) =>
+      React.createElement(Text, props, children),
+    FontFamily: {},
+    FontWeight: {},
+    TextVariant: {
+      BodyMd: 'BodyMd',
+    },
+  };
+});
+
+// Mock react-native Image
+jest.mock('react-native', () => {
+  const RN = jest.requireActual('react-native');
+  const React = jest.requireActual('react');
+
+  return {
+    ...RN,
+    Image: ({
+      testID,
+      ...props
+    }: {
+      testID?: string;
+      [key: string]: unknown;
+    }) =>
+      React.createElement(RN.View, {
+        testID: testID || 'kyc-failed-image',
+        ...props,
+      }),
+  };
+});
+
 // Mock Button component
 jest.mock('../../../../../component-library/components/Buttons/Button', () => {
   const React = jest.requireActual('react');
@@ -113,7 +166,7 @@ jest.mock('../../../../../../locales/i18n', () => ({
       'card.card_onboarding.kyc_failed.title': 'KYC Failed',
       'card.card_onboarding.kyc_failed.description':
         'Your KYC verification failed. Please try again with correct information.',
-      'card.card_onboarding.retry_button': 'Retry',
+      'card.card_onboarding.kyc_failed.close_button': 'Close',
     };
     return translations[key] || key;
   }),
@@ -121,12 +174,23 @@ jest.mock('../../../../../../locales/i18n', () => ({
 
 describe('KYCFailed Component', () => {
   const mockNavigate = jest.fn();
+  const mockTrackEvent = jest.fn();
+  const mockCreateEventBuilder = jest.fn();
 
   beforeEach(() => {
     jest.clearAllMocks();
     (useNavigation as jest.Mock).mockReturnValue({
       navigate: mockNavigate,
     });
+    mockCreateEventBuilder.mockReturnValue({
+      addProperties: jest.fn().mockReturnValue({
+        build: jest.fn().mockReturnValue({ event: 'test' }),
+      }),
+    });
+    (useMetrics as jest.Mock).mockReturnValue({
+      trackEvent: mockTrackEvent,
+      createEventBuilder: mockCreateEventBuilder,
+    });
   });
 
   describe('Component Rendering', () => {
@@ -154,15 +218,15 @@ describe('KYCFailed Component', () => {
       );
     });
 
-    it('renders form fields section as null', () => {
+    it('renders form fields section with image', () => {
       const { getByTestId } = render(<KYCFailed />);
 
       const formFields = getByTestId('onboarding-step-form-fields');
       expect(formFields).toBeTruthy();
-      expect(formFields.props.children).toBeNull();
+      expect(formFields.props.children).toBeTruthy();
     });
 
-    it('renders actions section with retry button', () => {
+    it('renders actions section with close button', () => {
       const { getByTestId } = render(<KYCFailed />);
 
       const actions = getByTestId('onboarding-step-actions');
@@ -171,19 +235,11 @@ describe('KYCFailed Component', () => {
     });
   });
 
-  describe('Retry Button', () => {
-    it('renders the retry button with correct testID', () => {
+  describe('Close Button', () => {
+    it('renders the close button with correct testID', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      const button = getByTestId('kyc-failed-retry-button');
-      expect(button).toBeTruthy();
-    });
-
-    it('renders retry button with specific testID from component', () => {
-      const { getByTestId } = render(<KYCFailed />);
-
-      // The component should render with kyc-failed-retry-button testID
-      const button = getByTestId('kyc-failed-retry-button');
+      const button = getByTestId('kyc-failed-close-button');
       expect(button).toBeTruthy();
     });
 
@@ -192,44 +248,45 @@ describe('KYCFailed Component', () => {
 
       const buttonLabel = getByTestId('button-label');
       expect(buttonLabel).toBeTruthy();
-      expect(buttonLabel.props.children).toBe('Retry');
+      expect(buttonLabel.props.children).toBe('Close');
     });
 
     it('is not disabled by default', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      const button = getByTestId('kyc-failed-retry-button');
+      const button = getByTestId('kyc-failed-close-button');
       expect(button.props.disabled).toBeFalsy();
     });
 
-    it('navigates to verify identity when pressed', () => {
+    it('navigates to wallet home when pressed', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      const button = getByTestId('kyc-failed-retry-button');
+      const button = getByTestId('kyc-failed-close-button');
       fireEvent.press(button);
 
       expect(mockNavigate).toHaveBeenCalledTimes(1);
-      expect(mockNavigate).toHaveBeenCalledWith(
-        Routes.CARD.ONBOARDING.VERIFY_IDENTITY,
-      );
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
     });
 
     it('calls navigation only once per button press', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      const button = getByTestId('kyc-failed-retry-button');
+      const button = getByTestId('kyc-failed-close-button');
       fireEvent.press(button);
       fireEvent.press(button);
 
       expect(mockNavigate).toHaveBeenCalledTimes(2);
-      expect(mockNavigate).toHaveBeenNthCalledWith(
-        1,
-        Routes.CARD.ONBOARDING.VERIFY_IDENTITY,
-      );
-      expect(mockNavigate).toHaveBeenNthCalledWith(
-        2,
-        Routes.CARD.ONBOARDING.VERIFY_IDENTITY,
-      );
+      expect(mockNavigate).toHaveBeenNthCalledWith(1, Routes.WALLET.HOME);
+      expect(mockNavigate).toHaveBeenNthCalledWith(2, Routes.WALLET.HOME);
+    });
+  });
+
+  describe('Metrics Tracking', () => {
+    it('tracks CARD_VIEWED event on mount', () => {
+      render(<KYCFailed />);
+
+      expect(mockCreateEventBuilder).toHaveBeenCalled();
+      expect(mockTrackEvent).toHaveBeenCalled();
     });
   });
 
@@ -240,15 +297,13 @@ describe('KYCFailed Component', () => {
       expect(useNavigation).toHaveBeenCalledTimes(1);
     });
 
-    it('calls navigate with correct route when retry is pressed', () => {
+    it('calls navigate with correct route when close is pressed', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      const button = getByTestId('kyc-failed-retry-button');
+      const button = getByTestId('kyc-failed-close-button');
       fireEvent.press(button);
 
-      expect(mockNavigate).toHaveBeenCalledWith(
-        Routes.CARD.ONBOARDING.VERIFY_IDENTITY,
-      );
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
     });
   });
 
@@ -269,9 +324,9 @@ describe('KYCFailed Component', () => {
         'Your KYC verification failed. Please try again with correct information.',
       );
 
-      // Verify form fields are passed (null in this case)
+      // Verify form fields are passed (contains image)
       const formFields = getByTestId('onboarding-step-form-fields');
-      expect(formFields.props.children).toBeNull();
+      expect(formFields.props.children).toBeTruthy();
 
       // Verify actions are passed
       const actions = getByTestId('onboarding-step-actions');
@@ -293,24 +348,21 @@ describe('KYCFailed Component', () => {
     it('configures button with primary variant', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      const button = getByTestId('kyc-failed-retry-button');
-      // The button should be rendered with primary variant
+      const button = getByTestId('kyc-failed-close-button');
       expect(button).toBeTruthy();
     });
 
     it('configures button with large size', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      const button = getByTestId('kyc-failed-retry-button');
-      // The button should be rendered with large size
+      const button = getByTestId('kyc-failed-close-button');
       expect(button).toBeTruthy();
     });
 
     it('configures button with full width', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      const button = getByTestId('kyc-failed-retry-button');
-      // The button should be rendered with full width
+      const button = getByTestId('kyc-failed-close-button');
       expect(button).toBeTruthy();
     });
 
@@ -318,7 +370,7 @@ describe('KYCFailed Component', () => {
       const { getByTestId } = render(<KYCFailed />);
 
       const buttonLabel = getByTestId('button-label');
-      expect(buttonLabel.props.children).toBe('Retry');
+      expect(buttonLabel.props.children).toBe('Close');
     });
   });
 
@@ -329,20 +381,18 @@ describe('KYCFailed Component', () => {
       const title = getByTestId('onboarding-step-title');
       const description = getByTestId('onboarding-step-description');
 
-      // Verify error state is communicated through title and description
       expect(title.props.children).toBe('KYC Failed');
       expect(description.props.children).toContain('failed');
       expect(description.props.children).toContain('try again');
     });
 
-    it('provides retry functionality', () => {
+    it('provides close functionality', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      const button = getByTestId('kyc-failed-retry-button');
+      const button = getByTestId('kyc-failed-close-button');
       const buttonLabel = getByTestId('button-label');
 
-      // Verify retry functionality is available
-      expect(buttonLabel.props.children).toBe('Retry');
+      expect(buttonLabel.props.children).toBe('Close');
       expect(button.props.onPress).toBeDefined();
     });
 
@@ -358,26 +408,22 @@ describe('KYCFailed Component', () => {
   });
 
   describe('User Flow Integration', () => {
-    it('navigates back to verify identity for retry', () => {
+    it('navigates to wallet home on close', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      const button = getByTestId('kyc-failed-retry-button');
+      const button = getByTestId('kyc-failed-close-button');
       fireEvent.press(button);
 
-      // Verify navigation goes to verify identity step for retry
-      expect(mockNavigate).toHaveBeenCalledWith(
-        Routes.CARD.ONBOARDING.VERIFY_IDENTITY,
-      );
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
     });
 
     it('maintains user flow continuity', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      const button = getByTestId('kyc-failed-retry-button');
+      const button = getByTestId('kyc-failed-close-button');
       expect(button).toBeTruthy();
       expect(button.props.onPress).toBeDefined();
 
-      // Verify the retry flow is accessible
       fireEvent.press(button);
       expect(mockNavigate).toHaveBeenCalled();
     });
@@ -386,44 +432,45 @@ describe('KYCFailed Component', () => {
   describe('i18n Integration', () => {
     it('uses correct i18n keys for title', () => {
       const { getByTestId } = render(<KYCFailed />);
+
       const title = getByTestId('onboarding-step-title');
       expect(title.props.children).toBe('KYC Failed');
     });
 
     it('uses correct i18n keys for description', () => {
       const { getByTestId } = render(<KYCFailed />);
+
       const description = getByTestId('onboarding-step-description');
       expect(description.props.children).toBe(
         'Your KYC verification failed. Please try again with correct information.',
       );
     });
 
-    it('uses correct i18n key for retry button', () => {
+    it('uses correct i18n key for close button', () => {
       const { getByTestId } = render(<KYCFailed />);
+
       const buttonLabel = getByTestId('button-label');
-      expect(buttonLabel.props.children).toBe('Retry');
+      expect(buttonLabel.props.children).toBe('Close');
     });
   });
 
   describe('testID Coverage', () => {
-    it('renders component with kyc-failed-retry-button testID', () => {
+    it('renders component with kyc-failed-close-button testID', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      // The actual component uses kyc-failed-retry-button testID
-      const button = getByTestId('kyc-failed-retry-button');
+      const button = getByTestId('kyc-failed-close-button');
       expect(button).toBeTruthy();
     });
 
     it('provides testID for all interactive elements', () => {
       const { getByTestId } = render(<KYCFailed />);
 
-      // Verify all testable elements are present
       expect(getByTestId('onboarding-step')).toBeTruthy();
       expect(getByTestId('onboarding-step-title')).toBeTruthy();
       expect(getByTestId('onboarding-step-description')).toBeTruthy();
       expect(getByTestId('onboarding-step-form-fields')).toBeTruthy();
       expect(getByTestId('onboarding-step-actions')).toBeTruthy();
-      expect(getByTestId('kyc-failed-retry-button')).toBeTruthy();
+      expect(getByTestId('kyc-failed-close-button')).toBeTruthy();
       expect(getByTestId('button-label')).toBeTruthy();
     });
   });
diff --git a/app/components/UI/Card/components/Onboarding/KYCFailed.tsx b/app/components/UI/Card/components/Onboarding/KYCFailed.tsx
index c40ce383d41..0bd34a23a43 100644
--- a/app/components/UI/Card/components/Onboarding/KYCFailed.tsx
+++ b/app/components/UI/Card/components/Onboarding/KYCFailed.tsx
@@ -1,4 +1,5 @@
-import React, { useEffect } from 'react';
+import React, { useCallback, useEffect } from 'react';
+import { Image } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import OnboardingStep from './OnboardingStep';
 import { strings } from '../../../../../../locales/i18n';
@@ -10,9 +11,13 @@ import Button, {
 import Routes from '../../../../../constants/navigation/Routes';
 import { MetaMetricsEvents, useMetrics } from '../../../../hooks/useMetrics';
 import { CardScreens } from '../../util/metrics';
+import MM_CARD_ONBOARDING_FAILED from '../../../../../images/mm-card-onboarding-failed.png';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { Box } from '@metamask/design-system-react-native';
 
 const KYCFailed = () => {
   const navigation = useNavigation();
+  const tw = useTailwind();
   const { trackEvent, createEventBuilder } = useMetrics();
 
   useEffect(() => {
@@ -25,20 +30,28 @@ const KYCFailed = () => {
     );
   }, [trackEvent, createEventBuilder]);
 
-  const handleContinue = () => {
-    navigation.navigate(Routes.CARD.ONBOARDING.VERIFY_IDENTITY);
-  };
+  const handleClose = useCallback(() => {
+    navigation.navigate(Routes.WALLET.HOME);
+  }, [navigation]);
 
-  const renderFormFields = () => null;
+  const renderFormFields = () => (
+    <Box twClassName="flex flex-1 items-center justify-center">
+      <Image
+        source={MM_CARD_ONBOARDING_FAILED}
+        resizeMode="contain"
+        style={tw.style('w-full h-full')}
+      />
+    </Box>
+  );
 
   const renderActions = () => (
     <Button
       variant={ButtonVariants.Primary}
-      label={strings('card.card_onboarding.retry_button')}
+      label={strings('card.card_onboarding.kyc_failed.close_button')}
       size={ButtonSize.Lg}
-      onPress={handleContinue}
+      onPress={handleClose}
       width={ButtonWidthTypes.Full}
-      testID="kyc-failed-retry-button"
+      testID="kyc-failed-close-button"
     />
   );
 
diff --git a/app/components/UI/Card/components/Onboarding/KYCWebview.tsx b/app/components/UI/Card/components/Onboarding/KYCWebview.tsx
index f7ffda1ab1f..d0beb997ab4 100644
--- a/app/components/UI/Card/components/Onboarding/KYCWebview.tsx
+++ b/app/components/UI/Card/components/Onboarding/KYCWebview.tsx
@@ -23,7 +23,7 @@ const KYCWebview: React.FC = () => {
       )
     ) {
       navigation.dispatch(
-        StackActions.replace(Routes.CARD.ONBOARDING.VALIDATING_KYC),
+        StackActions.replace(Routes.CARD.ONBOARDING.PERSONAL_DETAILS),
       );
     }
   };
diff --git a/app/components/UI/Card/components/Onboarding/MailingAddress.test.tsx b/app/components/UI/Card/components/Onboarding/MailingAddress.test.tsx
index fe4cc540a69..600f1bc1a90 100644
--- a/app/components/UI/Card/components/Onboarding/MailingAddress.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/MailingAddress.test.tsx
@@ -833,7 +833,17 @@ describe('MailingAddress Component', () => {
   describe('Edge Cases', () => {
     it('handles empty Redux state gracefully', () => {
       const { useSelector } = jest.requireMock('react-redux');
-      useSelector.mockImplementation(() => ({}));
+      useSelector.mockImplementation((selector: any) =>
+        selector({
+          card: {
+            onboarding: {
+              selectedCountry: null,
+              onboardingId: null,
+              consentSetId: null,
+            },
+          },
+        }),
+      );
 
       const { getByTestId } = render(
         <Provider store={store}>
diff --git a/app/components/UI/Card/components/Onboarding/OnboardingStep.test.tsx b/app/components/UI/Card/components/Onboarding/OnboardingStep.test.tsx
index 03c1c8c78ac..03550b950c9 100644
--- a/app/components/UI/Card/components/Onboarding/OnboardingStep.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/OnboardingStep.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render } from '@testing-library/react-native';
-import { Text, View, TouchableOpacity, Image } from 'react-native';
+import { Text, View, TouchableOpacity } from 'react-native';
 import OnboardingStep from './OnboardingStep';
 
 // Mock dependencies
@@ -55,15 +55,12 @@ jest.mock('@metamask/design-system-react-native', () => {
         children,
       ),
     TextVariant: {
-      HeadingMd: 'HeadingMd',
+      HeadingLg: 'HeadingLg',
       BodyMd: 'BodyMd',
     },
   };
 });
 
-// Mock the FOX logo image
-jest.mock('../../../../../images/branding/fox.png', () => 'fox-logo');
-
 describe('OnboardingStep Component', () => {
   const defaultProps = {
     title: 'Test Title',
@@ -216,22 +213,13 @@ describe('OnboardingStep Component', () => {
   });
 
   describe('Critical Visual Elements', () => {
-    it('displays the FOX logo image', () => {
-      const { UNSAFE_getByType } = render(<OnboardingStep {...defaultProps} />);
-
-      const images = UNSAFE_getByType(Image);
-      expect(images).toBeDefined();
-      expect(images.props.source).toBe('fox-logo');
-      expect(images.props.resizeMode).toBe('contain');
-    });
-
     it('displays the title with correct variant and styling', () => {
       const { getByText } = render(<OnboardingStep {...defaultProps} />);
 
       const titleElement = getByText('Test Title');
       expect(titleElement).toBeDefined();
-      expect(titleElement.props['data-variant']).toBe('HeadingMd');
-      expect(titleElement.props['data-tw-class']).toContain('text-center');
+      expect(titleElement.props['data-variant']).toBe('HeadingLg');
+      expect(titleElement.props['data-tw-class']).toContain('text-default');
     });
 
     it('displays the description with correct variant and styling', () => {
@@ -241,7 +229,7 @@ describe('OnboardingStep Component', () => {
       expect(descriptionElement).toBeDefined();
       expect(descriptionElement.props['data-variant']).toBe('BodyMd');
       expect(descriptionElement.props['data-tw-class']).toContain(
-        'text-center',
+        'text-text-alternative',
       );
     });
 
@@ -458,7 +446,7 @@ describe('OnboardingStep Component', () => {
       const { getByText } = render(<OnboardingStep {...defaultProps} />);
 
       const titleElement = getByText('Test Title');
-      expect(titleElement.props['data-variant']).toBe('HeadingMd');
+      expect(titleElement.props['data-variant']).toBe('HeadingLg');
 
       const descriptionElement = getByText('Test Description');
       expect(descriptionElement.props['data-variant']).toBe('BodyMd');
diff --git a/app/components/UI/Card/components/Onboarding/OnboardingStep.tsx b/app/components/UI/Card/components/Onboarding/OnboardingStep.tsx
index 87e839b8078..c6a93e1820a 100644
--- a/app/components/UI/Card/components/Onboarding/OnboardingStep.tsx
+++ b/app/components/UI/Card/components/Onboarding/OnboardingStep.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
-import { Image, Platform } from 'react-native';
+import { Platform } from 'react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { Box, Text, TextVariant } from '@metamask/design-system-react-native';
-import MM_CARD_MOCKUP from '../../../../../images/mm-card-mockup.png';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
@@ -35,20 +34,12 @@ const OnboardingStep = ({
         extraScrollHeight={Platform.OS === 'android' ? 20 : 0}
       >
         <Box twClassName="flex-1 items-stretch gap-4 mb-6">
-          {/* Card Mockup Image */}
-          <Box twClassName="items-center">
-            <Image
-              source={MM_CARD_MOCKUP}
-              style={tw.style('w-full h-52')}
-              resizeMode="contain"
-            />
-          </Box>
-          <Box twClassName="gap-2">
+          <Box twClassName="gap-4 my-2">
             {/* Title */}
             <Text
-              variant={TextVariant.HeadingMd}
+              variant={TextVariant.HeadingLg}
               testID="onboarding-step-title"
-              twClassName="text-center text-default"
+              twClassName="text-default"
             >
               {title}
             </Text>
@@ -57,7 +48,7 @@ const OnboardingStep = ({
             <Text
               variant={TextVariant.BodyMd}
               testID="onboarding-step-description"
-              twClassName="text-center"
+              twClassName="text-text-alternative"
             >
               {description}
             </Text>
diff --git a/app/components/UI/Card/components/Onboarding/PersonalDetails.test.tsx b/app/components/UI/Card/components/Onboarding/PersonalDetails.test.tsx
index 8235dab4fda..c0ae90ea1ea 100644
--- a/app/components/UI/Card/components/Onboarding/PersonalDetails.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/PersonalDetails.test.tsx
@@ -320,6 +320,7 @@ import { CardError, CardErrorType } from '../../types';
 
 // Mock implementations
 const mockNavigate = jest.fn();
+const mockReset = jest.fn();
 const mockDispatch = jest.fn();
 const mockRegisterPersonalDetails = jest.fn();
 const mockSetUser = jest.fn();
@@ -332,6 +333,7 @@ const mockCreateEventBuilder = jest.fn(() => ({
 // Mock hooks
 (useNavigation as jest.Mock).mockReturnValue({
   navigate: mockNavigate,
+  reset: mockReset,
 });
 
 (useDispatch as jest.Mock).mockReturnValue(mockDispatch);
@@ -795,7 +797,7 @@ describe('PersonalDetails Component', () => {
       });
 
       expect(mockSetUser).toHaveBeenCalledWith(mockUser);
-      expect(mockNavigate).toHaveBeenCalled();
+      expect(mockReset).toHaveBeenCalled();
     });
 
     it('disables continue button when required fields are missing', () => {
diff --git a/app/components/UI/Card/components/Onboarding/PersonalDetails.tsx b/app/components/UI/Card/components/Onboarding/PersonalDetails.tsx
index 5373639a4cb..441e0d80149 100644
--- a/app/components/UI/Card/components/Onboarding/PersonalDetails.tsx
+++ b/app/components/UI/Card/components/Onboarding/PersonalDetails.tsx
@@ -206,7 +206,10 @@ const PersonalDetails = () => {
 
       if (user) {
         setUser(user);
-        navigation.navigate(Routes.CARD.ONBOARDING.PHYSICAL_ADDRESS);
+        navigation.reset({
+          index: 0,
+          routes: [{ name: Routes.CARD.ONBOARDING.PHYSICAL_ADDRESS }],
+        });
       }
     } catch (error) {
       if (
@@ -272,9 +275,6 @@ const PersonalDetails = () => {
         <TextField
           autoCapitalize={'none'}
           onChangeText={setFirstName}
-          placeholder={strings(
-            'card.card_onboarding.personal_details.first_name_placeholder',
-          )}
           numberOfLines={1}
           size={TextFieldSize.Lg}
           value={firstName}
@@ -295,9 +295,6 @@ const PersonalDetails = () => {
         <TextField
           autoCapitalize={'none'}
           onChangeText={setLastName}
-          placeholder={strings(
-            'card.card_onboarding.personal_details.last_name_placeholder',
-          )}
           numberOfLines={1}
           size={TextFieldSize.Lg}
           value={lastName}
@@ -331,9 +328,6 @@ const PersonalDetails = () => {
             selectedValue={nationality}
             options={selectOptions}
             onValueChange={handleNationalitySelect}
-            defaultValue={strings(
-              'card.card_onboarding.personal_details.nationality_placeholder',
-            )}
             testID="personal-details-nationality-select"
           />
         </Box>
@@ -348,9 +342,6 @@ const PersonalDetails = () => {
           <TextField
             autoCapitalize={'none'}
             onChangeText={handleSSNChange}
-            placeholder={strings(
-              'card.card_onboarding.personal_details.ssn_placeholder',
-            )}
             numberOfLines={1}
             size={TextFieldSize.Lg}
             value={SSN}
@@ -377,16 +368,7 @@ const PersonalDetails = () => {
   );
 
   const renderActions = () => (
-    <Box>
-      <Button
-        variant={ButtonVariants.Primary}
-        label={strings('card.card_onboarding.continue_button')}
-        size={ButtonSize.Lg}
-        onPress={handleContinue}
-        width={ButtonWidthTypes.Full}
-        isDisabled={isDisabled}
-        testID="personal-details-continue-button"
-      />
+    <Box twClassName="flex flex-col justify-center gap-2">
       {!!registerError && (
         <Text
           variant={TextVariant.BodySm}
@@ -396,6 +378,15 @@ const PersonalDetails = () => {
           {registerError}
         </Text>
       )}
+      <Button
+        variant={ButtonVariants.Primary}
+        label={strings('card.card_onboarding.continue_button')}
+        size={ButtonSize.Lg}
+        onPress={handleContinue}
+        width={ButtonWidthTypes.Full}
+        isDisabled={isDisabled}
+        testID="personal-details-continue-button"
+      />
     </Box>
   );
 
diff --git a/app/components/UI/Card/components/Onboarding/PhysicalAddress.test.tsx b/app/components/UI/Card/components/Onboarding/PhysicalAddress.test.tsx
index a083ed89f83..0dd002e4382 100644
--- a/app/components/UI/Card/components/Onboarding/PhysicalAddress.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/PhysicalAddress.test.tsx
@@ -54,6 +54,46 @@ jest.mock('../../util/extractTokenExpiration', () => ({
   extractTokenExpiration: jest.fn(() => 3600000),
 }));
 
+// Mock useTailwind
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: jest.fn(() => ({
+    style: jest.fn((...args: string[]) => args),
+  })),
+}));
+
+// Mock Checkbox component
+jest.mock('../../../../../component-library/components/Checkbox', () => {
+  // eslint-disable-next-line @typescript-eslint/no-shadow
+  const React = jest.requireActual('react');
+  const { TouchableOpacity, View } = jest.requireActual('react-native');
+
+  return ({
+    testID,
+    isChecked,
+    onPress,
+    label,
+  }: {
+    testID?: string;
+    isChecked?: boolean;
+    onPress?: () => void;
+    label?: React.ReactNode;
+  }) =>
+    React.createElement(
+      TouchableOpacity,
+      {
+        testID,
+        onPress,
+        accessibilityState: { checked: isChecked },
+      },
+      React.createElement(
+        View,
+        { testID: `${testID}-indicator` },
+        isChecked ? '✓' : '',
+      ),
+      label,
+    );
+});
+
 // Mock OnboardingStep component
 jest.mock('./OnboardingStep', () => {
   // eslint-disable-next-line @typescript-eslint/no-shadow
@@ -116,13 +156,6 @@ jest.mock('@metamask/design-system-react-native', () => {
   };
 });
 
-// Mock Tailwind
-jest.mock('@metamask/design-system-twrnc-preset', () => ({
-  useTailwind: jest.fn(() => ({
-    style: jest.fn((styles) => styles),
-  })),
-}));
-
 // Mock TextField
 jest.mock('../../../../../component-library/components/Form/TextField', () => {
   // eslint-disable-next-line @typescript-eslint/no-shadow
@@ -182,46 +215,6 @@ jest.mock('../../../../../component-library/components/Form/Label', () => {
     React.createElement(Text, props, children);
 });
 
-// Mock Checkbox
-jest.mock('../../../../../component-library/components/Checkbox', () => {
-  // eslint-disable-next-line @typescript-eslint/no-shadow
-  const React = jest.requireActual('react');
-  const { TouchableOpacity, Text } = jest.requireActual('react-native');
-
-  return ({
-    label,
-    isChecked,
-    onPress,
-    testID,
-  }: {
-    label: string;
-    isChecked: boolean;
-    onPress: () => void;
-    testID?: string;
-  }) => {
-    const [checked, setChecked] = React.useState(isChecked);
-
-    const handlePress = () => {
-      setChecked(!checked);
-      onPress?.();
-    };
-
-    return React.createElement(
-      TouchableOpacity,
-      {
-        testID,
-        onPress: handlePress,
-      },
-      React.createElement(Text, { testID: `${testID}-text` }, label),
-      React.createElement(
-        Text,
-        { testID: `${testID}-status` },
-        checked ? 'checked' : 'unchecked',
-      ),
-    );
-  };
-});
-
 // Mock Button
 jest.mock('../../../../../component-library/components/Buttons/Button', () => {
   // eslint-disable-next-line @typescript-eslint/no-shadow
@@ -290,26 +283,36 @@ jest.mock('../../../SelectComponent', () => {
     options,
     selectedValue,
     defaultValue,
+    disabled,
   }: {
     testID?: string;
     onValueChange?: (value: string) => void;
     options?: { key: string; value: string; label: string }[];
     selectedValue?: string;
     defaultValue?: string;
+    disabled?: boolean;
   }) => {
     const handlePress = () => {
-      if (options && options.length > 0 && onValueChange) {
+      if (!disabled && options && options.length > 0 && onValueChange) {
         onValueChange(options[0].value);
       }
     };
 
+    // Find the label for the selected value
+    const selectedLabel =
+      options?.find((opt) => opt.value === selectedValue)?.label ||
+      selectedValue ||
+      defaultValue ||
+      'Select';
+
     return React.createElement(
       TouchableOpacity,
       {
         testID,
         onPress: handlePress,
+        disabled,
       },
-      React.createElement(Text, {}, selectedValue || defaultValue || 'Select'),
+      React.createElement(Text, {}, selectedLabel),
     );
   };
 });
@@ -336,10 +339,13 @@ jest.mock('../../../../../../locales/i18n', () => ({
       'card.card_onboarding.physical_address.zip_code_label': 'ZIP Code',
       'card.card_onboarding.physical_address.zip_code_placeholder':
         'Enter ZIP code',
-      'card.card_onboarding.physical_address.same_mailing_address_label':
-        'Use same address for mailing',
+      'card.card_onboarding.physical_address.country_label': 'Country',
       'card.card_onboarding.physical_address.electronic_consent':
         'I consent to electronic communications',
+      'card.card_onboarding.physical_address.electronic_consent_1':
+        'I agree to the ',
+      'card.card_onboarding.physical_address.electronic_consent_2':
+        'E-Sign Consent Disclosure',
       'card.card_onboarding.continue_button': 'Continue',
     };
     return translations[key] || key;
@@ -483,7 +489,7 @@ describe('PhysicalAddress Component', () => {
             termsAndConditions: '',
             accountOpeningDisclosure: '',
             noticeOfPrivacy: '',
-            eSignConsentDisclosure: '',
+            eSignConsentDisclosure: 'https://example.com/esign',
           },
           intl: { termsAndConditions: '', rightToInformation: '' },
         },
@@ -538,7 +544,7 @@ describe('PhysicalAddress Component', () => {
   });
 
   describe('Initial Render', () => {
-    it('renders the component successfully', () => {
+    it('renders the component', () => {
       const { getByTestId } = render(
         <Provider store={store}>
           <PhysicalAddress />
@@ -587,19 +593,14 @@ describe('PhysicalAddress Component', () => {
       expect(getByTestId('state-select')).toBeTruthy();
     });
 
-    it('renders checkboxes', () => {
+    it('renders country field', () => {
       const { getByTestId } = render(
         <Provider store={store}>
           <PhysicalAddress />
         </Provider>,
       );
 
-      expect(
-        getByTestId('physical-address-same-mailing-address-checkbox'),
-      ).toBeTruthy();
-      expect(
-        getByTestId('physical-address-electronic-consent-checkbox'),
-      ).toBeTruthy();
+      expect(getByTestId('country-select')).toBeTruthy();
     });
 
     it('renders continue button', () => {
@@ -653,7 +654,7 @@ describe('PhysicalAddress Component', () => {
       expect(input.props.value).toBe('San Francisco');
     });
 
-    it('handles ZIP code input with numeric filtering', () => {
+    it('handles ZIP code input', () => {
       const { getByTestId } = render(
         <Provider store={store}>
           <PhysicalAddress />
@@ -661,10 +662,9 @@ describe('PhysicalAddress Component', () => {
       );
 
       const input = getByTestId('zip-code-input');
-      fireEvent.changeText(input, 'abc12345def');
+      fireEvent.changeText(input, '12345');
 
-      // The implementation doesn't filter, so it should keep the full input
-      expect(input.props.value).toBe('abc12345def');
+      expect(input.props.value).toBe('12345');
     });
 
     it('handles state selection', () => {
@@ -677,111 +677,10 @@ describe('PhysicalAddress Component', () => {
       const select = getByTestId('state-select');
       fireEvent.press(select);
 
-      // Verify the select component is interactive
       expect(select).toBeTruthy();
     });
   });
 
-  describe('Checkbox Interactions', () => {
-    it('handles same mailing address checkbox toggle', () => {
-      const { getByTestId } = render(
-        <Provider store={store}>
-          <PhysicalAddress />
-        </Provider>,
-      );
-
-      const checkbox = getByTestId(
-        'physical-address-same-mailing-address-checkbox',
-      );
-      const status = getByTestId(
-        'physical-address-same-mailing-address-checkbox-status',
-      );
-
-      // The checkbox starts as checked (true) because isSameMailingAddress defaults to true
-      expect(status.props.children).toBe('checked');
-
-      fireEvent.press(checkbox);
-      expect(status.props.children).toBe('unchecked');
-    });
-
-    it('handles electronic consent checkbox toggle for US users', () => {
-      const { getByTestId } = render(
-        <Provider store={store}>
-          <PhysicalAddress />
-        </Provider>,
-      );
-
-      const checkbox = getByTestId(
-        'physical-address-electronic-consent-checkbox',
-      );
-      const status = getByTestId(
-        'physical-address-electronic-consent-checkbox-status',
-      );
-
-      expect(status.props.children).toBe('unchecked');
-
-      fireEvent.press(checkbox);
-      expect(status.props.children).toBe('checked');
-    });
-
-    it('shows electronic consent checkbox for US users', () => {
-      const { getByTestId } = render(
-        <Provider store={store}>
-          <PhysicalAddress />
-        </Provider>,
-      );
-
-      // Electronic consent checkbox should be visible for US users
-      expect(
-        getByTestId('physical-address-electronic-consent-checkbox'),
-      ).toBeTruthy();
-    });
-
-    it('hides electronic consent checkbox for international users', () => {
-      // Create store with international country
-      const intlStore = createTestStore({
-        onboarding: {
-          selectedCountry: 'CA', // Canada as international
-          onboardingId: 'test-id',
-          contactVerificationId: 'contact-id',
-          user: {
-            id: 'user-id',
-            email: 'test@example.com',
-          },
-        },
-        userCardLocation: 'intl',
-      });
-
-      // Mock useSelector for international users
-      const { useSelector } = jest.requireMock('react-redux');
-      useSelector.mockImplementation((selector: any) =>
-        selector({
-          card: {
-            onboarding: {
-              selectedCountry: 'CA',
-              onboardingId: 'test-id',
-              user: {
-                id: 'user-id',
-                email: 'test@example.com',
-              },
-            },
-          },
-        }),
-      );
-
-      const { queryByTestId } = render(
-        <Provider store={intlStore}>
-          <PhysicalAddress />
-        </Provider>,
-      );
-
-      // Electronic consent checkbox should not be visible for international users
-      expect(
-        queryByTestId('physical-address-electronic-consent-checkbox'),
-      ).toBeNull();
-    });
-  });
-
   describe('Form Validation', () => {
     it('disables continue button when required fields are empty', () => {
       const { getByTestId } = render(
@@ -806,18 +705,10 @@ describe('PhysicalAddress Component', () => {
       fireEvent.changeText(getByTestId('city-input'), 'San Francisco');
       fireEvent.changeText(getByTestId('zip-code-input'), '12345');
       fireEvent.press(getByTestId('state-select'));
-
-      // Check all required checkboxes for US users
+      // Check the electronic consent checkbox
       fireEvent.press(
         getByTestId('physical-address-electronic-consent-checkbox'),
       );
-      fireEvent.press(
-        getByTestId('physical-address-account-opening-disclosure-checkbox'),
-      );
-      fireEvent.press(
-        getByTestId('physical-address-terms-and-conditions-checkbox'),
-      );
-      fireEvent.press(getByTestId('physical-address-privacy-policy-checkbox'));
 
       // Wait for state updates
       await new Promise((resolve) => setTimeout(resolve, 50));
@@ -826,19 +717,17 @@ describe('PhysicalAddress Component', () => {
       expect(button.props.disabled).toBe(false);
     });
 
-    it('requires electronic consent for form validation', () => {
+    it('requires state for US users', () => {
       const { getByTestId } = render(
         <Provider store={store}>
           <PhysicalAddress />
         </Provider>,
       );
 
-      // Fill all fields except consent (don't press electronic consent checkbox)
+      // Fill all fields except state
       fireEvent.changeText(getByTestId('address-line-1-input'), '123 Main St');
       fireEvent.changeText(getByTestId('city-input'), 'San Francisco');
       fireEvent.changeText(getByTestId('zip-code-input'), '12345');
-      fireEvent.press(getByTestId('state-select'));
-      // Note: electronic consent starts as false, so we don't press it
 
       const button = getByTestId('physical-address-continue-button');
       expect(button.props.disabled).toBe(true);
@@ -846,7 +735,7 @@ describe('PhysicalAddress Component', () => {
   });
 
   describe('Navigation', () => {
-    it('navigates to mailing address when same address is not checked', async () => {
+    it('navigates to VALIDATING_KYC when registration is complete', async () => {
       const mockGetOnboardingConsentSetByOnboardingId = jest
         .fn()
         .mockResolvedValue(null);
@@ -855,7 +744,7 @@ describe('PhysicalAddress Component', () => {
         .mockResolvedValue('consent-set-123');
       const mockLinkUserToConsent = jest.fn().mockResolvedValue(undefined);
       const mockRegisterAddress = jest.fn().mockResolvedValue({
-        accessToken: null,
+        accessToken: 'test-token',
         user: { id: 'user-id' },
       });
 
@@ -893,21 +782,9 @@ describe('PhysicalAddress Component', () => {
       fireEvent.changeText(getByTestId('city-input'), 'San Francisco');
       fireEvent.changeText(getByTestId('zip-code-input'), '12345');
       fireEvent.press(getByTestId('state-select'));
-
       fireEvent.press(
         getByTestId('physical-address-electronic-consent-checkbox'),
       );
-      fireEvent.press(
-        getByTestId('physical-address-account-opening-disclosure-checkbox'),
-      );
-      fireEvent.press(
-        getByTestId('physical-address-terms-and-conditions-checkbox'),
-      );
-      fireEvent.press(getByTestId('physical-address-privacy-policy-checkbox'));
-
-      fireEvent.press(
-        getByTestId('physical-address-same-mailing-address-checkbox'),
-      );
 
       await waitFor(() => {
         const button = getByTestId('physical-address-continue-button');
@@ -920,16 +797,6 @@ describe('PhysicalAddress Component', () => {
         fireEvent.press(button);
       });
 
-      await waitFor(() => {
-        expect(mockGetOnboardingConsentSetByOnboardingId).toHaveBeenCalledWith(
-          'test-id',
-        );
-      });
-
-      await waitFor(() => {
-        expect(mockCreateOnboardingConsent).toHaveBeenCalledWith('test-id');
-      });
-
       await waitFor(() => {
         expect(mockRegisterAddress).toHaveBeenCalledWith({
           onboardingId: 'test-id',
@@ -938,20 +805,24 @@ describe('PhysicalAddress Component', () => {
           city: 'San Francisco',
           usState: 'CA',
           zip: '12345',
-          isSameMailingAddress: false,
+          isSameMailingAddress: true,
         });
       });
 
-      expect(mockLinkUserToConsent).not.toHaveBeenCalled();
-
-      await waitFor(() => {
-        expect(mockNavigate).toHaveBeenCalledWith(
-          Routes.CARD.ONBOARDING.MAILING_ADDRESS,
-        );
-      });
+      await waitFor(
+        () => {
+          expect(mockReset).toHaveBeenCalledWith({
+            index: 0,
+            routes: [{ name: Routes.CARD.ONBOARDING.VALIDATING_KYC }],
+          });
+        },
+        { timeout: 3000 },
+      );
     });
+  });
 
-    it('navigates to complete when same address is checked and access token is present', async () => {
+  describe('Consent Management', () => {
+    it('creates new consent when no existing consent found', async () => {
       const mockGetOnboardingConsentSetByOnboardingId = jest
         .fn()
         .mockResolvedValue(null);
@@ -998,17 +869,9 @@ describe('PhysicalAddress Component', () => {
       fireEvent.changeText(getByTestId('city-input'), 'San Francisco');
       fireEvent.changeText(getByTestId('zip-code-input'), '12345');
       fireEvent.press(getByTestId('state-select'));
-
       fireEvent.press(
         getByTestId('physical-address-electronic-consent-checkbox'),
       );
-      fireEvent.press(
-        getByTestId('physical-address-account-opening-disclosure-checkbox'),
-      );
-      fireEvent.press(
-        getByTestId('physical-address-terms-and-conditions-checkbox'),
-      );
-      fireEvent.press(getByTestId('physical-address-privacy-policy-checkbox'));
 
       await waitFor(() => {
         const button = getByTestId('physical-address-continue-button');
@@ -1030,47 +893,17 @@ describe('PhysicalAddress Component', () => {
       await waitFor(() => {
         expect(mockCreateOnboardingConsent).toHaveBeenCalledWith('test-id');
       });
-
-      await waitFor(() => {
-        expect(mockRegisterAddress).toHaveBeenCalledWith({
-          onboardingId: 'test-id',
-          addressLine1: '123 Main St',
-          addressLine2: '',
-          city: 'San Francisco',
-          usState: 'CA',
-          zip: '12345',
-          isSameMailingAddress: true,
-        });
-      });
-
-      await waitFor(() => {
-        expect(mockLinkUserToConsent).toHaveBeenCalledWith(
-          'consent-set-123',
-          'user-id',
-        );
-      });
-
-      // Wait for token storage and Redux updates before navigation
-      await waitFor(
-        () => {
-          expect(mockReset).toHaveBeenCalledWith({
-            index: 0,
-            routes: [{ name: Routes.CARD.VERIFYING_REGISTRATION }],
-          });
-        },
-        { timeout: 3000 },
-      );
     });
-  });
 
-  describe('Consent Management', () => {
-    it('creates new consent when no existing consent found', async () => {
+    it('reuses existing incomplete consent', async () => {
       const mockGetOnboardingConsentSetByOnboardingId = jest
         .fn()
-        .mockResolvedValue(null);
-      const mockCreateOnboardingConsent = jest
-        .fn()
-        .mockResolvedValue('consent-set-123');
+        .mockResolvedValue({
+          consentSetId: 'existing-consent-123',
+          userId: null,
+          completedAt: null,
+        });
+      const mockCreateOnboardingConsent = jest.fn();
       const mockLinkUserToConsent = jest.fn().mockResolvedValue(undefined);
       const mockRegisterAddress = jest.fn().mockResolvedValue({
         accessToken: 'test-token',
@@ -1114,13 +947,6 @@ describe('PhysicalAddress Component', () => {
       fireEvent.press(
         getByTestId('physical-address-electronic-consent-checkbox'),
       );
-      fireEvent.press(
-        getByTestId('physical-address-account-opening-disclosure-checkbox'),
-      );
-      fireEvent.press(
-        getByTestId('physical-address-terms-and-conditions-checkbox'),
-      );
-      fireEvent.press(getByTestId('physical-address-privacy-policy-checkbox'));
 
       await waitFor(() => {
         const button = getByTestId('physical-address-continue-button');
@@ -1139,21 +965,26 @@ describe('PhysicalAddress Component', () => {
         );
       });
 
+      expect(mockCreateOnboardingConsent).not.toHaveBeenCalled();
+
       await waitFor(() => {
-        expect(mockCreateOnboardingConsent).toHaveBeenCalledWith('test-id');
+        expect(mockLinkUserToConsent).toHaveBeenCalledWith(
+          'existing-consent-123',
+          'user-id',
+        );
       });
     });
 
-    it('reuses existing incomplete consent', async () => {
+    it('skips consent operations when consent already completed', async () => {
       const mockGetOnboardingConsentSetByOnboardingId = jest
         .fn()
         .mockResolvedValue({
-          consentSetId: 'existing-consent-123',
-          userId: null,
-          completedAt: null,
+          consentSetId: 'completed-consent-123',
+          userId: 'user-id',
+          completedAt: '2024-01-01T00:00:00.000Z',
         });
       const mockCreateOnboardingConsent = jest.fn();
-      const mockLinkUserToConsent = jest.fn().mockResolvedValue(undefined);
+      const mockLinkUserToConsent = jest.fn();
       const mockRegisterAddress = jest.fn().mockResolvedValue({
         accessToken: 'test-token',
         user: { id: 'user-id' },
@@ -1196,13 +1027,6 @@ describe('PhysicalAddress Component', () => {
       fireEvent.press(
         getByTestId('physical-address-electronic-consent-checkbox'),
       );
-      fireEvent.press(
-        getByTestId('physical-address-account-opening-disclosure-checkbox'),
-      );
-      fireEvent.press(
-        getByTestId('physical-address-terms-and-conditions-checkbox'),
-      );
-      fireEvent.press(getByTestId('physical-address-privacy-policy-checkbox'));
 
       await waitFor(() => {
         const button = getByTestId('physical-address-continue-button');
@@ -1222,320 +1046,18 @@ describe('PhysicalAddress Component', () => {
       });
 
       expect(mockCreateOnboardingConsent).not.toHaveBeenCalled();
+      expect(mockLinkUserToConsent).not.toHaveBeenCalled();
 
-      await waitFor(() => {
-        expect(mockLinkUserToConsent).toHaveBeenCalledWith(
-          'existing-consent-123',
-          'user-id',
-        );
-      });
-    });
-
-    it('skips consent operations when consent already completed', async () => {
-      const mockGetOnboardingConsentSetByOnboardingId = jest
-        .fn()
-        .mockResolvedValue({
-          consentSetId: 'completed-consent-123',
-          userId: 'user-id',
-          completedAt: '2024-01-01T00:00:00.000Z',
-        });
-      const mockCreateOnboardingConsent = jest.fn();
-      const mockLinkUserToConsent = jest.fn();
-      const mockRegisterAddress = jest.fn().mockResolvedValue({
-        accessToken: 'test-token',
-        user: { id: 'user-id' },
-      });
-
-      mockUseRegisterPhysicalAddress.mockReturnValue({
-        registerAddress: mockRegisterAddress,
-        isLoading: false,
-        isSuccess: false,
-        isError: false,
-        error: null,
-        clearError: jest.fn(),
-        reset: jest.fn(),
-      });
-
-      mockUseRegisterUserConsent.mockReturnValue({
-        createOnboardingConsent: mockCreateOnboardingConsent,
-        linkUserToConsent: mockLinkUserToConsent,
-        getOnboardingConsentSetByOnboardingId:
-          mockGetOnboardingConsentSetByOnboardingId,
-        isLoading: false,
-        isSuccess: false,
-        isError: false,
-        error: null,
-        consentSetId: null,
-        clearError: jest.fn(),
-        reset: jest.fn(),
-      });
-
-      const { getByTestId } = render(
-        <Provider store={store}>
-          <PhysicalAddress />
-        </Provider>,
-      );
-
-      fireEvent.changeText(getByTestId('address-line-1-input'), '123 Main St');
-      fireEvent.changeText(getByTestId('city-input'), 'San Francisco');
-      fireEvent.changeText(getByTestId('zip-code-input'), '12345');
-      fireEvent.press(getByTestId('state-select'));
-      fireEvent.press(
-        getByTestId('physical-address-electronic-consent-checkbox'),
-      );
-      fireEvent.press(
-        getByTestId('physical-address-account-opening-disclosure-checkbox'),
-      );
-      fireEvent.press(
-        getByTestId('physical-address-terms-and-conditions-checkbox'),
-      );
-      fireEvent.press(getByTestId('physical-address-privacy-policy-checkbox'));
-
-      await waitFor(() => {
-        const button = getByTestId('physical-address-continue-button');
-        expect(button.props.disabled).toBe(false);
-      });
-
-      const button = getByTestId('physical-address-continue-button');
-
-      await act(async () => {
-        fireEvent.press(button);
-      });
-
-      await waitFor(() => {
-        expect(mockGetOnboardingConsentSetByOnboardingId).toHaveBeenCalledWith(
-          'test-id',
-        );
-      });
-
-      expect(mockCreateOnboardingConsent).not.toHaveBeenCalled();
-      expect(mockLinkUserToConsent).not.toHaveBeenCalled();
-
-      // Wait for token storage and Redux updates before navigation
       await waitFor(
         () => {
           expect(mockReset).toHaveBeenCalledWith({
             index: 0,
-            routes: [{ name: Routes.CARD.VERIFYING_REGISTRATION }],
+            routes: [{ name: Routes.CARD.ONBOARDING.VALIDATING_KYC }],
           });
         },
         { timeout: 3000 },
       );
     });
-
-    it('uses existing consent set ID from Redux when available', async () => {
-      const mockGetOnboardingConsentSetByOnboardingId = jest.fn();
-      const mockCreateOnboardingConsent = jest.fn();
-      const mockLinkUserToConsent = jest.fn().mockResolvedValue(undefined);
-      const mockRegisterAddress = jest.fn().mockResolvedValue({
-        accessToken: 'test-token',
-        user: { id: 'user-id' },
-      });
-
-      // Create store with existing consent set ID
-      const storeWithConsent = createTestStore({
-        onboarding: {
-          selectedCountry: 'US',
-          onboardingId: 'test-id',
-          contactVerificationId: 'contact-id',
-          consentSetId: 'redux-consent-123',
-          user: {
-            id: 'user-id',
-            email: 'test@example.com',
-          },
-        },
-        userCardLocation: 'us',
-      });
-
-      // Mock useSelector for this test
-      const { useSelector } = jest.requireMock('react-redux');
-      useSelector.mockImplementation((selector: any) =>
-        selector({
-          card: {
-            onboarding: {
-              selectedCountry: 'US',
-              onboardingId: 'test-id',
-              consentSetId: 'redux-consent-123',
-              user: {
-                id: 'user-id',
-                email: 'test@example.com',
-              },
-            },
-          },
-        }),
-      );
-
-      mockUseRegisterPhysicalAddress.mockReturnValue({
-        registerAddress: mockRegisterAddress,
-        isLoading: false,
-        isSuccess: false,
-        isError: false,
-        error: null,
-        clearError: jest.fn(),
-        reset: jest.fn(),
-      });
-
-      mockUseRegisterUserConsent.mockReturnValue({
-        createOnboardingConsent: mockCreateOnboardingConsent,
-        linkUserToConsent: mockLinkUserToConsent,
-        getOnboardingConsentSetByOnboardingId:
-          mockGetOnboardingConsentSetByOnboardingId,
-        isLoading: false,
-        isSuccess: false,
-        isError: false,
-        error: null,
-        consentSetId: null,
-        clearError: jest.fn(),
-        reset: jest.fn(),
-      });
-
-      const { getByTestId } = render(
-        <Provider store={storeWithConsent}>
-          <PhysicalAddress />
-        </Provider>,
-      );
-
-      fireEvent.changeText(getByTestId('address-line-1-input'), '123 Main St');
-      fireEvent.changeText(getByTestId('city-input'), 'San Francisco');
-      fireEvent.changeText(getByTestId('zip-code-input'), '12345');
-      fireEvent.press(getByTestId('state-select'));
-      fireEvent.press(
-        getByTestId('physical-address-electronic-consent-checkbox'),
-      );
-      fireEvent.press(
-        getByTestId('physical-address-account-opening-disclosure-checkbox'),
-      );
-      fireEvent.press(
-        getByTestId('physical-address-terms-and-conditions-checkbox'),
-      );
-      fireEvent.press(getByTestId('physical-address-privacy-policy-checkbox'));
-
-      await waitFor(() => {
-        const button = getByTestId('physical-address-continue-button');
-        expect(button.props.disabled).toBe(false);
-      });
-
-      const button = getByTestId('physical-address-continue-button');
-
-      await act(async () => {
-        fireEvent.press(button);
-      });
-
-      expect(mockGetOnboardingConsentSetByOnboardingId).not.toHaveBeenCalled();
-      expect(mockCreateOnboardingConsent).not.toHaveBeenCalled();
-
-      await waitFor(() => {
-        expect(mockLinkUserToConsent).toHaveBeenCalledWith(
-          'redux-consent-123',
-          'user-id',
-        );
-      });
-
-      // Wait for token storage and Redux updates before navigation
-      await waitFor(
-        () => {
-          expect(mockReset).toHaveBeenCalledWith({
-            index: 0,
-            routes: [{ name: Routes.CARD.VERIFYING_REGISTRATION }],
-          });
-        },
-        { timeout: 3000 },
-      );
-    });
-
-    it('clears consent set ID from Redux after linking consent', async () => {
-      const mockGetOnboardingConsentSetByOnboardingId = jest
-        .fn()
-        .mockResolvedValue(null);
-      const mockCreateOnboardingConsent = jest
-        .fn()
-        .mockResolvedValue('consent-set-123');
-      const mockLinkUserToConsent = jest.fn().mockResolvedValue(undefined);
-      const mockRegisterAddress = jest.fn().mockResolvedValue({
-        accessToken: 'test-token',
-        user: { id: 'user-id' },
-      });
-      const mockDispatch = jest.fn();
-
-      // Mock useDispatch
-      const { useDispatch } = jest.requireMock('react-redux');
-      useDispatch.mockReturnValue(mockDispatch);
-
-      mockUseRegisterPhysicalAddress.mockReturnValue({
-        registerAddress: mockRegisterAddress,
-        isLoading: false,
-        isSuccess: false,
-        isError: false,
-        error: null,
-        clearError: jest.fn(),
-        reset: jest.fn(),
-      });
-
-      mockUseRegisterUserConsent.mockReturnValue({
-        createOnboardingConsent: mockCreateOnboardingConsent,
-        linkUserToConsent: mockLinkUserToConsent,
-        getOnboardingConsentSetByOnboardingId:
-          mockGetOnboardingConsentSetByOnboardingId,
-        isLoading: false,
-        isSuccess: false,
-        isError: false,
-        error: null,
-        consentSetId: null,
-        clearError: jest.fn(),
-        reset: jest.fn(),
-      });
-
-      const { getByTestId } = render(
-        <Provider store={store}>
-          <PhysicalAddress />
-        </Provider>,
-      );
-
-      // Given: User fills all required fields
-      fireEvent.changeText(getByTestId('address-line-1-input'), '123 Main St');
-      fireEvent.changeText(getByTestId('city-input'), 'San Francisco');
-      fireEvent.changeText(getByTestId('zip-code-input'), '12345');
-      fireEvent.press(getByTestId('state-select'));
-      fireEvent.press(
-        getByTestId('physical-address-electronic-consent-checkbox'),
-      );
-      fireEvent.press(
-        getByTestId('physical-address-account-opening-disclosure-checkbox'),
-      );
-      fireEvent.press(
-        getByTestId('physical-address-terms-and-conditions-checkbox'),
-      );
-      fireEvent.press(getByTestId('physical-address-privacy-policy-checkbox'));
-
-      await waitFor(() => {
-        const button = getByTestId('physical-address-continue-button');
-        expect(button.props.disabled).toBe(false);
-      });
-
-      const button = getByTestId('physical-address-continue-button');
-
-      // When: User submits the form and consent is linked
-      await act(async () => {
-        fireEvent.press(button);
-      });
-
-      await waitFor(() => {
-        expect(mockLinkUserToConsent).toHaveBeenCalledWith(
-          'consent-set-123',
-          'user-id',
-        );
-      });
-
-      // Then: Should dispatch action to clear consent set ID after linking
-      await waitFor(() => {
-        expect(mockDispatch).toHaveBeenCalledWith(
-          expect.objectContaining({
-            type: expect.stringContaining('setConsentSetId'),
-            payload: null,
-          }),
-        );
-      });
-    });
   });
 
   describe('Error Handling', () => {
@@ -1679,63 +1201,32 @@ describe('PhysicalAddress Component', () => {
       expect(queryByTestId('state-select')).toBeFalsy();
     });
 
-    it('shows same mailing address checkbox for US users', () => {
+    it('shows country field for all users', () => {
       const { getByTestId } = render(
         <Provider store={store}>
           <PhysicalAddress />
         </Provider>,
       );
 
-      expect(
-        getByTestId('physical-address-same-mailing-address-checkbox'),
-      ).toBeTruthy();
+      expect(getByTestId('country-select')).toBeTruthy();
     });
   });
 
-  describe('Redux Integration', () => {
-    it('reads selected country from Redux state', () => {
-      const { useSelector } = jest.requireMock('react-redux');
-      const mockSelector = jest.fn();
-      useSelector.mockImplementation(mockSelector);
-
-      render(
-        <Provider store={store}>
-          <PhysicalAddress />
-        </Provider>,
-      );
-
-      expect(mockSelector).toHaveBeenCalled();
-    });
-
-    it('reads onboarding ID from Redux state', () => {
+  describe('Edge Cases', () => {
+    it('handles missing onboarding data gracefully', () => {
       const { useSelector } = jest.requireMock('react-redux');
       useSelector.mockImplementation((selector: any) =>
         selector({
           card: {
             onboarding: {
-              selectedCountry: 'US',
-              onboardingId: 'test-onboarding-id',
+              selectedCountry: null,
+              onboardingId: null,
+              user: null,
             },
           },
         }),
       );
 
-      render(
-        <Provider store={store}>
-          <PhysicalAddress />
-        </Provider>,
-      );
-
-      // Component should render without errors when onboarding ID is present
-      expect(true).toBe(true);
-    });
-  });
-
-  describe('Edge Cases', () => {
-    it('handles empty Redux state gracefully', () => {
-      const { useSelector } = jest.requireMock('react-redux');
-      useSelector.mockImplementation(() => ({}));
-
       const { getByTestId } = render(
         <Provider store={store}>
           <PhysicalAddress />
@@ -1780,6 +1271,143 @@ describe('PhysicalAddress Component', () => {
     });
   });
 
+  describe('Electronic Consent Checkbox', () => {
+    it('renders electronic consent checkbox', () => {
+      const { getByTestId } = render(
+        <Provider store={store}>
+          <PhysicalAddress />
+        </Provider>,
+      );
+
+      expect(
+        getByTestId('physical-address-electronic-consent-checkbox'),
+      ).toBeTruthy();
+    });
+
+    it('renders checkbox unchecked by default', () => {
+      const { getByTestId } = render(
+        <Provider store={store}>
+          <PhysicalAddress />
+        </Provider>,
+      );
+
+      const checkbox = getByTestId(
+        'physical-address-electronic-consent-checkbox',
+      );
+      expect(checkbox.props.accessibilityState.checked).toBe(false);
+    });
+
+    it('toggles checkbox state when pressed', () => {
+      const { getByTestId } = render(
+        <Provider store={store}>
+          <PhysicalAddress />
+        </Provider>,
+      );
+
+      const checkbox = getByTestId(
+        'physical-address-electronic-consent-checkbox',
+      );
+
+      expect(checkbox.props.accessibilityState.checked).toBe(false);
+
+      fireEvent.press(checkbox);
+
+      expect(checkbox.props.accessibilityState.checked).toBe(true);
+
+      fireEvent.press(checkbox);
+
+      expect(checkbox.props.accessibilityState.checked).toBe(false);
+    });
+
+    it('disables continue button when checkbox is unchecked', () => {
+      const { getByTestId } = render(
+        <Provider store={store}>
+          <PhysicalAddress />
+        </Provider>,
+      );
+
+      // Fill all required fields except checkbox
+      fireEvent.changeText(getByTestId('address-line-1-input'), '123 Main St');
+      fireEvent.changeText(getByTestId('city-input'), 'San Francisco');
+      fireEvent.changeText(getByTestId('zip-code-input'), '12345');
+      fireEvent.press(getByTestId('state-select'));
+
+      const button = getByTestId('physical-address-continue-button');
+      expect(button.props.disabled).toBe(true);
+    });
+
+    it('enables continue button when checkbox is checked and all fields filled', async () => {
+      const { getByTestId } = render(
+        <Provider store={store}>
+          <PhysicalAddress />
+        </Provider>,
+      );
+
+      // Fill all required fields
+      fireEvent.changeText(getByTestId('address-line-1-input'), '123 Main St');
+      fireEvent.changeText(getByTestId('city-input'), 'San Francisco');
+      fireEvent.changeText(getByTestId('zip-code-input'), '12345');
+      fireEvent.press(getByTestId('state-select'));
+
+      // Button should be disabled without checkbox
+      const buttonBefore = getByTestId('physical-address-continue-button');
+      expect(buttonBefore.props.disabled).toBe(true);
+
+      // Check the checkbox
+      fireEvent.press(
+        getByTestId('physical-address-electronic-consent-checkbox'),
+      );
+
+      await waitFor(() => {
+        const buttonAfter = getByTestId('physical-address-continue-button');
+        expect(buttonAfter.props.disabled).toBe(false);
+      });
+    });
+
+    it('resets errors when checkbox is toggled', () => {
+      const mockResetRegisterAddress = jest.fn();
+      const mockResetConsent = jest.fn();
+
+      mockUseRegisterPhysicalAddress.mockReturnValue({
+        registerAddress: jest.fn(),
+        isLoading: false,
+        isSuccess: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        reset: mockResetRegisterAddress,
+      });
+
+      mockUseRegisterUserConsent.mockReturnValue({
+        createOnboardingConsent: jest.fn(),
+        linkUserToConsent: jest.fn(),
+        getOnboardingConsentSetByOnboardingId: jest
+          .fn()
+          .mockResolvedValue(null),
+        isLoading: false,
+        isSuccess: false,
+        isError: false,
+        error: null,
+        consentSetId: null,
+        clearError: jest.fn(),
+        reset: mockResetConsent,
+      });
+
+      const { getByTestId } = render(
+        <Provider store={store}>
+          <PhysicalAddress />
+        </Provider>,
+      );
+
+      fireEvent.press(
+        getByTestId('physical-address-electronic-consent-checkbox'),
+      );
+
+      expect(mockResetRegisterAddress).toHaveBeenCalled();
+      expect(mockResetConsent).toHaveBeenCalled();
+    });
+  });
+
   describe('i18n Integration', () => {
     it('uses correct translation keys for all text elements', () => {
       const { strings } = jest.requireMock('../../../../../../locales/i18n');
diff --git a/app/components/UI/Card/components/Onboarding/PhysicalAddress.tsx b/app/components/UI/Card/components/Onboarding/PhysicalAddress.tsx
index 237e9ec941b..b63cb1d85c6 100644
--- a/app/components/UI/Card/components/Onboarding/PhysicalAddress.tsx
+++ b/app/components/UI/Card/components/Onboarding/PhysicalAddress.tsx
@@ -13,8 +13,6 @@ import Label from '../../../../../component-library/components/Form/Label';
 import Routes from '../../../../../constants/navigation/Routes';
 import { strings } from '../../../../../../locales/i18n';
 import OnboardingStep from './OnboardingStep';
-import Checkbox from '../../../../../component-library/components/Checkbox';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import useRegisterPhysicalAddress from '../../hooks/useRegisterPhysicalAddress';
 import { useDispatch, useSelector } from 'react-redux';
 import {
@@ -37,6 +35,11 @@ import { useCardSDK } from '../../sdk';
 import { MetaMetricsEvents, useMetrics } from '../../../../hooks/useMetrics';
 import { CardActions, CardScreens } from '../../util/metrics';
 import { Linking, TouchableOpacity } from 'react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import Checkbox from '../../../../../component-library/components/Checkbox';
+
+// No-op function for disabled SelectComponent
+const noop = () => undefined;
 
 export const AddressFields = ({
   addressLine1,
@@ -77,6 +80,17 @@ export const AddressFields = ({
       }));
   }, [registrationSettings]);
 
+  const countryOptions = useMemo(() => {
+    if (!registrationSettings?.countries) {
+      return [];
+    }
+    return registrationSettings.countries.map((country) => ({
+      key: country.iso3166alpha2,
+      value: country.iso3166alpha2,
+      label: country.name,
+    }));
+  }, [registrationSettings]);
+
   return (
     <>
       {/* Address Line 1 */}
@@ -89,9 +103,6 @@ export const AddressFields = ({
         <TextField
           autoCapitalize={'none'}
           onChangeText={handleAddressLine1Change}
-          placeholder={strings(
-            'card.card_onboarding.physical_address.address_line_1_placeholder',
-          )}
           numberOfLines={1}
           size={TextFieldSize.Lg}
           value={addressLine1}
@@ -113,9 +124,6 @@ export const AddressFields = ({
         <TextField
           autoCapitalize={'none'}
           onChangeText={handleAddressLine2Change}
-          placeholder={strings(
-            'card.card_onboarding.physical_address.address_line_2_placeholder',
-          )}
           numberOfLines={1}
           size={TextFieldSize.Lg}
           value={addressLine2}
@@ -135,9 +143,6 @@ export const AddressFields = ({
         <TextField
           autoCapitalize={'none'}
           onChangeText={handleCityChange}
-          placeholder={strings(
-            'card.card_onboarding.physical_address.city_placeholder',
-          )}
           numberOfLines={1}
           size={TextFieldSize.Lg}
           value={city}
@@ -163,9 +168,6 @@ export const AddressFields = ({
               label={strings(
                 'card.card_onboarding.physical_address.state_label',
               )}
-              defaultValue={strings(
-                'card.card_onboarding.physical_address.state_placeholder',
-              )}
               testID="state-select"
             />
           </Box>
@@ -179,9 +181,6 @@ export const AddressFields = ({
         <TextField
           autoCapitalize={'none'}
           onChangeText={handleZipCodeChange}
-          placeholder={strings(
-            'card.card_onboarding.physical_address.zip_code_placeholder',
-          )}
           numberOfLines={1}
           size={TextFieldSize.Lg}
           value={zipCode}
@@ -193,14 +192,31 @@ export const AddressFields = ({
           testID="zip-code-input"
         />
       </Box>
+      {/* Country */}
+      <Box>
+        <Label>
+          {strings('card.card_onboarding.physical_address.country_label')}
+        </Label>
+        <Box twClassName="w-full border border-solid border-border-default rounded-lg py-1">
+          <SelectComponent
+            options={countryOptions}
+            selectedValue={selectedCountry || ''}
+            onValueChange={noop}
+            label={strings(
+              'card.card_onboarding.physical_address.country_label',
+            )}
+            testID="country-select"
+          />
+        </Box>
+      </Box>
     </>
   );
 };
 
 const PhysicalAddress = () => {
   const navigation = useNavigation();
-  const dispatch = useDispatch();
   const tw = useTailwind();
+  const dispatch = useDispatch();
   const { user, setUser } = useCardSDK();
   const onboardingId = useSelector(selectOnboardingId);
   const selectedCountry = useSelector(selectSelectedCountry);
@@ -211,46 +227,15 @@ const PhysicalAddress = () => {
   const [city, setCity] = useState('');
   const [state, setState] = useState('');
   const [zipCode, setZipCode] = useState('');
-  const [isSameMailingAddress, setIsSameMailingAddress] = useState(true);
   const [electronicConsent, setElectronicConsent] = useState(false);
-  const [termsAndConditions, setTermsAndConditions] = useState(false);
-  const [privacyPolicy, setPrivacyPolicy] = useState(false);
-  const [accountOpeningDisclosure, setAccountOpeningDisclosure] =
-    useState(false);
-  const [rightToInformation, setRightToInformation] = useState(false);
 
   const { data: registrationSettings } = useRegistrationSettings();
 
-  const termsAndConditionsUSUrl = useMemo(
-    () => registrationSettings?.links?.us?.termsAndConditions || '',
-    [registrationSettings?.links?.us?.termsAndConditions],
-  );
-
-  const privacyPolicyUSUrl = useMemo(
-    () => registrationSettings?.links?.us?.noticeOfPrivacy || '',
-    [registrationSettings?.links?.us?.noticeOfPrivacy],
-  );
-
-  const accountOpeningDisclosureUSUrl = useMemo(
-    () => registrationSettings?.links?.us?.accountOpeningDisclosure || '',
-    [registrationSettings?.links?.us?.accountOpeningDisclosure],
-  );
-
   const eSignConsentDisclosureUSUrl = useMemo(
     () => registrationSettings?.links?.us?.eSignConsentDisclosure || '',
     [registrationSettings?.links?.us?.eSignConsentDisclosure],
   );
 
-  const termsAndConditionsIntlUrl = useMemo(
-    () => registrationSettings?.links?.intl?.termsAndConditions || '',
-    [registrationSettings?.links?.intl?.termsAndConditions],
-  );
-
-  const rightToInformationIntlUrl = useMemo(
-    () => registrationSettings?.links?.intl?.rightToInformation || '',
-    [registrationSettings?.links?.intl?.rightToInformation],
-  );
-
   const {
     registerAddress,
     isLoading: registerLoading,
@@ -269,82 +254,11 @@ const PhysicalAddress = () => {
     reset: resetConsent,
   } = useRegisterUserConsent();
 
-  const handleSameMailingAddressToggle = useCallback(() => {
-    resetRegisterAddress();
-    setIsSameMailingAddress(!isSameMailingAddress);
-  }, [isSameMailingAddress, resetRegisterAddress]);
-
-  const handleElectronicConsentToggle = useCallback(() => {
-    resetConsent();
-    resetRegisterAddress();
-    setElectronicConsent(!electronicConsent);
-  }, [electronicConsent, resetRegisterAddress, resetConsent]);
-
   const openESignConsentDisclosureUS = useCallback(() => {
     if (eSignConsentDisclosureUSUrl) {
       Linking.openURL(eSignConsentDisclosureUSUrl);
     }
-    setElectronicConsent(!electronicConsent);
-  }, [eSignConsentDisclosureUSUrl, electronicConsent]);
-
-  const handleAccountOpeningDisclosureToggle = useCallback(() => {
-    resetConsent();
-    resetRegisterAddress();
-    setAccountOpeningDisclosure(!accountOpeningDisclosure);
-  }, [accountOpeningDisclosure, resetRegisterAddress, resetConsent]);
-
-  const openAccountOpeningDisclosureUS = useCallback(() => {
-    if (accountOpeningDisclosureUSUrl) {
-      Linking.openURL(accountOpeningDisclosureUSUrl);
-    }
-    setAccountOpeningDisclosure(!accountOpeningDisclosure);
-  }, [accountOpeningDisclosureUSUrl, accountOpeningDisclosure]);
-
-  const handleRightToInformationToggle = useCallback(() => {
-    resetConsent();
-    resetRegisterAddress();
-    setRightToInformation(!rightToInformation);
-  }, [rightToInformation, resetRegisterAddress, resetConsent]);
-
-  const openRightToInformationIntl = useCallback(() => {
-    if (rightToInformationIntlUrl) {
-      Linking.openURL(rightToInformationIntlUrl);
-    }
-    setRightToInformation(!rightToInformation);
-  }, [rightToInformationIntlUrl, rightToInformation]);
-
-  const handleTermsAndConditionsToggle = useCallback(() => {
-    resetConsent();
-    resetRegisterAddress();
-    setTermsAndConditions(!termsAndConditions);
-  }, [termsAndConditions, resetRegisterAddress, resetConsent]);
-
-  const openTermsAndConditionsIntl = useCallback(() => {
-    if (termsAndConditionsIntlUrl) {
-      Linking.openURL(termsAndConditionsIntlUrl);
-    }
-    setTermsAndConditions(!termsAndConditions);
-  }, [termsAndConditionsIntlUrl, termsAndConditions]);
-
-  const openTermsAndConditionsUS = useCallback(() => {
-    if (termsAndConditionsUSUrl) {
-      Linking.openURL(termsAndConditionsUSUrl);
-    }
-    setTermsAndConditions(!termsAndConditions);
-  }, [termsAndConditionsUSUrl, termsAndConditions]);
-
-  const handlePrivacyPolicyToggle = useCallback(() => {
-    resetConsent();
-    resetRegisterAddress();
-    setPrivacyPolicy(!privacyPolicy);
-  }, [privacyPolicy, resetRegisterAddress, resetConsent]);
-
-  const openPrivacyPolicyUS = useCallback(() => {
-    if (privacyPolicyUSUrl) {
-      Linking.openURL(privacyPolicyUSUrl);
-    }
-    setPrivacyPolicy(!privacyPolicy);
-  }, [privacyPolicyUSUrl, privacyPolicy]);
+  }, [eSignConsentDisclosureUSUrl]);
 
   const handleAddressLine1Change = useCallback(
     (text: string) => {
@@ -386,6 +300,12 @@ const PhysicalAddress = () => {
     [resetRegisterAddress],
   );
 
+  const handleElectronicConsentToggle = useCallback(() => {
+    resetConsent();
+    resetRegisterAddress();
+    setElectronicConsent(!electronicConsent);
+  }, [electronicConsent, resetRegisterAddress, resetConsent]);
+
   const isDisabled = useMemo(
     () =>
       registerLoading ||
@@ -398,14 +318,7 @@ const PhysicalAddress = () => {
       !city ||
       (!state && selectedCountry === 'US') ||
       !zipCode ||
-      (selectedCountry === 'US' &&
-        (!electronicConsent ||
-          !accountOpeningDisclosure ||
-          !privacyPolicy ||
-          !termsAndConditions)) ||
-      (selectedCountry !== 'US' &&
-        (!rightToInformation || !termsAndConditions)),
-
+      !electronicConsent,
     [
       registerLoading,
       registerIsError,
@@ -419,10 +332,6 @@ const PhysicalAddress = () => {
       selectedCountry,
       zipCode,
       electronicConsent,
-      accountOpeningDisclosure,
-      privacyPolicy,
-      termsAndConditions,
-      rightToInformation,
     ],
   );
 
@@ -432,14 +341,9 @@ const PhysicalAddress = () => {
       !user?.id ||
       !addressLine1 ||
       !city ||
-      (!state && selectedCountry === 'US') ||
+      (selectedCountry === 'US' && !state) ||
       !zipCode ||
-      (selectedCountry === 'US' &&
-        (!electronicConsent ||
-          !accountOpeningDisclosure ||
-          !privacyPolicy ||
-          !termsAndConditions)) ||
-      (selectedCountry !== 'US' && (!rightToInformation || !termsAndConditions))
+      !electronicConsent
     ) {
       return;
     }
@@ -489,7 +393,7 @@ const PhysicalAddress = () => {
         city,
         usState: state || undefined,
         zip: zipCode,
-        isSameMailingAddress,
+        isSameMailingAddress: true,
       });
 
       if (updatedUser) {
@@ -523,17 +427,11 @@ const PhysicalAddress = () => {
         // Reset the navigation stack to the verifying registration screen
         navigation.reset({
           index: 0,
-          routes: [{ name: Routes.CARD.VERIFYING_REGISTRATION }],
+          routes: [{ name: Routes.CARD.ONBOARDING.VALIDATING_KYC }],
         });
         return;
       }
 
-      // When isSameMailingAddress = false AND countryOfResidence = "US"
-      // The registration is not yet complete, proceed to mailing address
-      if (!isSameMailingAddress && selectedCountry === 'US') {
-        navigation.navigate(Routes.CARD.ONBOARDING.MAILING_ADDRESS);
-      }
-
       // Something is wrong. We need to display the registerError or restart the flow
     } catch (error) {
       if (
@@ -572,199 +470,40 @@ const PhysicalAddress = () => {
         zipCode={zipCode}
         handleZipCodeChange={handleZipCodeChange}
       />
-
-      {selectedCountry === 'US' ? (
-        <>
-          {/* US: Check box 1: Same Mailing Address */}
-          <Checkbox
-            isChecked={isSameMailingAddress}
-            onPress={handleSameMailingAddressToggle}
-            label={strings(
-              'card.card_onboarding.physical_address.same_mailing_address_label',
-            )}
-            style={tw.style('h-auto')}
-            testID="physical-address-same-mailing-address-checkbox"
-          />
-
-          {/* US: Check box 2: Electronic Consent */}
-          <Checkbox
-            isChecked={electronicConsent}
-            onPress={handleElectronicConsentToggle}
-            label={
-              <TouchableOpacity onPress={openESignConsentDisclosureUS}>
-                <Text variant={TextVariant.BodyMd}>
-                  {strings(
-                    'card.card_onboarding.physical_address.electronic_consent_1',
-                  )}
-                  <Text
-                    variant={TextVariant.BodyMd}
-                    twClassName="text-primary-default underline"
-                  >
-                    {strings(
-                      'card.card_onboarding.physical_address.electronic_consent_2',
-                    )}
-                  </Text>
-                  {strings(
-                    'card.card_onboarding.physical_address.electronic_consent_3',
-                  )}
-                </Text>
-              </TouchableOpacity>
-            }
-            style={tw.style('h-auto')}
-            testID="physical-address-electronic-consent-checkbox"
-          />
-          {/* US: Check box 3: Account Opening Disclosure */}
-          <Checkbox
-            isChecked={accountOpeningDisclosure}
-            onPress={handleAccountOpeningDisclosureToggle}
-            label={
-              <TouchableOpacity onPress={openAccountOpeningDisclosureUS}>
-                <Text variant={TextVariant.BodyMd}>
-                  {strings(
-                    'card.card_onboarding.physical_address.account_opening_disclosure_1',
-                  )}
-                  <Text
-                    variant={TextVariant.BodyMd}
-                    twClassName="text-primary-default underline"
-                  >
-                    {strings(
-                      'card.card_onboarding.physical_address.account_opening_disclosure_2',
-                    )}
-                  </Text>
-                </Text>
-              </TouchableOpacity>
-            }
-            style={tw.style('h-auto')}
-            testID="physical-address-account-opening-disclosure-checkbox"
-          />
-          {/* US: Check box 4: Terms and Conditions */}
-          <Checkbox
-            isChecked={termsAndConditions}
-            onPress={handleTermsAndConditionsToggle}
-            label={
-              <TouchableOpacity onPress={openTermsAndConditionsUS}>
-                <Text variant={TextVariant.BodyMd}>
-                  {strings(
-                    'card.card_onboarding.physical_address.terms_and_conditions_1',
-                  )}
-                  <Text
-                    variant={TextVariant.BodyMd}
-                    twClassName="text-primary-default underline"
-                  >
-                    {strings(
-                      'card.card_onboarding.physical_address.terms_and_conditions_2',
-                    )}
-                  </Text>
-                  {strings(
-                    'card.card_onboarding.physical_address.terms_and_conditions_3',
-                  )}
-                </Text>
-              </TouchableOpacity>
-            }
-            style={tw.style('h-auto')}
-            testID="physical-address-terms-and-conditions-checkbox"
-          />
-
-          {/* US: Check box 5: Privacy Policy */}
-          <Checkbox
-            isChecked={privacyPolicy}
-            onPress={handlePrivacyPolicyToggle}
-            label={
-              <TouchableOpacity onPress={openPrivacyPolicyUS}>
-                <Text variant={TextVariant.BodyMd}>
-                  {strings(
-                    'card.card_onboarding.physical_address.privacy_policy_1',
-                  )}
-                  <Text
-                    variant={TextVariant.BodyMd}
-                    twClassName="text-primary-default underline"
-                  >
-                    {strings(
-                      'card.card_onboarding.physical_address.privacy_policy_2',
-                    )}
-                  </Text>
-                </Text>
-              </TouchableOpacity>
-            }
-            style={tw.style('h-auto')}
-            testID="physical-address-privacy-policy-checkbox"
-          />
-        </>
-      ) : (
-        <>
-          {/* Intl: Check box 1: Terms and Conditions */}
-          <Checkbox
-            isChecked={termsAndConditions}
-            onPress={handleTermsAndConditionsToggle}
-            label={
-              <TouchableOpacity onPress={openTermsAndConditionsIntl}>
-                <Text variant={TextVariant.BodyMd}>
-                  {strings(
-                    'card.card_onboarding.physical_address.terms_and_conditions_1',
-                  )}
-
-                  <Text
-                    variant={TextVariant.BodyMd}
-                    twClassName="text-primary-default underline"
-                  >
-                    {strings(
-                      'card.card_onboarding.physical_address.terms_and_conditions_2',
-                    )}
-                  </Text>
-
-                  {strings(
-                    'card.card_onboarding.physical_address.terms_and_conditions_3',
-                  )}
-                </Text>
-              </TouchableOpacity>
-            }
-            style={tw.style('h-auto')}
-            testID="physical-address-terms-and-conditions-checkbox"
-          />
-
-          {/* Intl: Check box 2: Right to Information */}
-          <Checkbox
-            isChecked={rightToInformation}
-            onPress={handleRightToInformationToggle}
-            label={
-              <TouchableOpacity onPress={openRightToInformationIntl}>
-                <Text variant={TextVariant.BodyMd}>
-                  {strings(
-                    'card.card_onboarding.physical_address.right_to_information_1',
-                  )}
-                  <Text
-                    variant={TextVariant.BodyMd}
-                    twClassName="text-primary-default underline"
-                  >
-                    {strings(
-                      'card.card_onboarding.physical_address.right_to_information_2',
-                    )}
-                  </Text>
-                  {strings(
-                    'card.card_onboarding.physical_address.right_to_information_3',
-                  )}
-                </Text>
-              </TouchableOpacity>
-            }
-            style={tw.style('h-auto')}
-            testID="physical-address-right-to-information-checkbox"
-          />
-        </>
-      )}
+      <Checkbox
+        isChecked={electronicConsent}
+        onPress={handleElectronicConsentToggle}
+        label={
+          <TouchableOpacity
+            onPress={openESignConsentDisclosureUS}
+            style={tw.style('flex-1 flex-shrink mr-2 -mt-1')}
+          >
+            <Text
+              variant={TextVariant.BodySm}
+              twClassName="text-text-alternative"
+            >
+              {strings(
+                'card.card_onboarding.physical_address.electronic_consent_1',
+              )}
+              <Text
+                variant={TextVariant.BodySm}
+                twClassName="text-primary-default underline"
+              >
+                {strings(
+                  'card.card_onboarding.physical_address.electronic_consent_2',
+                )}
+              </Text>
+            </Text>
+          </TouchableOpacity>
+        }
+        style={tw.style('h-auto flex flex-row items-start')}
+        testID="physical-address-electronic-consent-checkbox"
+      />
     </>
   );
 
   const renderActions = () => (
-    <Box>
-      <Button
-        variant={ButtonVariants.Primary}
-        label={strings('card.card_onboarding.continue_button')}
-        size={ButtonSize.Lg}
-        onPress={handleContinue}
-        width={ButtonWidthTypes.Full}
-        isDisabled={isDisabled}
-        testID="physical-address-continue-button"
-      />
+    <Box twClassName="flex flex-col justify-center gap-2">
       {registerIsError ? (
         <Text
           variant={TextVariant.BodySm}
@@ -782,6 +521,15 @@ const PhysicalAddress = () => {
           {consentError}
         </Text>
       ) : null}
+      <Button
+        variant={ButtonVariants.Primary}
+        label={strings('card.card_onboarding.continue_button')}
+        size={ButtonSize.Lg}
+        onPress={handleContinue}
+        width={ButtonWidthTypes.Full}
+        isDisabled={isDisabled}
+        testID="physical-address-continue-button"
+      />
     </Box>
   );
 
diff --git a/app/components/UI/Card/components/Onboarding/SetPhoneNumber.test.tsx b/app/components/UI/Card/components/Onboarding/SetPhoneNumber.test.tsx
index 2abc8077f3d..c3d92897c72 100644
--- a/app/components/UI/Card/components/Onboarding/SetPhoneNumber.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/SetPhoneNumber.test.tsx
@@ -312,8 +312,8 @@ describe('SetPhoneNumber Component', () => {
       const countrySelect = getByTestId(
         'set-phone-number-country-area-code-select',
       );
-      // Should show +1 for US (initial selected country)
-      expect(countrySelect.props.selectedValue).toBe('1');
+      // Should show country code - area code (initial selected country)
+      expect(countrySelect.props.selectedValue).toBe('US-1');
     });
 
     it('updates area code when different country is selected', () => {
@@ -637,8 +637,7 @@ describe('SetPhoneNumber Component', () => {
       const countrySelect = getByTestId(
         'set-phone-number-country-area-code-select',
       );
-      // Should default to +1
-      expect(countrySelect.props.selectedValue).toBe('1');
+      expect(countrySelect.props.selectedValue).toBe('XX-1');
     });
   });
 });
diff --git a/app/components/UI/Card/components/Onboarding/SetPhoneNumber.tsx b/app/components/UI/Card/components/Onboarding/SetPhoneNumber.tsx
index 076bb6b9d77..3c41b815d11 100644
--- a/app/components/UI/Card/components/Onboarding/SetPhoneNumber.tsx
+++ b/app/components/UI/Card/components/Onboarding/SetPhoneNumber.tsx
@@ -26,6 +26,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { CardError } from '../../types';
 import { MetaMetricsEvents, useMetrics } from '../../../../hooks/useMetrics';
 import { CardActions, CardScreens } from '../../util/metrics';
+import { countryCodeToFlag } from '../../util/countryCodeToFlag';
 
 const SetPhoneNumber = () => {
   const navigation = useNavigation();
@@ -44,8 +45,8 @@ const SetPhoneNumber = () => {
       .filter((country) => country.canSignUp)
       .map((country) => ({
         key: country.iso3166alpha2,
-        value: country.callingCode,
-        label: `+${country.callingCode} ${country.name}`,
+        value: `${country.iso3166alpha2}-${country.callingCode}`,
+        label: `${countryCodeToFlag(country.iso3166alpha2)} +${country.callingCode}`,
       }));
   }, [registrationSettings]);
 
@@ -63,6 +64,9 @@ const SetPhoneNumber = () => {
   const [isPhoneNumberError, setIsPhoneNumberError] = useState(false);
   const [selectedCountryAreaCode, setSelectedCountryAreaCode] =
     useState<string>(initialSelectedCountryAreaCode);
+  const [selectedCountryIsoCode, setSelectedCountryIsoCode] = useState<string>(
+    selectedCountry || 'US',
+  );
   const debouncedPhoneNumber = useDebouncedValue(phoneNumber, 1000);
 
   const {
@@ -127,9 +131,11 @@ const SetPhoneNumber = () => {
     }
   };
 
-  const handleCountrySelect = (areaCode: string) => {
+  const handleCountrySelect = (value: string) => {
     resetPhoneVerificationSend();
+    const [key, areaCode] = value.split('-');
     setSelectedCountryAreaCode(areaCode);
+    setSelectedCountryIsoCode(key);
   };
 
   const handlePhoneNumberChange = (text: string) => {
@@ -174,16 +180,18 @@ const SetPhoneNumber = () => {
       </Label>
       {/* Area code selector */}
       <Box twClassName="flex flex-row items-center justify-center gap-2">
-        <Box twClassName="w-28 border border-solid border-border-default rounded-lg py-1">
-          <SelectComponent
-            options={selectOptions}
-            selectedValue={selectedCountryAreaCode}
-            onValueChange={handleCountrySelect}
-            label={strings(
-              'card.card_onboarding.set_phone_number.country_area_code_label',
-            )}
-            testID="set-phone-number-country-area-code-select"
-          />
+        <Box twClassName="flex flex-row items-center border border-solid border-border-default rounded-lg">
+          <Box twClassName="w-22">
+            <SelectComponent
+              options={selectOptions}
+              selectedValue={`${selectedCountryIsoCode}-${selectedCountryAreaCode}`}
+              onValueChange={handleCountrySelect}
+              label={strings(
+                'card.card_onboarding.set_phone_number.country_area_code_label',
+              )}
+              testID="set-phone-number-country-area-code-select"
+            />
+          </Box>
         </Box>
 
         {/* Phone number input */}
@@ -191,9 +199,6 @@ const SetPhoneNumber = () => {
           <TextField
             autoCapitalize={'none'}
             onChangeText={handlePhoneNumberChange}
-            placeholder={strings(
-              'card.card_onboarding.set_phone_number.phone_number_placeholder',
-            )}
             numberOfLines={1}
             size={TextFieldSize.Lg}
             value={phoneNumber}
@@ -230,13 +235,6 @@ const SetPhoneNumber = () => {
 
   const renderActions = () => (
     <Box twClassName="flex flex-col items-center justify-center gap-2">
-      <Text
-        variant={TextVariant.BodySm}
-        testID="set-phone-number-legal-terms"
-        twClassName="text-text-default text-center"
-      >
-        {strings('card.card_onboarding.set_phone_number.legal_terms')}
-      </Text>
       <Button
         variant={ButtonVariants.Primary}
         label={strings('card.card_onboarding.continue_button')}
@@ -246,6 +244,13 @@ const SetPhoneNumber = () => {
         isDisabled={isDisabled}
         testID="set-phone-number-continue-button"
       />
+      <Text
+        variant={TextVariant.BodySm}
+        testID="set-phone-number-legal-terms"
+        twClassName="text-text-alternative text-center"
+      >
+        {strings('card.card_onboarding.set_phone_number.legal_terms')}
+      </Text>
     </Box>
   );
 
diff --git a/app/components/UI/Card/components/Onboarding/SignUp.tsx b/app/components/UI/Card/components/Onboarding/SignUp.tsx
index bacb3192e91..8ceeb3e9da6 100644
--- a/app/components/UI/Card/components/Onboarding/SignUp.tsx
+++ b/app/components/UI/Card/components/Onboarding/SignUp.tsx
@@ -5,6 +5,9 @@ import {
   FontWeight,
   Text,
   TextVariant,
+  Icon,
+  IconSize,
+  IconName,
 } from '@metamask/design-system-react-native';
 import Button, {
   ButtonSize,
@@ -38,13 +41,14 @@ import { TouchableOpacity } from 'react-native';
 const SignUp = () => {
   const navigation = useNavigation();
   const dispatch = useDispatch();
-
   const [email, setEmail] = useState('');
   const [isEmailError, setIsEmailError] = useState(false);
   const [password, setPassword] = useState('');
   const [confirmPassword, setConfirmPassword] = useState('');
   const [isPasswordError, setIsPasswordError] = useState(false);
+  const [isPasswordValid, setIsPasswordValid] = useState(false);
   const [isConfirmPasswordError, setIsConfirmPasswordError] = useState(false);
+  const [isConfirmPasswordValid, setIsConfirmPasswordValid] = useState(false);
   const selectedCountry = useSelector(selectSelectedCountry);
   const { data: registrationSettings } = useRegistrationSettings();
   const { trackEvent, createEventBuilder } = useMetrics();
@@ -96,14 +100,18 @@ const SignUp = () => {
     if (!debouncedPassword) {
       return;
     }
-    setIsPasswordError(!validatePassword(debouncedPassword));
+    const isValid = validatePassword(debouncedPassword);
+    setIsPasswordError(!isValid);
+    setIsPasswordValid(isValid);
   }, [debouncedPassword]);
 
   useEffect(() => {
     if (!debouncedConfirmPassword) {
       return;
     }
-    setIsConfirmPasswordError(debouncedConfirmPassword !== debouncedPassword);
+    const isValid = debouncedConfirmPassword === debouncedPassword;
+    setIsConfirmPasswordError(!isValid);
+    setIsConfirmPasswordValid(isValid);
   }, [debouncedConfirmPassword, debouncedPassword]);
 
   const isDisabled = useMemo(() => {
@@ -223,9 +231,6 @@ const SignUp = () => {
         <TextField
           autoCapitalize={'none'}
           onChangeText={handleEmailChange}
-          placeholder={strings(
-            'card.card_onboarding.sign_up.email_placeholder',
-          )}
           numberOfLines={1}
           size={TextFieldSize.Lg}
           value={email}
@@ -261,9 +266,6 @@ const SignUp = () => {
         <TextField
           autoCapitalize={'none'}
           onChangeText={handlePasswordChange}
-          placeholder={strings(
-            'card.card_onboarding.sign_up.password_placeholder',
-          )}
           numberOfLines={1}
           size={TextFieldSize.Lg}
           value={password}
@@ -274,6 +276,15 @@ const SignUp = () => {
           )}
           isError={debouncedPassword.length > 0 && isPasswordError}
           testID="signup-password-input"
+          endAccessory={
+            isPasswordValid ? (
+              <Icon
+                name={IconName.Confirmation}
+                size={IconSize.Md}
+                twClassName="text-success-default"
+              />
+            ) : null
+          }
         />
         {debouncedPassword.length > 0 && isPasswordError ? (
           <Text
@@ -283,7 +294,14 @@ const SignUp = () => {
           >
             {strings('card.card_onboarding.sign_up.invalid_password')}
           </Text>
-        ) : null}
+        ) : (
+          <Text
+            variant={TextVariant.BodySm}
+            twClassName="text-text-alternative"
+          >
+            {strings('card.card_onboarding.sign_up.password_placeholder')}
+          </Text>
+        )}
       </Box>
 
       <Box>
@@ -293,9 +311,6 @@ const SignUp = () => {
         <TextField
           autoCapitalize={'none'}
           onChangeText={setConfirmPassword}
-          placeholder={strings(
-            'card.card_onboarding.sign_up.password_placeholder',
-          )}
           numberOfLines={1}
           size={TextFieldSize.Lg}
           value={confirmPassword}
@@ -308,6 +323,15 @@ const SignUp = () => {
             debouncedConfirmPassword.length > 0 && isConfirmPasswordError
           }
           testID="signup-confirm-password-input"
+          endAccessory={
+            isConfirmPasswordValid ? (
+              <Icon
+                name={IconName.Confirmation}
+                size={IconSize.Md}
+                twClassName="text-success-default"
+              />
+            ) : null
+          }
         />
         {debouncedConfirmPassword.length > 0 && isConfirmPasswordError && (
           <Text
diff --git a/app/components/UI/Card/components/Onboarding/ValidatingKYC.test.tsx b/app/components/UI/Card/components/Onboarding/ValidatingKYC.test.tsx
index a44b9fd96d0..1d00aec2131 100644
--- a/app/components/UI/Card/components/Onboarding/ValidatingKYC.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/ValidatingKYC.test.tsx
@@ -9,6 +9,13 @@ jest.mock('../../hooks/useUserRegistrationStatus', () => ({
   default: jest.fn(),
 }));
 
+jest.mock('../../../../hooks/useMetrics', () => ({
+  useMetrics: jest.fn(),
+  MetaMetricsEvents: {
+    CARD_VIEWED: 'CARD_VIEWED',
+  },
+}));
+
 jest.mock('./OnboardingStep', () => {
   const React = jest.requireActual('react');
   const { View, Text } = jest.requireActual('react-native');
@@ -57,21 +64,36 @@ jest.mock('@metamask/design-system-react-native', () => {
       ...props
     }: React.PropsWithChildren<Record<string, unknown>>) =>
       React.createElement(Text, props, children),
+    Icon: ({ name, testID }: { name: string; testID?: string }) =>
+      React.createElement(View, { testID: testID || `icon-${name}` }),
+    IconName: {
+      Speed: 'Speed',
+      SecuritySearch: 'SecuritySearch',
+    },
+    IconSize: {
+      Lg: 'Lg',
+    },
+    IconColor: {
+      IconAlternative: 'IconAlternative',
+    },
+    TextVariant: {
+      BodyMd: 'BodyMd',
+    },
   };
 });
 
-jest.mock('../../../Button', () => {
+jest.mock('../../../../../component-library/components/Buttons/Button', () => {
   const React = jest.requireActual('react');
   const { TouchableOpacity, Text } = jest.requireActual('react-native');
 
   const MockButton = ({
-    children,
+    label,
     onPress,
     disabled,
     testID,
     ...props
   }: {
-    children: React.ReactNode;
+    label: string;
     onPress: () => void;
     disabled?: boolean;
     testID?: string;
@@ -80,15 +102,27 @@ jest.mock('../../../Button', () => {
     React.createElement(
       TouchableOpacity,
       {
-        testID: testID || 'validating-kyc-continue-button',
+        testID: testID || 'button',
         onPress,
         disabled,
         ...props,
       },
-      React.createElement(Text, {}, children),
+      React.createElement(Text, {}, label),
     );
 
-  return MockButton;
+  return {
+    __esModule: true,
+    default: MockButton,
+    ButtonVariants: {
+      Secondary: 'Secondary',
+    },
+    ButtonWidthTypes: {
+      Full: 'Full',
+    },
+    ButtonSize: {
+      Lg: 'Lg',
+    },
+  };
 });
 
 jest.mock('react-native', () => {
@@ -97,7 +131,7 @@ jest.mock('react-native', () => {
 
   return {
     ...RN,
-    ActivityIndicator: ({
+    Image: ({
       testID,
       ...props
     }: {
@@ -105,7 +139,7 @@ jest.mock('react-native', () => {
       [key: string]: unknown;
     }) =>
       React.createElement(RN.View, {
-        testID: testID || 'activity-indicator',
+        testID: testID || 'image',
         ...props,
       }),
   };
@@ -117,38 +151,58 @@ jest.mock('../../../../../../locales/i18n', () => ({
       'card.card_onboarding.validating_kyc.title': 'Validating your identity',
       'card.card_onboarding.validating_kyc.description':
         'Please wait while we validate your identity.',
-      'card.card_onboarding.continue_button': 'Continue',
+      'card.card_onboarding.close_button': 'Close',
+      'card.card_onboarding.validating_kyc.terms_1': 'Terms 1 text',
+      'card.card_onboarding.validating_kyc.terms_2': 'Terms 2 text',
     };
     return translations[key] || key;
   }),
 }));
 
 import React from 'react';
-import { render, waitFor } from '@testing-library/react-native';
+import { render, fireEvent, waitFor } from '@testing-library/react-native';
 import { useNavigation, useRoute } from '@react-navigation/native';
 import ValidatingKYC from './ValidatingKYC';
 import useUserRegistrationStatus from '../../hooks/useUserRegistrationStatus';
+import { useMetrics } from '../../../../hooks/useMetrics';
+import Routes from '../../../../../constants/navigation/Routes';
 
 describe('ValidatingKYC Component', () => {
   let mockNavigate: jest.Mock;
+  let mockReset: jest.Mock;
   let mockUseUserRegistrationStatus: jest.Mock;
   let mockStartPolling: jest.Mock;
   let mockStopPolling: jest.Mock;
+  let mockTrackEvent: jest.Mock;
+  let mockCreateEventBuilder: jest.Mock;
 
   beforeEach(() => {
     jest.clearAllMocks();
     mockNavigate = jest.fn();
+    mockReset = jest.fn();
     mockStartPolling = jest.fn();
     mockStopPolling = jest.fn();
+    mockTrackEvent = jest.fn();
+    mockCreateEventBuilder = jest.fn().mockReturnValue({
+      addProperties: jest.fn().mockReturnValue({
+        build: jest.fn().mockReturnValue({ event: 'test' }),
+      }),
+    });
 
     (useNavigation as jest.Mock).mockReturnValue({
       navigate: mockNavigate,
+      reset: mockReset,
     });
 
     (useRoute as jest.Mock).mockReturnValue({
       params: { sessionUrl: 'https://example.com/session' },
     });
 
+    (useMetrics as jest.Mock).mockReturnValue({
+      trackEvent: mockTrackEvent,
+      createEventBuilder: mockCreateEventBuilder,
+    });
+
     // Default mock for useUserRegistrationStatus
     mockUseUserRegistrationStatus = jest.fn().mockReturnValue({
       verificationState: 'PENDING',
@@ -168,11 +222,13 @@ describe('ValidatingKYC Component', () => {
   describe('Initial Render', () => {
     it('renders onboarding step with correct testID', () => {
       const { getByTestId } = render(<ValidatingKYC />);
+
       expect(getByTestId('onboarding-step')).toBeTruthy();
     });
 
     it('renders title with correct text', () => {
       const { getByTestId } = render(<ValidatingKYC />);
+
       const title = getByTestId('onboarding-step-title');
       expect(title).toBeTruthy();
       expect(title.props.children).toBe('Validating your identity');
@@ -180,28 +236,142 @@ describe('ValidatingKYC Component', () => {
 
     it('renders description with correct text', () => {
       const { getByTestId } = render(<ValidatingKYC />);
+
       const description = getByTestId('onboarding-step-description');
       expect(description).toBeTruthy();
     });
 
-    it('renders activity indicator when loading', () => {
+    it('renders form fields with image and info boxes', () => {
       const { getByTestId } = render(<ValidatingKYC />);
+
       const formFields = getByTestId('onboarding-step-form-fields');
-      expect(formFields.children).toHaveLength(1);
-      // ActivityIndicator is rendered in the form fields
       expect(formFields).toBeTruthy();
+      expect(formFields.children.length).toBeGreaterThan(0);
+    });
+
+    it('renders close button in actions', () => {
+      const { getByTestId } = render(<ValidatingKYC />);
+
+      const closeButton = getByTestId('validating-kyc-close-button');
+      expect(closeButton).toBeTruthy();
+    });
+  });
+
+  describe('Close Button Navigation', () => {
+    it('navigates to wallet home when close button is pressed', () => {
+      const { getByTestId } = render(<ValidatingKYC />);
+
+      const closeButton = getByTestId('validating-kyc-close-button');
+      fireEvent.press(closeButton);
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
+    });
+
+    it('calls navigate exactly once per button press', () => {
+      const { getByTestId } = render(<ValidatingKYC />);
+
+      const closeButton = getByTestId('validating-kyc-close-button');
+      fireEvent.press(closeButton);
+
+      expect(mockNavigate).toHaveBeenCalledTimes(1);
+    });
+
+    it('calls navigate multiple times for multiple button presses', () => {
+      const { getByTestId } = render(<ValidatingKYC />);
+
+      const closeButton = getByTestId('validating-kyc-close-button');
+      fireEvent.press(closeButton);
+      fireEvent.press(closeButton);
+      fireEvent.press(closeButton);
+
+      expect(mockNavigate).toHaveBeenCalledTimes(3);
+      expect(mockNavigate).toHaveBeenNthCalledWith(1, Routes.WALLET.HOME);
+      expect(mockNavigate).toHaveBeenNthCalledWith(2, Routes.WALLET.HOME);
+      expect(mockNavigate).toHaveBeenNthCalledWith(3, Routes.WALLET.HOME);
+    });
+
+    it('uses navigate (not reset) for close button', () => {
+      const { getByTestId } = render(<ValidatingKYC />);
+
+      const closeButton = getByTestId('validating-kyc-close-button');
+      fireEvent.press(closeButton);
+
+      expect(mockNavigate).toHaveBeenCalled();
+      expect(mockReset).not.toHaveBeenCalled();
+    });
+
+    it('navigates to wallet home while verification is PENDING', () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'PENDING',
+        userResponse: null,
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      const { getByTestId } = render(<ValidatingKYC />);
+
+      const closeButton = getByTestId('validating-kyc-close-button');
+      fireEvent.press(closeButton);
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
+    });
+
+    it('navigates to wallet home while verification is loading', () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: null,
+        userResponse: null,
+        isLoading: true,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      const { getByTestId } = render(<ValidatingKYC />);
+
+      const closeButton = getByTestId('validating-kyc-close-button');
+      fireEvent.press(closeButton);
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
     });
 
-    it('renders no actions (null)', () => {
+    it('navigates to wallet home when there is an error', () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: null,
+        userResponse: null,
+        isLoading: false,
+        isError: true,
+        error: 'Verification failed',
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
       const { getByTestId } = render(<ValidatingKYC />);
-      const actions = getByTestId('onboarding-step-actions');
-      expect(actions).toBeTruthy();
-      expect(actions.children).toHaveLength(0);
+
+      const closeButton = getByTestId('validating-kyc-close-button');
+      fireEvent.press(closeButton);
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
+    });
+  });
+
+  describe('Metrics Tracking', () => {
+    it('tracks CARD_VIEWED event on mount', () => {
+      render(<ValidatingKYC />);
+
+      expect(mockCreateEventBuilder).toHaveBeenCalled();
+      expect(mockTrackEvent).toHaveBeenCalled();
     });
   });
 
   describe('Error States', () => {
-    it('shows error state when isError is true', () => {
+    it('renders component when isError is true', () => {
       mockUseUserRegistrationStatus.mockReturnValue({
         verificationState: null,
         userResponse: null,
@@ -215,14 +385,10 @@ describe('ValidatingKYC Component', () => {
 
       const { getByTestId } = render(<ValidatingKYC />);
 
-      // Component should still render but in error state
       expect(getByTestId('onboarding-step')).toBeTruthy();
-      // No buttons are rendered in error state
-      const actions = getByTestId('onboarding-step-actions');
-      expect(actions.children).toHaveLength(0);
     });
 
-    it('handles error state with null error message', () => {
+    it('renders component when error message is null', () => {
       mockUseUserRegistrationStatus.mockReturnValue({
         verificationState: null,
         userResponse: null,
@@ -235,12 +401,13 @@ describe('ValidatingKYC Component', () => {
       });
 
       const { getByTestId } = render(<ValidatingKYC />);
+
       expect(getByTestId('onboarding-step')).toBeTruthy();
     });
   });
 
   describe('Loading States', () => {
-    it('shows loading state when isLoading is true', () => {
+    it('renders component when isLoading is true', () => {
       mockUseUserRegistrationStatus.mockReturnValue({
         verificationState: null,
         userResponse: null,
@@ -253,13 +420,11 @@ describe('ValidatingKYC Component', () => {
       });
 
       const { getByTestId } = render(<ValidatingKYC />);
-      const formFields = getByTestId('onboarding-step-form-fields');
-      expect(formFields.children).toHaveLength(1);
-      // ActivityIndicator is rendered in the form fields
-      expect(formFields).toBeTruthy();
+
+      expect(getByTestId('onboarding-step')).toBeTruthy();
     });
 
-    it('handles loading state with verification pending', () => {
+    it('renders component when verification is pending and loading', () => {
       mockUseUserRegistrationStatus.mockReturnValue({
         verificationState: 'PENDING',
         userResponse: null,
@@ -272,15 +437,13 @@ describe('ValidatingKYC Component', () => {
       });
 
       const { getByTestId } = render(<ValidatingKYC />);
-      const formFields = getByTestId('onboarding-step-form-fields');
-      expect(formFields.children).toHaveLength(1);
-      // ActivityIndicator is rendered in the form fields
-      expect(formFields).toBeTruthy();
+
+      expect(getByTestId('onboarding-step')).toBeTruthy();
     });
   });
 
   describe('User States - Verification Status Navigation', () => {
-    it('navigates to PERSONAL_DETAILS when verificationState is VERIFIED', async () => {
+    it('resets navigation to COMPLETE when verificationState is VERIFIED', async () => {
       mockUseUserRegistrationStatus.mockReturnValue({
         verificationState: 'VERIFIED',
         userResponse: { verificationState: 'VERIFIED' },
@@ -295,13 +458,14 @@ describe('ValidatingKYC Component', () => {
       render(<ValidatingKYC />);
 
       await waitFor(() => {
-        expect(mockNavigate).toHaveBeenCalledWith(
-          'CardOnboardingPersonalDetails',
-        );
+        expect(mockReset).toHaveBeenCalledWith({
+          index: 0,
+          routes: [{ name: Routes.CARD.ONBOARDING.COMPLETE }],
+        });
       });
     });
 
-    it('navigates to KYC_FAILED when verificationState is REJECTED', async () => {
+    it('resets navigation to KYC_FAILED when verificationState is REJECTED', async () => {
       mockUseUserRegistrationStatus.mockReturnValue({
         verificationState: 'REJECTED',
         userResponse: { verificationState: 'REJECTED' },
@@ -316,7 +480,10 @@ describe('ValidatingKYC Component', () => {
       render(<ValidatingKYC />);
 
       await waitFor(() => {
-        expect(mockNavigate).toHaveBeenCalledWith('CardOnboardingKYCFailed');
+        expect(mockReset).toHaveBeenCalledWith({
+          index: 0,
+          routes: [{ name: Routes.CARD.ONBOARDING.KYC_FAILED }],
+        });
       });
     });
 
@@ -334,28 +501,211 @@ describe('ValidatingKYC Component', () => {
 
       render(<ValidatingKYC />);
 
-      // Wait a bit to ensure no navigation occurs
-      await new Promise((resolve) => setTimeout(resolve, 100));
+      await waitFor(
+        () => {
+          expect(mockReset).not.toHaveBeenCalled();
+        },
+        { timeout: 100 },
+      );
+    });
+
+    it('does not navigate when verificationState is null', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: null,
+        userResponse: null,
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
 
-      expect(mockNavigate).not.toHaveBeenCalled();
+      render(<ValidatingKYC />);
+
+      await waitFor(
+        () => {
+          expect(mockReset).not.toHaveBeenCalled();
+        },
+        { timeout: 100 },
+      );
     });
-  });
 
-  describe('Button Interaction and Navigation', () => {
-    it('does not render any buttons', () => {
-      const { queryByTestId } = render(<ValidatingKYC />);
-      const button = queryByTestId('validating-kyc-continue-button');
-      expect(button).toBeNull();
+    it('does not navigate when verificationState is undefined', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: undefined,
+        userResponse: null,
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      render(<ValidatingKYC />);
+
+      await waitFor(
+        () => {
+          expect(mockReset).not.toHaveBeenCalled();
+        },
+        { timeout: 100 },
+      );
+    });
+
+    it('uses reset (not navigate) for verification state changes', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'VERIFIED',
+        userResponse: { verificationState: 'VERIFIED' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      render(<ValidatingKYC />);
+
+      await waitFor(() => {
+        expect(mockReset).toHaveBeenCalled();
+        expect(mockNavigate).not.toHaveBeenCalled();
+      });
+    });
+
+    it('resets with index 0 for VERIFIED state', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'VERIFIED',
+        userResponse: { verificationState: 'VERIFIED' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      render(<ValidatingKYC />);
+
+      await waitFor(() => {
+        const resetCall = mockReset.mock.calls[0][0];
+        expect(resetCall.index).toBe(0);
+      });
+    });
+
+    it('resets with index 0 for REJECTED state', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'REJECTED',
+        userResponse: { verificationState: 'REJECTED' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      render(<ValidatingKYC />);
+
+      await waitFor(() => {
+        const resetCall = mockReset.mock.calls[0][0];
+        expect(resetCall.index).toBe(0);
+      });
+    });
+
+    it('resets with single route in routes array for VERIFIED', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'VERIFIED',
+        userResponse: { verificationState: 'VERIFIED' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      render(<ValidatingKYC />);
+
+      await waitFor(() => {
+        const resetCall = mockReset.mock.calls[0][0];
+        expect(resetCall.routes).toHaveLength(1);
+      });
+    });
+
+    it('resets with single route in routes array for REJECTED', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'REJECTED',
+        userResponse: { verificationState: 'REJECTED' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      render(<ValidatingKYC />);
+
+      await waitFor(() => {
+        const resetCall = mockReset.mock.calls[0][0];
+        expect(resetCall.routes).toHaveLength(1);
+      });
+    });
+
+    it('does not navigate for unknown verification states', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'UNKNOWN_STATE',
+        userResponse: { verificationState: 'UNKNOWN_STATE' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      render(<ValidatingKYC />);
+
+      await waitFor(
+        () => {
+          expect(mockReset).not.toHaveBeenCalled();
+        },
+        { timeout: 100 },
+      );
+    });
+
+    it('does not navigate when verificationState is empty string', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: '',
+        userResponse: null,
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      render(<ValidatingKYC />);
+
+      await waitFor(
+        () => {
+          expect(mockReset).not.toHaveBeenCalled();
+        },
+        { timeout: 100 },
+      );
     });
   });
 
   describe('Navigation Integration', () => {
     it('uses useNavigation hook', () => {
       render(<ValidatingKYC />);
+
       expect(useNavigation).toHaveBeenCalled();
     });
 
-    it('calls navigate with correct route for automatic navigation', async () => {
+    it('calls reset with correct route for VERIFIED state', async () => {
       mockUseUserRegistrationStatus.mockReturnValue({
         verificationState: 'VERIFIED',
         userResponse: { verificationState: 'VERIFIED' },
@@ -370,11 +720,270 @@ describe('ValidatingKYC Component', () => {
       render(<ValidatingKYC />);
 
       await waitFor(() => {
-        expect(mockNavigate).toHaveBeenCalledWith(
-          'CardOnboardingPersonalDetails',
-        );
+        expect(mockReset).toHaveBeenCalledWith({
+          index: 0,
+          routes: [{ name: Routes.CARD.ONBOARDING.COMPLETE }],
+        });
+      });
+    });
+
+    it('calls reset with correct route for REJECTED state', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'REJECTED',
+        userResponse: { verificationState: 'REJECTED' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      render(<ValidatingKYC />);
+
+      await waitFor(() => {
+        expect(mockReset).toHaveBeenCalledWith({
+          index: 0,
+          routes: [{ name: Routes.CARD.ONBOARDING.KYC_FAILED }],
+        });
       });
     });
+
+    it('provides both navigate and reset methods from useNavigation', () => {
+      render(<ValidatingKYC />);
+
+      expect(useNavigation).toHaveBeenCalled();
+      // Verify the navigation object has the expected methods
+      const navigationReturn = (useNavigation as jest.Mock).mock.results[0]
+        .value;
+      expect(navigationReturn.navigate).toBeDefined();
+      expect(navigationReturn.reset).toBeDefined();
+    });
+  });
+
+  describe('Navigation State Transitions', () => {
+    it('triggers navigation when verification state transitions to VERIFIED', async () => {
+      // Start with PENDING state
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'PENDING',
+        userResponse: null,
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      const { rerender } = render(<ValidatingKYC />);
+
+      // Verify no navigation yet
+      expect(mockReset).not.toHaveBeenCalled();
+
+      // Simulate state change to VERIFIED
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'VERIFIED',
+        userResponse: { verificationState: 'VERIFIED' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      rerender(<ValidatingKYC />);
+
+      await waitFor(() => {
+        expect(mockReset).toHaveBeenCalledWith({
+          index: 0,
+          routes: [{ name: Routes.CARD.ONBOARDING.COMPLETE }],
+        });
+      });
+    });
+
+    it('triggers navigation when verification state transitions to REJECTED', async () => {
+      // Start with PENDING state
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'PENDING',
+        userResponse: null,
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      const { rerender } = render(<ValidatingKYC />);
+
+      // Verify no navigation yet
+      expect(mockReset).not.toHaveBeenCalled();
+
+      // Simulate state change to REJECTED
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'REJECTED',
+        userResponse: { verificationState: 'REJECTED' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      rerender(<ValidatingKYC />);
+
+      await waitFor(() => {
+        expect(mockReset).toHaveBeenCalledWith({
+          index: 0,
+          routes: [{ name: Routes.CARD.ONBOARDING.KYC_FAILED }],
+        });
+      });
+    });
+
+    it('does not navigate when state remains PENDING', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'PENDING',
+        userResponse: null,
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      const { rerender } = render(<ValidatingKYC />);
+
+      // Re-render with same state
+      rerender(<ValidatingKYC />);
+      rerender(<ValidatingKYC />);
+
+      await waitFor(
+        () => {
+          expect(mockReset).not.toHaveBeenCalled();
+        },
+        { timeout: 100 },
+      );
+    });
+
+    it('handles rapid state transitions correctly', async () => {
+      // Start with null
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: null,
+        userResponse: null,
+        isLoading: true,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      const { rerender } = render(<ValidatingKYC />);
+
+      // Transition to PENDING
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'PENDING',
+        userResponse: null,
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      rerender(<ValidatingKYC />);
+
+      // Transition to VERIFIED
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'VERIFIED',
+        userResponse: { verificationState: 'VERIFIED' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      rerender(<ValidatingKYC />);
+
+      await waitFor(() => {
+        expect(mockReset).toHaveBeenCalledWith({
+          index: 0,
+          routes: [{ name: Routes.CARD.ONBOARDING.COMPLETE }],
+        });
+      });
+    });
+  });
+
+  describe('Navigation and Polling Coordination', () => {
+    it('continues polling while verification state is PENDING', () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'PENDING',
+        userResponse: null,
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      render(<ValidatingKYC />);
+
+      expect(mockStartPolling).toHaveBeenCalled();
+      expect(mockReset).not.toHaveBeenCalled();
+    });
+
+    it('stops polling on unmount even when navigating to COMPLETE', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'VERIFIED',
+        userResponse: { verificationState: 'VERIFIED' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      const { unmount } = render(<ValidatingKYC />);
+
+      await waitFor(() => {
+        expect(mockReset).toHaveBeenCalled();
+      });
+
+      unmount();
+
+      expect(mockStopPolling).toHaveBeenCalled();
+    });
+
+    it('stops polling on unmount even when navigating to KYC_FAILED', async () => {
+      mockUseUserRegistrationStatus.mockReturnValue({
+        verificationState: 'REJECTED',
+        userResponse: { verificationState: 'REJECTED' },
+        isLoading: false,
+        isError: false,
+        error: null,
+        clearError: jest.fn(),
+        startPolling: mockStartPolling,
+        stopPolling: mockStopPolling,
+      });
+
+      const { unmount } = render(<ValidatingKYC />);
+
+      await waitFor(() => {
+        expect(mockReset).toHaveBeenCalled();
+      });
+
+      unmount();
+
+      expect(mockStopPolling).toHaveBeenCalled();
+    });
   });
 
   describe('Polling Lifecycle', () => {
@@ -423,6 +1032,7 @@ describe('ValidatingKYC Component', () => {
 
     it('integrates with useUserRegistrationStatus hook', () => {
       render(<ValidatingKYC />);
+
       expect(useUserRegistrationStatus).toHaveBeenCalled();
     });
   });
@@ -430,6 +1040,7 @@ describe('ValidatingKYC Component', () => {
   describe('i18n Integration', () => {
     it('uses correct i18n keys for title', () => {
       const { getByTestId } = render(<ValidatingKYC />);
+
       const title = getByTestId('onboarding-step-title');
       expect(title.props.children).toBe('Validating your identity');
     });
diff --git a/app/components/UI/Card/components/Onboarding/ValidatingKYC.tsx b/app/components/UI/Card/components/Onboarding/ValidatingKYC.tsx
index 2c3cd4b434a..79fcd03eb7e 100644
--- a/app/components/UI/Card/components/Onboarding/ValidatingKYC.tsx
+++ b/app/components/UI/Card/components/Onboarding/ValidatingKYC.tsx
@@ -1,20 +1,33 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useCallback } from 'react';
+import { Image } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import OnboardingStep from './OnboardingStep';
 import { strings } from '../../../../../../locales/i18n';
 import Routes from '../../../../../constants/navigation/Routes';
-import { ActivityIndicator } from 'react-native';
 import useUserRegistrationStatus from '../../hooks/useUserRegistrationStatus';
 import { MetaMetricsEvents, useMetrics } from '../../../../hooks/useMetrics';
 import { CardScreens } from '../../util/metrics';
+import MM_CARD_KYC_PENDING from '../../../../../images/mm-card-KYC-pending.png';
+import { Box, Text, TextVariant } from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import Button, {
+  ButtonVariants,
+  ButtonWidthTypes,
+  ButtonSize,
+} from '../../../../../component-library/components/Buttons/Button';
 
 const ValidatingKYC = () => {
   const navigation = useNavigation();
+  const tw = useTailwind();
   const { trackEvent, createEventBuilder } = useMetrics();
 
   const { verificationState, startPolling, stopPolling } =
     useUserRegistrationStatus();
 
+  const handleClose = useCallback(() => {
+    navigation.navigate(Routes.WALLET.HOME);
+  }, [navigation]);
+
   useEffect(() => {
     trackEvent(
       createEventBuilder(MetaMetricsEvents.CARD_VIEWED)
@@ -34,20 +47,52 @@ const ValidatingKYC = () => {
 
   useEffect(() => {
     if (verificationState === 'VERIFIED') {
-      navigation.navigate(Routes.CARD.ONBOARDING.PERSONAL_DETAILS);
+      navigation.reset({
+        index: 0,
+        routes: [{ name: Routes.CARD.ONBOARDING.COMPLETE }],
+      });
     } else if (verificationState === 'REJECTED') {
-      navigation.navigate(Routes.CARD.ONBOARDING.KYC_FAILED);
+      navigation.reset({
+        index: 0,
+        routes: [{ name: Routes.CARD.ONBOARDING.KYC_FAILED }],
+      });
     }
   }, [verificationState, navigation]);
 
-  const renderFormFields = () => <ActivityIndicator />;
+  const renderFormFields = () => (
+    <>
+      <Box twClassName="flex flex-1 items-center justify-center">
+        <Image
+          source={MM_CARD_KYC_PENDING}
+          resizeMode="contain"
+          style={tw.style('w-full h-full')}
+        />
+      </Box>
+
+      <Text
+        variant={TextVariant.BodyMd}
+        twClassName="text-center text-text-alternative"
+      >
+        {strings('card.card_onboarding.validating_kyc.terms')}
+      </Text>
+    </>
+  );
 
-  const renderActions = () => null;
+  const renderActions = () => (
+    <Button
+      variant={ButtonVariants.Secondary}
+      label={strings('card.card_onboarding.close_button')}
+      size={ButtonSize.Lg}
+      onPress={handleClose}
+      width={ButtonWidthTypes.Full}
+      testID="validating-kyc-close-button"
+    />
+  );
 
   return (
     <OnboardingStep
       title={strings('card.card_onboarding.validating_kyc.title')}
-      description={''}
+      description={strings('card.card_onboarding.validating_kyc.description')}
       formFields={renderFormFields()}
       actions={renderActions()}
     />
diff --git a/app/components/UI/Card/components/Onboarding/VerifyIdentity.test.tsx b/app/components/UI/Card/components/Onboarding/VerifyIdentity.test.tsx
index ce4af13c6ab..0958c9685d8 100644
--- a/app/components/UI/Card/components/Onboarding/VerifyIdentity.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/VerifyIdentity.test.tsx
@@ -15,6 +15,41 @@ jest.mock('@react-navigation/native', () => ({
 // Mock useStartVerification hook
 jest.mock('../../hooks/useStartVerification');
 
+// Mock useMetrics hook
+const mockTrackEvent = jest.fn();
+const mockCreateEventBuilder = jest.fn(() => ({
+  addProperties: jest.fn().mockReturnThis(),
+  build: jest.fn().mockReturnValue({ event: 'test' }),
+}));
+
+jest.mock('../../../../hooks/useMetrics', () => ({
+  useMetrics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  }),
+  MetaMetricsEvents: {
+    CARD_BUTTON_CLICKED: 'CARD_BUTTON_CLICKED',
+    CARD_VIEWED: 'CARD_VIEWED',
+  },
+}));
+
+// Mock metrics util
+jest.mock('../../util/metrics', () => ({
+  CardActions: {
+    VERIFY_IDENTITY_BUTTON: 'VERIFY_IDENTITY_BUTTON',
+  },
+  CardScreens: {
+    VERIFY_IDENTITY: 'VERIFY_IDENTITY',
+  },
+}));
+
+// Mock useTailwind hook
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({
+    style: jest.fn(() => ({})),
+  }),
+}));
+
 // Mock OnboardingStep component
 jest.mock('./OnboardingStep', () => {
   const React = jest.requireActual('react');
@@ -65,8 +100,21 @@ jest.mock('@metamask/design-system-react-native', () => {
       ...props
     }: React.PropsWithChildren<Record<string, unknown>>) =>
       React.createElement(Text, props, children),
+    Icon: ({ name, ...props }: { name: string } & Record<string, unknown>) =>
+      React.createElement(View, { ...props, testID: `icon-${name}` }),
     TextVariant: {
       BodySm: 'BodySm',
+      BodyMd: 'BodyMd',
+    },
+    IconName: {
+      EyeSlash: 'EyeSlash',
+      Verified: 'Verified',
+    },
+    IconSize: {
+      Lg: 'Lg',
+    },
+    IconColor: {
+      IconAlternative: 'IconAlternative',
     },
   };
 });
@@ -144,6 +192,10 @@ jest.mock('../../../../../../locales/i18n', () => ({
       'card.card_onboarding.continue_button': 'Continue',
       'card.card_onboarding.verify_identity.start_verification_error':
         'Unable to start verification. Please try again.',
+      'card.card_onboarding.verify_identity.terms_1':
+        'Your identity data is encrypted and stored securely.',
+      'card.card_onboarding.verify_identity.terms_2':
+        'We verify your identity with a trusted partner.',
     };
     return mockStrings[key] || key;
   }),
@@ -180,6 +232,8 @@ describe('VerifyIdentity Component', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockTrackEvent.mockClear();
+    mockCreateEventBuilder.mockClear();
 
     (useNavigation as jest.Mock).mockReturnValue({
       navigate: mockNavigate,
@@ -540,5 +594,54 @@ describe('VerifyIdentity Component', () => {
         'card.card_onboarding.verify_identity.start_verification_error',
       );
     });
+
+    it('uses correct i18n keys for terms text', () => {
+      const { strings } = jest.requireMock('../../../../../../locales/i18n');
+
+      render(
+        <Provider store={store}>
+          <VerifyIdentity />
+        </Provider>,
+      );
+
+      expect(strings).toHaveBeenCalledWith(
+        'card.card_onboarding.verify_identity.terms_1',
+      );
+      expect(strings).toHaveBeenCalledWith(
+        'card.card_onboarding.verify_identity.terms_2',
+      );
+    });
+  });
+
+  describe('Metrics Tracking', () => {
+    it('tracks CARD_VIEWED event on component mount', () => {
+      render(
+        <Provider store={store}>
+          <VerifyIdentity />
+        </Provider>,
+      );
+
+      expect(mockCreateEventBuilder).toHaveBeenCalled();
+      expect(mockTrackEvent).toHaveBeenCalled();
+    });
+
+    it('tracks CARD_BUTTON_CLICKED event when continue button is pressed', async () => {
+      const { getByTestId } = render(
+        <Provider store={store}>
+          <VerifyIdentity />
+        </Provider>,
+      );
+
+      mockTrackEvent.mockClear();
+      mockCreateEventBuilder.mockClear();
+
+      const button = getByTestId('verify-identity-continue-button');
+      fireEvent.press(button);
+
+      await waitFor(() => {
+        expect(mockCreateEventBuilder).toHaveBeenCalled();
+        expect(mockTrackEvent).toHaveBeenCalled();
+      });
+    });
   });
 });
diff --git a/app/components/UI/Card/components/Onboarding/VerifyIdentity.tsx b/app/components/UI/Card/components/Onboarding/VerifyIdentity.tsx
index e37400133e9..19551764507 100644
--- a/app/components/UI/Card/components/Onboarding/VerifyIdentity.tsx
+++ b/app/components/UI/Card/components/Onboarding/VerifyIdentity.tsx
@@ -1,8 +1,17 @@
 import React, { useCallback, useEffect } from 'react';
+import { Image } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import OnboardingStep from './OnboardingStep';
 import { strings } from '../../../../../../locales/i18n';
-import { Text, TextVariant } from '@metamask/design-system-react-native';
+import {
+  Box,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
 import Button, {
   ButtonSize,
   ButtonVariants,
@@ -12,9 +21,12 @@ import Routes from '../../../../../constants/navigation/Routes';
 import useStartVerification from '../../hooks/useStartVerification';
 import { MetaMetricsEvents, useMetrics } from '../../../../hooks/useMetrics';
 import { CardActions, CardScreens } from '../../util/metrics';
+import MM_CARD_VERIFY_IDENTITY from '../../../../../images/mm-card-verify.png';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 
 const VerifyIdentity = () => {
   const navigation = useNavigation();
+  const tw = useTailwind();
   const { trackEvent, createEventBuilder } = useMetrics();
   const {
     data: verificationResponse,
@@ -53,6 +65,40 @@ const VerifyIdentity = () => {
 
   const renderFormFields = () => (
     <>
+      <Box twClassName="flex flex-1 items-center justify-center">
+        <Image
+          source={MM_CARD_VERIFY_IDENTITY}
+          resizeMode="contain"
+          style={tw.style('w-full h-full')}
+        />
+      </Box>
+      <Box twClassName="flex flex-row gap-3">
+        <Icon
+          name={IconName.EyeSlash}
+          size={IconSize.Lg}
+          color={IconColor.IconAlternative}
+        />
+        <Text
+          variant={TextVariant.BodyMd}
+          twClassName="flex-1 flex-shrink text-text-alternative"
+        >
+          {strings('card.card_onboarding.verify_identity.terms_1')}
+        </Text>
+      </Box>
+      <Box twClassName="flex flex-row gap-3">
+        <Icon
+          name={IconName.Fingerprint}
+          size={IconSize.Lg}
+          color={IconColor.IconAlternative}
+        />
+        <Text
+          variant={TextVariant.BodyMd}
+          twClassName="flex-1 flex-shrink text-text-alternative"
+        >
+          {strings('card.card_onboarding.verify_identity.terms_2')}
+        </Text>
+      </Box>
+
       {startVerificationIsError ? (
         <Text
           variant={TextVariant.BodySm}
diff --git a/app/components/UI/Card/routes/OnboardingNavigator.test.tsx b/app/components/UI/Card/routes/OnboardingNavigator.test.tsx
index f9d50606c72..c05962c5e2d 100644
--- a/app/components/UI/Card/routes/OnboardingNavigator.test.tsx
+++ b/app/components/UI/Card/routes/OnboardingNavigator.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react-native';
+import { render, fireEvent } from '@testing-library/react-native';
 import { useSelector } from 'react-redux';
 import {
   NavigationContainer,
@@ -9,11 +9,12 @@ import {
 import { Alert } from 'react-native';
 import OnboardingNavigator, {
   KYCModalNavigationOptions,
+  PersonalDetailsNavigationOptions,
 } from './OnboardingNavigator';
 import { useCardSDK } from '../sdk';
-import { strings } from '../../../../../locales/i18n';
 import { CardSDK } from '../sdk/CardSDK';
 import { useParams } from '../../../../util/navigation/navUtils';
+import Routes from '../../../../constants/navigation/Routes';
 
 // Mock dependencies
 jest.mock('react-redux', () => ({
@@ -50,22 +51,29 @@ jest.mock('@react-navigation/native', () => {
 });
 
 // Mock @react-navigation/stack
-jest.mock('@react-navigation/stack', () => ({
-  createStackNavigator: () => ({
-    Navigator: ({
-      children,
-      ...props
-    }: React.PropsWithChildren<Record<string, unknown>>) => (
-      <div {...props}>{children}</div>
-    ),
-    Screen: ({
-      children,
-      ...props
-    }: React.PropsWithChildren<{ name: string }>) => (
-      <div {...props}>{children}</div>
-    ),
-  }),
-}));
+jest.mock('@react-navigation/stack', () => {
+  const { View } = jest.requireActual('react-native');
+  return {
+    createStackNavigator: () => ({
+      Navigator: ({
+        children,
+        ...props
+      }: React.PropsWithChildren<Record<string, unknown>>) => (
+        <View testID="stack-navigator" {...props}>
+          {children}
+        </View>
+      ),
+      Screen: ({
+        children,
+        ...props
+      }: React.PropsWithChildren<{ name: string }>) => (
+        <View testID={`screen-${props.name}`} {...props}>
+          {children}
+        </View>
+      ),
+    }),
+  };
+});
 
 // Mock navigation components
 jest.mock('../components/Onboarding/SignUp', () => 'SignUp');
@@ -81,15 +89,12 @@ jest.mock('../components/Onboarding/KYCFailed', () => 'KYCFailed');
 jest.mock('../components/Onboarding/PersonalDetails', () => 'PersonalDetails');
 jest.mock('../components/Onboarding/PhysicalAddress', () => 'PhysicalAddress');
 jest.mock('../components/Onboarding/MailingAddress', () => 'MailingAddress');
-jest.mock(
-  '../components/Onboarding/VerifyingRegistration',
-  () => 'VerifyingRegistration',
-);
+jest.mock('../components/Onboarding/Complete', () => 'Complete');
 jest.mock('../components/Onboarding/KYCWebview', () => 'KYCWebview');
 
 // Mock navigation options
 jest.mock('.', () => ({
-  cardAuthenticationNavigationOptions: {},
+  cardDefaultNavigationOptions: {},
   headerStyle: {
     title: { fontSize: 16 },
     icon: { padding: 8 },
@@ -126,14 +131,17 @@ jest.mock('../../../../component-library/components/Icons/Icon', () => ({
   },
 }));
 
-jest.mock('@metamask/design-system-react-native', () => ({
-  Box: ({
-    children,
-    ...props
-  }: React.PropsWithChildren<Record<string, unknown>>) => (
-    <div {...props}>{children}</div>
-  ),
-}));
+jest.mock('@metamask/design-system-react-native', () => {
+  const { View } = jest.requireActual('react-native');
+  return {
+    Box: ({
+      children,
+      ...props
+    }: React.PropsWithChildren<Record<string, unknown>>) => (
+      <View {...props}>{children}</View>
+    ),
+  };
+});
 
 // Mock Routes
 jest.mock('../../../../constants/navigation/Routes', () => ({
@@ -149,7 +157,7 @@ jest.mock('../../../../constants/navigation/Routes', () => ({
       PERSONAL_DETAILS: 'PERSONAL_DETAILS',
       PHYSICAL_ADDRESS: 'PHYSICAL_ADDRESS',
       MAILING_ADDRESS: 'MAILING_ADDRESS',
-      VERIFYING_REGISTRATION: 'VERIFYING_REGISTRATION',
+      COMPLETE: 'COMPLETE',
       WEBVIEW: 'WEBVIEW',
     },
   },
@@ -239,12 +247,17 @@ describe('OnboardingNavigator', () => {
 
           // Verify the navigator renders (not loading)
           expect(queryByTestId('activity-indicator')).toBeNull();
+          const stackNavigator = queryByTestId('stack-navigator');
+          expect(stackNavigator).not.toBeNull();
+          expect(stackNavigator?.props.initialRouteName).toBe(
+            Routes.CARD.ONBOARDING.SIGN_UP,
+          );
         });
 
-        it('returns SIGN_UP route when user has no id', () => {
+        it('returns SIGN_UP route when user has no verificationState', () => {
           mockUseSelector.mockReturnValue('onboarding-123');
           mockUseCardSDK.mockReturnValue({
-            user: { id: 'user-123', verificationState: 'PENDING' }, // user without id
+            user: { id: 'user-123' }, // user without verificationState - falls back to SIGN_UP
             isLoading: false,
             sdk: null,
             setUser: jest.fn(),
@@ -257,6 +270,12 @@ describe('OnboardingNavigator', () => {
           );
 
           expect(queryByTestId('activity-indicator')).toBeNull();
+          // Fallback to SIGN_UP when verificationState is missing
+          const stackNavigator = queryByTestId('stack-navigator');
+          expect(stackNavigator).not.toBeNull();
+          expect(stackNavigator?.props.initialRouteName).toBe(
+            Routes.CARD.ONBOARDING.SIGN_UP,
+          );
         });
       });
 
@@ -281,7 +300,11 @@ describe('OnboardingNavigator', () => {
             <OnboardingNavigator />,
           );
 
-          expect(queryByTestId('activity-indicator')).toBeNull();
+          const stackNavigator = queryByTestId('stack-navigator');
+          expect(stackNavigator).not.toBeNull();
+          expect(stackNavigator?.props.initialRouteName).toBe(
+            Routes.CARD.ONBOARDING.VERIFY_IDENTITY,
+          );
         });
 
         it('returns VERIFY_IDENTITY route when countryOfNationality is missing', () => {
@@ -304,30 +327,11 @@ describe('OnboardingNavigator', () => {
             <OnboardingNavigator />,
           );
 
-          expect(queryByTestId('activity-indicator')).toBeNull();
-        });
-
-        it('returns VERIFY_IDENTITY route when both firstName and countryOfNationality are missing', () => {
-          mockUseSelector.mockReturnValue('onboarding-123');
-          mockUseCardSDK.mockReturnValue({
-            user: {
-              id: 'user-123',
-              verificationState: 'PENDING',
-              // firstName is undefined
-              // countryOfNationality is undefined
-            },
-            isLoading: false,
-            sdk: null,
-            setUser: jest.fn(),
-            logoutFromProvider: jest.fn(),
-            fetchUserData: jest.fn(),
-          });
-
-          const { queryByTestId } = renderWithNavigation(
-            <OnboardingNavigator />,
+          const stackNavigator = queryByTestId('stack-navigator');
+          expect(stackNavigator).not.toBeNull();
+          expect(stackNavigator?.props.initialRouteName).toBe(
+            Routes.CARD.ONBOARDING.VERIFY_IDENTITY,
           );
-
-          expect(queryByTestId('activity-indicator')).toBeNull();
         });
 
         it('returns VALIDATING_KYC route when firstName and countryOfNationality exist', () => {
@@ -350,7 +354,11 @@ describe('OnboardingNavigator', () => {
             <OnboardingNavigator />,
           );
 
-          expect(queryByTestId('activity-indicator')).toBeNull();
+          const stackNavigator = queryByTestId('stack-navigator');
+          expect(stackNavigator).not.toBeNull();
+          expect(stackNavigator?.props.initialRouteName).toBe(
+            Routes.CARD.ONBOARDING.VALIDATING_KYC,
+          );
         });
       });
 
@@ -375,53 +383,11 @@ describe('OnboardingNavigator', () => {
             <OnboardingNavigator />,
           );
 
-          expect(queryByTestId('activity-indicator')).toBeNull();
-        });
-
-        it('returns PERSONAL_DETAILS route when countryOfNationality is missing', () => {
-          mockUseSelector.mockReturnValue('onboarding-123');
-          mockUseCardSDK.mockReturnValue({
-            user: {
-              id: 'user-123',
-              verificationState: 'VERIFIED',
-              firstName: 'John',
-              // countryOfNationality is undefined
-            },
-            isLoading: false,
-            sdk: null,
-            setUser: jest.fn(),
-            logoutFromProvider: jest.fn(),
-            fetchUserData: jest.fn(),
-          });
-
-          const { queryByTestId } = renderWithNavigation(
-            <OnboardingNavigator />,
+          const stackNavigator = queryByTestId('stack-navigator');
+          expect(stackNavigator).not.toBeNull();
+          expect(stackNavigator?.props.initialRouteName).toBe(
+            Routes.CARD.ONBOARDING.PERSONAL_DETAILS,
           );
-
-          expect(queryByTestId('activity-indicator')).toBeNull();
-        });
-
-        it('returns PERSONAL_DETAILS route when both firstName and countryOfNationality are missing', () => {
-          mockUseSelector.mockReturnValue('onboarding-123');
-          mockUseCardSDK.mockReturnValue({
-            user: {
-              id: 'user-123',
-              verificationState: 'VERIFIED',
-              // firstName is undefined
-              // countryOfNationality is undefined
-            },
-            isLoading: false,
-            sdk: null,
-            setUser: jest.fn(),
-            logoutFromProvider: jest.fn(),
-            fetchUserData: jest.fn(),
-          });
-
-          const { queryByTestId } = renderWithNavigation(
-            <OnboardingNavigator />,
-          );
-
-          expect(queryByTestId('activity-indicator')).toBeNull();
         });
 
         it('returns PHYSICAL_ADDRESS route when firstName and countryOfNationality exist but addressLine1 is missing', () => {
@@ -445,36 +411,14 @@ describe('OnboardingNavigator', () => {
             <OnboardingNavigator />,
           );
 
-          expect(queryByTestId('activity-indicator')).toBeNull();
-        });
-
-        it('returns MAILING_ADDRESS route when user is from US and mailingAddressLine1 is missing', () => {
-          mockUseSelector.mockReturnValue('onboarding-123');
-          mockUseCardSDK.mockReturnValue({
-            user: {
-              id: 'user-123',
-              verificationState: 'VERIFIED',
-              firstName: 'John',
-              countryOfNationality: 'US',
-              countryOfResidence: 'us',
-              addressLine1: '123 Main St',
-              // mailingAddressLine1 is undefined
-            },
-            isLoading: false,
-            sdk: null,
-            setUser: jest.fn(),
-            logoutFromProvider: jest.fn(),
-            fetchUserData: jest.fn(),
-          });
-
-          const { queryByTestId } = renderWithNavigation(
-            <OnboardingNavigator />,
+          const stackNavigator = queryByTestId('stack-navigator');
+          expect(stackNavigator).not.toBeNull();
+          expect(stackNavigator?.props.initialRouteName).toBe(
+            Routes.CARD.ONBOARDING.PHYSICAL_ADDRESS,
           );
-
-          expect(queryByTestId('activity-indicator')).toBeNull();
         });
 
-        it('returns SIGN_UP route as fallback when user is from US and has all required data', () => {
+        it('returns COMPLETE route when user has all required data', () => {
           mockUseSelector.mockReturnValue('onboarding-123');
           mockUseCardSDK.mockReturnValue({
             user: {
@@ -482,9 +426,7 @@ describe('OnboardingNavigator', () => {
               verificationState: 'VERIFIED',
               firstName: 'John',
               countryOfNationality: 'US',
-              countryOfResidence: 'us',
               addressLine1: '123 Main St',
-              mailingAddressLine1: '456 Mail St',
             },
             isLoading: false,
             sdk: null,
@@ -497,32 +439,11 @@ describe('OnboardingNavigator', () => {
             <OnboardingNavigator />,
           );
 
-          expect(queryByTestId('activity-indicator')).toBeNull();
-        });
-
-        it('returns SIGN_UP route as fallback when non-US user has all required data', () => {
-          mockUseSelector.mockReturnValue('onboarding-123');
-          mockUseCardSDK.mockReturnValue({
-            user: {
-              id: 'user-123',
-              verificationState: 'VERIFIED',
-              firstName: 'John',
-              countryOfNationality: 'CA',
-              countryOfResidence: 'CA',
-              addressLine1: '123 Main St',
-            },
-            isLoading: false,
-            sdk: null,
-            setUser: jest.fn(),
-            logoutFromProvider: jest.fn(),
-            fetchUserData: jest.fn(),
-          });
-
-          const { queryByTestId } = renderWithNavigation(
-            <OnboardingNavigator />,
+          const stackNavigator = queryByTestId('stack-navigator');
+          expect(stackNavigator).not.toBeNull();
+          expect(stackNavigator?.props.initialRouteName).toBe(
+            Routes.CARD.ONBOARDING.COMPLETE,
           );
-
-          expect(queryByTestId('activity-indicator')).toBeNull();
         });
       });
 
@@ -546,7 +467,11 @@ describe('OnboardingNavigator', () => {
             <OnboardingNavigator />,
           );
 
-          expect(queryByTestId('activity-indicator')).toBeNull();
+          const stackNavigator = queryByTestId('stack-navigator');
+          expect(stackNavigator).not.toBeNull();
+          expect(stackNavigator?.props.initialRouteName).toBe(
+            Routes.CARD.ONBOARDING.SIGN_UP,
+          );
         });
 
         it('returns SET_PHONE_NUMBER route when email exists but phoneNumber is missing', () => {
@@ -569,7 +494,11 @@ describe('OnboardingNavigator', () => {
             <OnboardingNavigator />,
           );
 
-          expect(queryByTestId('activity-indicator')).toBeNull();
+          const stackNavigator = queryByTestId('stack-navigator');
+          expect(stackNavigator).not.toBeNull();
+          expect(stackNavigator?.props.initialRouteName).toBe(
+            Routes.CARD.ONBOARDING.SET_PHONE_NUMBER,
+          );
         });
 
         it('returns VERIFY_IDENTITY route when email and phoneNumber exist', () => {
@@ -592,67 +521,141 @@ describe('OnboardingNavigator', () => {
             <OnboardingNavigator />,
           );
 
-          expect(queryByTestId('activity-indicator')).toBeNull();
+          const stackNavigator = queryByTestId('stack-navigator');
+          expect(stackNavigator).not.toBeNull();
+          expect(stackNavigator?.props.initialRouteName).toBe(
+            Routes.CARD.ONBOARDING.VERIFY_IDENTITY,
+          );
         });
       });
+    });
+  });
 
-      describe('when no onboardingId', () => {
-        it('returns SIGN_UP route even when user exists', () => {
-          mockUseSelector.mockReturnValue(null);
-          mockUseCardSDK.mockReturnValue({
-            user: {
-              id: 'user-123',
-              verificationState: 'UNVERIFIED',
-              email: 'test@example.com',
-              phoneNumber: '+1234567890',
-            },
-            isLoading: false,
-            sdk: null,
-            setUser: jest.fn(),
-            logoutFromProvider: jest.fn(),
-            fetchUserData: jest.fn(),
-          });
+  describe('cardUserPhase routing', () => {
+    it('routes to SIGN_UP when cardUserPhase is ACCOUNT', () => {
+      mockUseParams.mockReturnValue({ cardUserPhase: 'ACCOUNT' });
+      mockUseSelector.mockReturnValue('onboarding-123');
+      mockUseCardSDK.mockReturnValue({
+        user: { id: 'user-123', contactVerificationId: 'contact-123' },
+        isLoading: false,
+        sdk: null,
+        setUser: jest.fn(),
+        logoutFromProvider: jest.fn(),
+        fetchUserData: jest.fn(),
+      });
 
-          const { queryByTestId } = renderWithNavigation(
-            <OnboardingNavigator />,
-          );
+      const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
 
-          expect(queryByTestId('activity-indicator')).toBeNull();
-        });
+      const stackNavigator = queryByTestId('stack-navigator');
+      expect(stackNavigator).not.toBeNull();
+      expect(stackNavigator?.props.initialRouteName).toBe(
+        Routes.CARD.ONBOARDING.SIGN_UP,
+      );
+    });
+
+    it('routes to SIGN_UP when cardUserPhase is NOT ACCOUNT but contactVerificationId is missing', () => {
+      mockUseParams.mockReturnValue({ cardUserPhase: 'PHONE_NUMBER' });
+      mockUseSelector.mockReturnValue('onboarding-123');
+      mockUseCardSDK.mockReturnValue({
+        user: { id: 'user-123' }, // Missing contactVerificationId
+        isLoading: false,
+        sdk: null,
+        setUser: jest.fn(),
+        logoutFromProvider: jest.fn(),
+        fetchUserData: jest.fn(),
       });
+
+      const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
+
+      const stackNavigator = queryByTestId('stack-navigator');
+      expect(stackNavigator).not.toBeNull();
+      expect(stackNavigator?.props.initialRouteName).toBe(
+        Routes.CARD.ONBOARDING.SIGN_UP,
+      );
     });
-  });
 
-  describe('Stack Navigator Configuration', () => {
-    beforeEach(() => {
+    it('routes to SET_PHONE_NUMBER when cardUserPhase is PHONE_NUMBER and contactVerificationId exists', () => {
+      mockUseParams.mockReturnValue({ cardUserPhase: 'PHONE_NUMBER' });
       mockUseSelector.mockReturnValue('onboarding-123');
       mockUseCardSDK.mockReturnValue({
-        user: {
-          id: 'user-123',
-          verificationState: 'UNVERIFIED',
-        },
+        user: { id: 'user-123', contactVerificationId: 'contact-123' },
         isLoading: false,
         sdk: null,
         setUser: jest.fn(),
         logoutFromProvider: jest.fn(),
         fetchUserData: jest.fn(),
       });
+
+      const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
+
+      const stackNavigator = queryByTestId('stack-navigator');
+      expect(stackNavigator).not.toBeNull();
+      expect(stackNavigator?.props.initialRouteName).toBe(
+        Routes.CARD.ONBOARDING.SET_PHONE_NUMBER,
+      );
     });
 
-    it('renders Stack Navigator with all required screens', () => {
+    it('routes to PERSONAL_DETAILS when cardUserPhase is PERSONAL_INFORMATION', () => {
+      mockUseParams.mockReturnValue({ cardUserPhase: 'PERSONAL_INFORMATION' });
+      mockUseSelector.mockReturnValue('onboarding-123');
+      mockUseCardSDK.mockReturnValue({
+        user: { id: 'user-123', contactVerificationId: 'contact-123' },
+        isLoading: false,
+        sdk: null,
+        setUser: jest.fn(),
+        logoutFromProvider: jest.fn(),
+        fetchUserData: jest.fn(),
+      });
+
       const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
 
-      expect(queryByTestId('activity-indicator')).toBeNull();
+      const stackNavigator = queryByTestId('stack-navigator');
+      expect(stackNavigator).not.toBeNull();
+      expect(stackNavigator?.props.initialRouteName).toBe(
+        Routes.CARD.ONBOARDING.PERSONAL_DETAILS,
+      );
     });
 
-    it('configures all onboarding screens', () => {
+    it('routes to PHYSICAL_ADDRESS when cardUserPhase is PHYSICAL_ADDRESS', () => {
+      mockUseParams.mockReturnValue({ cardUserPhase: 'PHYSICAL_ADDRESS' });
+      mockUseSelector.mockReturnValue('onboarding-123');
+      mockUseCardSDK.mockReturnValue({
+        user: { id: 'user-123', contactVerificationId: 'contact-123' },
+        isLoading: false,
+        sdk: null,
+        setUser: jest.fn(),
+        logoutFromProvider: jest.fn(),
+        fetchUserData: jest.fn(),
+      });
+
       const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
 
-      // Verify the navigator is rendered (not loading)
-      expect(queryByTestId('activity-indicator')).toBeNull();
+      const stackNavigator = queryByTestId('stack-navigator');
+      expect(stackNavigator).not.toBeNull();
+      expect(stackNavigator?.props.initialRouteName).toBe(
+        Routes.CARD.ONBOARDING.PHYSICAL_ADDRESS,
+      );
+    });
+
+    it('routes to MAILING_ADDRESS when cardUserPhase is MAILING_ADDRESS', () => {
+      mockUseParams.mockReturnValue({ cardUserPhase: 'MAILING_ADDRESS' });
+      mockUseSelector.mockReturnValue('onboarding-123');
+      mockUseCardSDK.mockReturnValue({
+        user: { id: 'user-123', contactVerificationId: 'contact-123' },
+        isLoading: false,
+        sdk: null,
+        setUser: jest.fn(),
+        logoutFromProvider: jest.fn(),
+        fetchUserData: jest.fn(),
+      });
+
+      const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
 
-      // Note: Individual screen testing would require more complex navigation testing
-      // which is typically done at integration level rather than unit level
+      const stackNavigator = queryByTestId('stack-navigator');
+      expect(stackNavigator).not.toBeNull();
+      expect(stackNavigator?.props.initialRouteName).toBe(
+        Routes.CARD.ONBOARDING.MAILING_ADDRESS,
+      );
     });
   });
 
@@ -666,19 +669,6 @@ describe('OnboardingNavigator', () => {
           goBack: jest.fn(),
         };
 
-        mockUseSelector.mockReturnValue('onboarding-123');
-        mockUseCardSDK.mockReturnValue({
-          user: {
-            id: 'user-123',
-            verificationState: 'UNVERIFIED',
-          },
-          isLoading: false,
-          sdk: null,
-          setUser: jest.fn(),
-          logoutFromProvider: jest.fn(),
-          fetchUserData: jest.fn(),
-        });
-
         jest.spyOn(Alert, 'alert');
       });
 
@@ -687,27 +677,14 @@ describe('OnboardingNavigator', () => {
       });
 
       it('renders close button in header right', () => {
-        const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
-
-        expect(queryByTestId('close-button')).toBeDefined();
-      });
-
-      it('renders card title in header', () => {
-        const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
-
-        expect(queryByTestId('card-view-title')).toBeDefined();
-      });
-
-      it('renders empty view in header left', () => {
         const options = KYCModalNavigationOptions({
           navigation: mockNavigation as NavigationProp<ParamListBase>,
         });
-        const HeaderLeft = options.headerLeft as () => React.ReactElement;
-        const headerLeftElement = HeaderLeft();
-        const { UNSAFE_root } = render(headerLeftElement);
+        const HeaderRight = options.headerRight as () => React.ReactElement;
+        const headerRightElement = HeaderRight();
+        const { getByTestId } = render(headerRightElement);
 
-        expect(UNSAFE_root).toBeDefined();
-        expect(typeof UNSAFE_root.type).toBe('function');
+        expect(getByTestId('close-button')).toBeTruthy();
       });
 
       it('displays alert when close button is pressed', () => {
@@ -719,43 +696,16 @@ describe('OnboardingNavigator', () => {
         const { getByTestId } = render(headerRightElement);
 
         const closeButton = getByTestId('close-button');
-        closeButton.props.onPress();
+        fireEvent.press(closeButton);
 
         expect(Alert.alert).toHaveBeenCalledWith(
           'mocked_card.card_onboarding.kyc_webview.close_confirmation_title',
           'mocked_card.card_onboarding.kyc_webview.close_confirmation_message',
-          expect.arrayContaining([
-            expect.objectContaining({
-              text: 'mocked_card.card_onboarding.kyc_webview.cancel_button',
-              style: 'cancel',
-            }),
-            expect.objectContaining({
-              text: 'mocked_card.card_onboarding.kyc_webview.close_button',
-              style: 'destructive',
-            }),
-          ]),
+          expect.any(Array),
         );
       });
 
-      it('does not navigate when cancel button is pressed in alert', () => {
-        const options = KYCModalNavigationOptions({
-          navigation: mockNavigation as NavigationProp<ParamListBase>,
-        });
-        const HeaderRight = options.headerRight as () => React.ReactElement;
-        const headerRightElement = HeaderRight();
-        const { getByTestId } = render(headerRightElement);
-
-        const closeButton = getByTestId('close-button');
-        closeButton.props.onPress();
-
-        const alertCall = (Alert.alert as jest.Mock).mock.calls[0];
-        const cancelButton = alertCall[2][0];
-
-        expect(cancelButton.onPress).toBeUndefined();
-        expect(mockNavigation.navigate).not.toHaveBeenCalled();
-      });
-
-      it('navigates to VALIDATING_KYC when close button is pressed in alert', () => {
+      it('navigates to PERSONAL_DETAILS when close is confirmed in alert', () => {
         const options = KYCModalNavigationOptions({
           navigation: mockNavigation as NavigationProp<ParamListBase>,
         });
@@ -764,121 +714,74 @@ describe('OnboardingNavigator', () => {
         const { getByTestId } = render(headerRightElement);
 
         const closeButton = getByTestId('close-button');
-        closeButton.props.onPress();
+        fireEvent.press(closeButton);
 
         const alertCall = (Alert.alert as jest.Mock).mock.calls[0];
         const destructiveButton = alertCall[2][1];
 
         destructiveButton.onPress();
 
-        expect(mockNavigation.navigate).toHaveBeenCalledWith('VALIDATING_KYC');
+        expect(mockNavigation.navigate).toHaveBeenCalledWith(
+          'PERSONAL_DETAILS',
+        );
       });
+    });
 
-      it('renders header title with correct variant and test ID', () => {
-        const options = KYCModalNavigationOptions({
-          navigation: mockNavigation as NavigationProp<ParamListBase>,
-        });
-        const HeaderTitle = options.headerTitle as () => React.ReactElement;
-        const headerTitleElement = HeaderTitle();
-        const { getByTestId } = render(headerTitleElement);
-
-        const title = getByTestId('card-view-title');
+    describe('PersonalDetailsNavigationOptions', () => {
+      let mockNavigation: Partial<NavigationProp<ParamListBase>>;
 
-        expect(title).toBeDefined();
-        expect(title.props.children).toBe('mocked_card.card');
+      beforeEach(() => {
+        mockNavigation = {
+          navigate: jest.fn(),
+          goBack: jest.fn(),
+        };
       });
 
-      it('renders close button with correct size and icon', () => {
-        const options = KYCModalNavigationOptions({
+      it('renders back button in header left', () => {
+        const options = PersonalDetailsNavigationOptions({
           navigation: mockNavigation as NavigationProp<ParamListBase>,
         });
-        const HeaderRight = options.headerRight as () => React.ReactElement;
-        const headerRightElement = HeaderRight();
-        const { getByTestId } = render(headerRightElement);
-
-        const closeButton = getByTestId('close-button');
-
-        expect(closeButton.props.size).toBe('Lg');
-        expect(closeButton.props.iconName).toBe('Close');
-      });
-    });
-
-    describe('ValidatingKYCNavigationOptions', () => {
-      beforeEach(() => {
-        mockUseSelector.mockReturnValue('onboarding-123');
-        mockUseCardSDK.mockReturnValue({
-          user: {
-            id: 'user-123',
-            verificationState: 'UNVERIFIED',
-          },
-          isLoading: false,
-          sdk: null,
-          setUser: jest.fn(),
-          logoutFromProvider: jest.fn(),
-          fetchUserData: jest.fn(),
-        });
-      });
+        const HeaderLeft = options.headerLeft as () => React.ReactElement;
+        const headerLeftElement = HeaderLeft();
+        const { getByTestId } = render(headerLeftElement);
 
-      it('renders navigation with proper configuration', () => {
-        const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
-        expect(queryByTestId('back-button')).toBeDefined();
-        expect(queryByTestId('activity-indicator')).toBeNull();
+        expect(getByTestId('back-button')).toBeTruthy();
       });
-    });
-  });
 
-  describe('Hook Integration', () => {
-    describe('useSelector integration', () => {
-      it('calls useSelector to get onboardingId', () => {
-        mockUseSelector.mockReturnValue('onboarding-123');
-        mockUseCardSDK.mockReturnValue({
-          user: null,
-          isLoading: false,
-          sdk: null,
-          setUser: jest.fn(),
-          logoutFromProvider: jest.fn(),
-          fetchUserData: jest.fn(),
+      it('navigates to VERIFY_IDENTITY when back button is pressed', () => {
+        const options = PersonalDetailsNavigationOptions({
+          navigation: mockNavigation as NavigationProp<ParamListBase>,
         });
+        const HeaderLeft = options.headerLeft as () => React.ReactElement;
+        const headerLeftElement = HeaderLeft();
+        const { getByTestId } = render(headerLeftElement);
 
-        renderWithNavigation(<OnboardingNavigator />);
+        const backButton = getByTestId('back-button');
+        fireEvent.press(backButton);
 
-        expect(mockUseSelector).toHaveBeenCalled();
+        expect(mockNavigation.navigate).toHaveBeenCalledWith(
+          Routes.CARD.ONBOARDING.VERIFY_IDENTITY,
+        );
       });
-    });
 
-    describe('useCardSDK integration', () => {
-      it('calls useCardSDK to get user and loading state', () => {
-        mockUseSelector.mockReturnValue('onboarding-123');
-        mockUseCardSDK.mockReturnValue({
-          user: null,
-          isLoading: false,
-          sdk: null,
-          setUser: jest.fn(),
-          logoutFromProvider: jest.fn(),
-          fetchUserData: jest.fn(),
+      it('renders empty header title', () => {
+        const options = PersonalDetailsNavigationOptions({
+          navigation: mockNavigation as NavigationProp<ParamListBase>,
         });
+        const HeaderTitle = options.headerTitle as () => React.ReactElement;
+        const headerTitleElement = HeaderTitle();
 
-        renderWithNavigation(<OnboardingNavigator />);
-
-        expect(mockUseCardSDK).toHaveBeenCalled();
+        expect(headerTitleElement).toBeTruthy();
       });
-    });
 
-    describe('useParams integration', () => {
-      it('calls useParams to get route parameters', () => {
-        mockUseSelector.mockReturnValue('onboarding-123');
-        mockUseCardSDK.mockReturnValue({
-          user: null,
-          isLoading: false,
-          sdk: null,
-          setUser: jest.fn(),
-          logoutFromProvider: jest.fn(),
-          fetchUserData: jest.fn(),
+      it('renders empty header right', () => {
+        const options = PersonalDetailsNavigationOptions({
+          navigation: mockNavigation as NavigationProp<ParamListBase>,
         });
+        const HeaderRight = options.headerRight as () => React.ReactElement;
+        const headerRightElement = HeaderRight();
 
-        renderWithNavigation(<OnboardingNavigator />);
-
-        expect(mockUseParams).toHaveBeenCalled();
+        expect(headerRightElement).toBeTruthy();
       });
     });
   });
@@ -900,174 +803,5 @@ describe('OnboardingNavigator', () => {
 
       expect(mockFetchUserData).toHaveBeenCalledTimes(1);
     });
-
-    it('does not call fetchUserData when user already exists', () => {
-      const mockFetchUserData = jest.fn();
-      mockUseSelector.mockReturnValue('onboarding-123');
-      mockUseCardSDK.mockReturnValue({
-        user: { id: 'user-123', verificationState: 'VERIFIED' },
-        isLoading: false,
-        sdk: {} as CardSDK,
-        setUser: jest.fn(),
-        logoutFromProvider: jest.fn(),
-        fetchUserData: mockFetchUserData,
-      });
-
-      renderWithNavigation(<OnboardingNavigator />);
-
-      expect(mockFetchUserData).not.toHaveBeenCalled();
-    });
-
-    it('does not call fetchUserData when onboardingId is null', () => {
-      const mockFetchUserData = jest.fn();
-      mockUseSelector.mockReturnValue(null);
-      mockUseCardSDK.mockReturnValue({
-        user: null,
-        isLoading: false,
-        sdk: {} as CardSDK,
-        setUser: jest.fn(),
-        logoutFromProvider: jest.fn(),
-        fetchUserData: mockFetchUserData,
-      });
-
-      renderWithNavigation(<OnboardingNavigator />);
-
-      expect(mockFetchUserData).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('cardUserPhase routing', () => {
-    it('routes to SIGN_UP when cardUserPhase is ACCOUNT', () => {
-      mockUseParams.mockReturnValue({ cardUserPhase: 'ACCOUNT' });
-      mockUseSelector.mockReturnValue('onboarding-123');
-      mockUseCardSDK.mockReturnValue({
-        user: { id: 'user-123', contactVerificationId: 'contact-123' },
-        isLoading: false,
-        sdk: null,
-        setUser: jest.fn(),
-        logoutFromProvider: jest.fn(),
-        fetchUserData: jest.fn(),
-      });
-
-      const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
-
-      expect(queryByTestId('activity-indicator')).toBeNull();
-    });
-
-    it('routes to SET_PHONE_NUMBER when cardUserPhase is PHONE_NUMBER', () => {
-      mockUseParams.mockReturnValue({ cardUserPhase: 'PHONE_NUMBER' });
-      mockUseSelector.mockReturnValue('onboarding-123');
-      mockUseCardSDK.mockReturnValue({
-        user: { id: 'user-123' },
-        isLoading: false,
-        sdk: null,
-        setUser: jest.fn(),
-        logoutFromProvider: jest.fn(),
-        fetchUserData: jest.fn(),
-      });
-
-      const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
-
-      expect(queryByTestId('activity-indicator')).toBeNull();
-    });
-
-    it('routes to PERSONAL_DETAILS when cardUserPhase is PERSONAL_INFORMATION', () => {
-      mockUseParams.mockReturnValue({ cardUserPhase: 'PERSONAL_INFORMATION' });
-      mockUseSelector.mockReturnValue('onboarding-123');
-      mockUseCardSDK.mockReturnValue({
-        user: { id: 'user-123' },
-        isLoading: false,
-        sdk: null,
-        setUser: jest.fn(),
-        logoutFromProvider: jest.fn(),
-        fetchUserData: jest.fn(),
-      });
-
-      const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
-
-      expect(queryByTestId('activity-indicator')).toBeNull();
-    });
-
-    it('routes to PHYSICAL_ADDRESS when cardUserPhase is PHYSICAL_ADDRESS', () => {
-      mockUseParams.mockReturnValue({ cardUserPhase: 'PHYSICAL_ADDRESS' });
-      mockUseSelector.mockReturnValue('onboarding-123');
-      mockUseCardSDK.mockReturnValue({
-        user: { id: 'user-123' },
-        isLoading: false,
-        sdk: null,
-        setUser: jest.fn(),
-        logoutFromProvider: jest.fn(),
-        fetchUserData: jest.fn(),
-      });
-
-      const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
-
-      expect(queryByTestId('activity-indicator')).toBeNull();
-    });
-
-    it('routes to MAILING_ADDRESS when cardUserPhase is MAILING_ADDRESS', () => {
-      mockUseParams.mockReturnValue({ cardUserPhase: 'MAILING_ADDRESS' });
-      mockUseSelector.mockReturnValue('onboarding-123');
-      mockUseCardSDK.mockReturnValue({
-        user: { id: 'user-123' },
-        isLoading: false,
-        sdk: null,
-        setUser: jest.fn(),
-        logoutFromProvider: jest.fn(),
-        fetchUserData: jest.fn(),
-      });
-
-      const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
-
-      expect(queryByTestId('activity-indicator')).toBeNull();
-    });
-
-    it('routes to SIGN_UP when cardUserPhase is ACCOUNT and contactVerificationId is missing', () => {
-      mockUseParams.mockReturnValue({ cardUserPhase: 'ACCOUNT' });
-      mockUseSelector.mockReturnValue('onboarding-123');
-      mockUseCardSDK.mockReturnValue({
-        user: { id: 'user-123' },
-        isLoading: false,
-        sdk: null,
-        setUser: jest.fn(),
-        logoutFromProvider: jest.fn(),
-        fetchUserData: jest.fn(),
-      });
-
-      const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
-
-      expect(queryByTestId('activity-indicator')).toBeNull();
-    });
-
-    it('prioritizes cardUserPhase over user verification state', () => {
-      mockUseParams.mockReturnValue({ cardUserPhase: 'PHONE_NUMBER' });
-      mockUseSelector.mockReturnValue('onboarding-123');
-      mockUseCardSDK.mockReturnValue({
-        user: {
-          id: 'user-123',
-          verificationState: 'VERIFIED',
-          firstName: 'John',
-          countryOfNationality: 'US',
-          addressLine1: '123 Main St',
-        },
-        isLoading: false,
-        sdk: null,
-        setUser: jest.fn(),
-        logoutFromProvider: jest.fn(),
-        fetchUserData: jest.fn(),
-      });
-
-      const { queryByTestId } = renderWithNavigation(<OnboardingNavigator />);
-
-      expect(queryByTestId('activity-indicator')).toBeNull();
-    });
-  });
-
-  describe('Internationalization', () => {
-    it('has strings function properly mocked', () => {
-      // Verify that strings function is mocked and returns expected format
-      expect(strings).toBeDefined();
-      expect(strings('card.card')).toBe('mocked_card.card');
-    });
   });
 });
diff --git a/app/components/UI/Card/routes/OnboardingNavigator.tsx b/app/components/UI/Card/routes/OnboardingNavigator.tsx
index f82e3100ad2..bf5db35b823 100644
--- a/app/components/UI/Card/routes/OnboardingNavigator.tsx
+++ b/app/components/UI/Card/routes/OnboardingNavigator.tsx
@@ -14,7 +14,7 @@ import KYCFailed from '../components/Onboarding/KYCFailed';
 import PersonalDetails from '../components/Onboarding/PersonalDetails';
 import PhysicalAddress from '../components/Onboarding/PhysicalAddress';
 import MailingAddress from '../components/Onboarding/MailingAddress';
-import { cardAuthenticationNavigationOptions, headerStyle } from '.';
+import { cardDefaultNavigationOptions, headerStyle } from '.';
 import { selectOnboardingId } from '../../../../core/redux/slices/card';
 import { useSelector } from 'react-redux';
 import { useCardSDK } from '../sdk';
@@ -32,6 +32,7 @@ import { View, ActivityIndicator, Alert } from 'react-native';
 import { Box } from '@metamask/design-system-react-native';
 import { useParams } from '../../../../util/navigation/navUtils';
 import { CardUserPhase } from '../types';
+import Complete from '../components/Onboarding/Complete';
 
 const Stack = createStackNavigator();
 
@@ -52,7 +53,7 @@ export const KYCModalNavigationOptions = ({
         {
           text: strings('card.card_onboarding.kyc_webview.close_button'),
           onPress: () =>
-            navigation.navigate(Routes.CARD.ONBOARDING.VALIDATING_KYC),
+            navigation.navigate(Routes.CARD.ONBOARDING.PERSONAL_DETAILS),
           style: 'destructive',
         },
       ],
@@ -82,7 +83,7 @@ export const KYCModalNavigationOptions = ({
   };
 };
 
-const ValidatingKYCNavigationOptions = ({
+export const PersonalDetailsNavigationOptions = ({
   navigation,
 }: {
   navigation: NavigationProp<ParamListBase>;
@@ -98,15 +99,7 @@ const ValidatingKYCNavigationOptions = ({
       }
     />
   ),
-  headerTitle: () => (
-    <Text
-      variant={TextVariant.HeadingSM}
-      style={headerStyle.title}
-      testID={'card-view-title'}
-    >
-      {strings('card.card')}
-    </Text>
-  ),
+  headerTitle: () => <View />,
   headerRight: () => <View />,
 });
 
@@ -177,12 +170,8 @@ const OnboardingNavigator: React.FC = () => {
           return Routes.CARD.ONBOARDING.PERSONAL_DETAILS;
         } else if (!user?.addressLine1) {
           return Routes.CARD.ONBOARDING.PHYSICAL_ADDRESS;
-        } else if (
-          user?.countryOfResidence?.toLowerCase() === 'us' &&
-          !user?.mailingAddressLine1
-        ) {
-          return Routes.CARD.ONBOARDING.MAILING_ADDRESS;
         }
+        return Routes.CARD.ONBOARDING.COMPLETE;
       }
     }
 
@@ -203,52 +192,57 @@ const OnboardingNavigator: React.FC = () => {
       <Stack.Screen
         name={Routes.CARD.ONBOARDING.SIGN_UP}
         component={SignUp}
-        options={cardAuthenticationNavigationOptions}
+        options={cardDefaultNavigationOptions}
       />
       <Stack.Screen
         name={Routes.CARD.ONBOARDING.CONFIRM_EMAIL}
         component={ConfirmEmail}
-        options={cardAuthenticationNavigationOptions}
+        options={cardDefaultNavigationOptions}
       />
       <Stack.Screen
         name={Routes.CARD.ONBOARDING.SET_PHONE_NUMBER}
         component={SetPhoneNumber}
-        options={cardAuthenticationNavigationOptions}
+        options={cardDefaultNavigationOptions}
       />
       <Stack.Screen
         name={Routes.CARD.ONBOARDING.CONFIRM_PHONE_NUMBER}
         component={ConfirmPhoneNumber}
-        options={cardAuthenticationNavigationOptions}
+        options={cardDefaultNavigationOptions}
       />
       <Stack.Screen
         name={Routes.CARD.ONBOARDING.VERIFY_IDENTITY}
         component={VerifyIdentity}
-        options={cardAuthenticationNavigationOptions}
+        options={cardDefaultNavigationOptions}
       />
       <Stack.Screen
         name={Routes.CARD.ONBOARDING.VALIDATING_KYC}
         component={ValidatingKYC}
-        options={ValidatingKYCNavigationOptions}
+        options={cardDefaultNavigationOptions}
+      />
+      <Stack.Screen
+        name={Routes.CARD.ONBOARDING.COMPLETE}
+        component={Complete}
+        options={cardDefaultNavigationOptions}
       />
       <Stack.Screen
         name={Routes.CARD.ONBOARDING.KYC_FAILED}
         component={KYCFailed}
-        options={cardAuthenticationNavigationOptions}
+        options={cardDefaultNavigationOptions}
       />
       <Stack.Screen
         name={Routes.CARD.ONBOARDING.PERSONAL_DETAILS}
         component={PersonalDetails}
-        options={cardAuthenticationNavigationOptions}
+        options={PersonalDetailsNavigationOptions}
       />
       <Stack.Screen
         name={Routes.CARD.ONBOARDING.PHYSICAL_ADDRESS}
         component={PhysicalAddress}
-        options={cardAuthenticationNavigationOptions}
+        options={cardDefaultNavigationOptions}
       />
       <Stack.Screen
         name={Routes.CARD.ONBOARDING.MAILING_ADDRESS}
         component={MailingAddress}
-        options={cardAuthenticationNavigationOptions}
+        options={cardDefaultNavigationOptions}
       />
       <Stack.Screen
         name={Routes.CARD.ONBOARDING.WEBVIEW}
diff --git a/app/components/UI/Card/routes/index.tsx b/app/components/UI/Card/routes/index.tsx
index e03e77cc43a..0f90dca9ba7 100644
--- a/app/components/UI/Card/routes/index.tsx
+++ b/app/components/UI/Card/routes/index.tsx
@@ -44,35 +44,11 @@ export const headerStyle = StyleSheet.create({
   title: { alignSelf: 'center' },
 });
 
+// Default navigation has only back button on the left
 export const cardDefaultNavigationOptions = ({
   navigation,
 }: {
   navigation: NavigationProp<ParamListBase>;
-}): StackNavigationOptions => ({
-  headerLeft: () => <View />,
-  headerTitle: () => (
-    <Text
-      variant={TextVariant.HeadingSM}
-      style={headerStyle.title}
-      testID={'card-view-title'}
-    >
-      {strings('card.card')}
-    </Text>
-  ),
-  headerRight: () => (
-    <ButtonIcon
-      style={headerStyle.icon}
-      size={ButtonIconSizes.Lg}
-      iconName={IconName.Close}
-      onPress={() => navigation.goBack()}
-    />
-  ),
-});
-
-export const cardAuthenticationNavigationOptions = ({
-  navigation,
-}: {
-  navigation: NavigationProp<ParamListBase>;
 }): StackNavigationOptions => ({
   headerLeft: () => (
     <ButtonIcon
@@ -82,15 +58,7 @@ export const cardAuthenticationNavigationOptions = ({
       onPress={() => navigation.goBack()}
     />
   ),
-  headerTitle: () => (
-    <Text
-      variant={TextVariant.HeadingSM}
-      style={headerStyle.title}
-      testID={'card-view-title'}
-    >
-      {strings('card.card')}
-    </Text>
-  ),
+  headerTitle: () => <View />,
   headerRight: () => <View />,
 });
 
@@ -149,12 +117,12 @@ const MainRoutes = () => {
       <Stack.Screen
         name={Routes.CARD.WELCOME}
         component={CardWelcome}
-        options={cardDefaultNavigationOptions}
+        options={{ headerShown: false }}
       />
       <Stack.Screen
         name={Routes.CARD.AUTHENTICATION}
         component={CardAuthentication}
-        options={cardAuthenticationNavigationOptions}
+        options={cardDefaultNavigationOptions}
       />
       <Stack.Screen
         name={Routes.CARD.SPENDING_LIMIT}
@@ -169,7 +137,7 @@ const MainRoutes = () => {
       <Stack.Screen
         name={Routes.CARD.VERIFYING_REGISTRATION}
         component={VerifyingRegistration}
-        options={cardAuthenticationNavigationOptions}
+        options={cardDefaultNavigationOptions}
       />
     </Stack.Navigator>
   );
diff --git a/app/components/UI/Card/util/countryCodeToFlag.test.ts b/app/components/UI/Card/util/countryCodeToFlag.test.ts
new file mode 100644
index 00000000000..2b40bd3064d
--- /dev/null
+++ b/app/components/UI/Card/util/countryCodeToFlag.test.ts
@@ -0,0 +1,169 @@
+import { countryCodeToFlag } from './countryCodeToFlag';
+
+describe('countryCodeToFlag', () => {
+  describe('valid country codes', () => {
+    it('returns US flag emoji for US country code', () => {
+      const isoCode = 'US';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🇺🇸');
+    });
+
+    it('returns GB flag emoji for GB country code', () => {
+      const isoCode = 'GB';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🇬🇧');
+    });
+
+    it('returns DE flag emoji for DE country code', () => {
+      const isoCode = 'DE';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🇩🇪');
+    });
+
+    it('returns JP flag emoji for JP country code', () => {
+      const isoCode = 'JP';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🇯🇵');
+    });
+
+    it('returns FR flag emoji for FR country code', () => {
+      const isoCode = 'FR';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🇫🇷');
+    });
+
+    it('returns CA flag emoji for CA country code', () => {
+      const isoCode = 'CA';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🇨🇦');
+    });
+
+    it('returns BR flag emoji for BR country code', () => {
+      const isoCode = 'BR';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🇧🇷');
+    });
+
+    it('returns AU flag emoji for AU country code', () => {
+      const isoCode = 'AU';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🇦🇺');
+    });
+  });
+
+  describe('lowercase country codes', () => {
+    it('returns US flag emoji for lowercase us country code', () => {
+      const isoCode = 'us';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🇺🇸');
+    });
+
+    it('returns GB flag emoji for lowercase gb country code', () => {
+      const isoCode = 'gb';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🇬🇧');
+    });
+
+    it('returns DE flag emoji for mixed case De country code', () => {
+      const isoCode = 'De';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🇩🇪');
+    });
+  });
+
+  describe('edge cases', () => {
+    it('returns globe emoji for null country code', () => {
+      const isoCode = null;
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🌍');
+    });
+
+    it('returns globe emoji for undefined country code', () => {
+      const isoCode = undefined;
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🌍');
+    });
+
+    it('returns globe emoji for empty string country code', () => {
+      const isoCode = '';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🌍');
+    });
+
+    it('returns globe emoji for single character country code', () => {
+      const isoCode = 'U';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🌍');
+    });
+
+    it('returns globe emoji for three character country code', () => {
+      const isoCode = 'USA';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🌍');
+    });
+
+    it('returns globe emoji for numeric country code', () => {
+      const isoCode = '12';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🌍');
+    });
+
+    it('returns globe emoji for special characters country code', () => {
+      const isoCode = '@#';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🌍');
+    });
+
+    it('returns globe emoji for country code with space', () => {
+      const isoCode = 'U ';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🌍');
+    });
+
+    it('returns globe emoji for alphanumeric country code', () => {
+      const isoCode = 'U1';
+
+      const result = countryCodeToFlag(isoCode);
+
+      expect(result).toBe('🌍');
+    });
+  });
+});
diff --git a/app/components/UI/Card/util/countryCodeToFlag.ts b/app/components/UI/Card/util/countryCodeToFlag.ts
new file mode 100644
index 00000000000..9f81daba856
--- /dev/null
+++ b/app/components/UI/Card/util/countryCodeToFlag.ts
@@ -0,0 +1,34 @@
+/**
+ * Converts an ISO 3166-1 alpha-2 country code to a flag emoji.
+ *
+ * This works by converting each letter to its corresponding
+ * Unicode Regional Indicator Symbol (A→🇦, B→🇧, etc.).
+ * The pair of symbols is then rendered as a flag emoji by the OS.
+ *
+ * @param isoCode - ISO 3166-1 alpha-2 country code (e.g., 'US', 'GB')
+ * @returns Flag emoji (e.g., '🇺🇸', '🇬🇧') or '🌍' as fallback
+ */
+export const countryCodeToFlag = (
+  isoCode: string | null | undefined,
+): string => {
+  if (!isoCode || isoCode.length !== 2) {
+    return '🌍';
+  }
+
+  const upperCode = isoCode.toUpperCase();
+
+  // Validate that the code contains only A-Z characters
+  if (!/^[A-Z]{2}$/.test(upperCode)) {
+    return '🌍';
+  }
+
+  // Regional Indicator Symbol Letter A starts at Unicode code point 127462
+  // 'A'.charCodeAt(0) is 65, so 127462 - 65 = 127397 is the offset
+  const REGIONAL_INDICATOR_OFFSET = 127397;
+
+  const codePoints = upperCode
+    .split('')
+    .map((char) => REGIONAL_INDICATOR_OFFSET + char.charCodeAt(0));
+
+  return String.fromCodePoint(...codePoints);
+};
diff --git a/app/images/mm-card-KYC-pending.png b/app/images/mm-card-KYC-pending.png
new file mode 100644
index 00000000000..f1ab6f58d85
Binary files /dev/null and b/app/images/mm-card-KYC-pending.png differ
diff --git a/app/images/mm-card-onboarding-failed.png b/app/images/mm-card-onboarding-failed.png
new file mode 100644
index 00000000000..cfe9d3e491e
Binary files /dev/null and b/app/images/mm-card-onboarding-failed.png differ
diff --git a/app/images/mm-card-onboarding-success.png b/app/images/mm-card-onboarding-success.png
new file mode 100644
index 00000000000..a4a24fb1340
Binary files /dev/null and b/app/images/mm-card-onboarding-success.png differ
diff --git a/app/images/mm-card-verify.png b/app/images/mm-card-verify.png
new file mode 100644
index 00000000000..1d504c1df9b
Binary files /dev/null and b/app/images/mm-card-verify.png differ
diff --git a/app/images/mm-card-welcome.png b/app/images/mm-card-welcome.png
new file mode 100644
index 00000000000..3315700bf57
Binary files /dev/null and b/app/images/mm-card-welcome.png differ
diff --git a/e2e/pages/Transactions/ActivitiesView.ts b/e2e/pages/Transactions/ActivitiesView.ts
index 0a37fa1e788..bc3fae18ce4 100644
--- a/e2e/pages/Transactions/ActivitiesView.ts
+++ b/e2e/pages/Transactions/ActivitiesView.ts
@@ -127,6 +127,7 @@ class ActivitiesView {
     // Swipe left on the tabs bar to reveal the Predictions tab (it may be off-screen)
     await Gestures.swipe(this.tabsBar, 'left', {
       percentage: 0.5,
+      speed: 'slow',
       elemDescription: 'Activity View Tabs Bar',
     });
     await Gestures.waitAndTap(this.predictionsTab, {
diff --git a/e2e/specs/predict/predict-claim-positions.spec.ts b/e2e/specs/predict/predict-claim-positions.spec.ts
index 7760c1176bc..12fb3f22017 100644
--- a/e2e/specs/predict/predict-claim-positions.spec.ts
+++ b/e2e/specs/predict/predict-claim-positions.spec.ts
@@ -123,10 +123,7 @@ describe(SmokePredictions('Predictions'), () => {
 
         await TabBarComponent.tapWallet();
 
-        // Verify balance on iOS only. Android balances take a while to refresh.
-        if (device.getPlatform() === 'ios') {
-          await Assertions.expectTextDisplayed('$48.16');
-        }
+        await Assertions.expectTextDisplayed('$48.16');
       },
     );
   });
diff --git a/e2e/specs/predict/predict-withdraw.spec.ts b/e2e/specs/predict/predict-withdraw.spec.ts
index e44652b92b6..c90899ad26e 100644
--- a/e2e/specs/predict/predict-withdraw.spec.ts
+++ b/e2e/specs/predict/predict-withdraw.spec.ts
@@ -39,8 +39,6 @@ describe(SmokeTrade('Predictions'), () => {
         await loginToApp();
         await TabBarComponent.tapActions();
         await WalletActionsBottomSheet.tapPredictButton();
-        await new Promise((resolve) => setTimeout(resolve, 9000));
-
         // TODO: Add withdraw flow
       },
     );
diff --git a/locales/languages/en.json b/locales/languages/en.json
index 2624633e195..ddc1754ee46 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -6489,57 +6489,52 @@
       "select_method": "Select method"
     },
     "card_onboarding": {
-      "title": "Enable MetaMask Card features",
-      "description": "Change your spending token and network by signing in with your Crypto Life email and password.",
-      "verify_account_button": "Sign in",
-      "non_cardholder_title": "Welcome to MetaMask Card",
-      "non_cardholder_description": "MetaMask Card is the free and easy way to spend your crypto, with rich onchain rewards.",
-      "non_cardholder_verify_account_button": "Get started",
+      "title": "Spend\nand\nEarn",
+      "description": "The MetaMask Card is the fast and easy way to spend your crypto like cash and earn rewards.",
+      "apply_now_button": "Apply now",
       "sign_up": {
-        "title": "Sign up",
-        "description": "Register with Crypto Life, the provider for MetaMask Card. Use these credentials to manage your card.",
+        "title": "Let's get started",
+        "description": "Create your MetaMask Card account, provided by Crypto Life. This will be separate from your MetaMask account.",
         "i_already_have_an_account": "I already have an account",
         "email_label": "Email",
         "password_label": "Password",
-        "confirm_password_label": "Re-enter your password",
-        "country_label": "Country of Residence",
-        "email_placeholder": "Enter your email address",
         "password_placeholder": "Must be 15+ characters long",
-        "confirm_password_placeholder": "Re-enter your password",
+        "confirm_password_label": "Confirm password",
+        "country_label": "Country of residence",
         "country_placeholder": "Select your country",
-        "password_mismatch": "Passwords do not match",
+        "password_mismatch": "Passwords must match",
         "invalid_email": "Invalid email address",
-        "invalid_password": "Password must be at least 15 characters long and not contain non-printable characters or consecutive spaces"
+        "invalid_password": "Password must be 15+ characters long. It cannot contain non-printable characters or consecutive spaces."
       },
       "confirm_email": {
         "title": "Confirm your email",
-        "description": "We've sent a confirmation code to: {{email}}",
-        "confirm_code_label": "Confirmation code",
-        "confirm_code_placeholder": "Enter the 6-digit code",
-        "resend_verification": "Resend verification code",
+        "description": "Enter the code we sent to {{email}}. If you don't see it, check your spam folder.",
+        "didnt_receive_code": "Didn't receive the code? ",
+        "resend_verification": "Resend it",
         "resend_cooldown": "Resend available in {{seconds}} seconds",
         "account_exists": "Please log in to proceed with your onboarding"
       },
       "set_phone_number": {
-        "title": "Phone number",
-        "description": "We'll send your confirmation code to this number",
-        "phone_number_label": "Phone number",
-        "phone_number_placeholder": "Enter your phone number",
+        "title": "Confirm your phone number",
+        "description": "Enter your phone number. We'll send you a confirmation code there.",
+        "phone_number_label": "Enter phone number",
         "country_area_code_label": "Country area code",
         "invalid_phone_number": "Invalid phone number",
         "legal_terms": "By continuing, you agree to receiving SMS to verify your phone number."
       },
       "confirm_phone_number": {
         "title": "Confirm your phone number",
-        "description": "We've sent a confirmation code to:\n{{phoneNumber}}",
-        "confirm_code_label": "Confirmation code",
-        "resend_verification": "Resend verification code",
+        "description": "Enter the verification code sent to\n{{phoneNumber}}",
+         "didnt_receive_code": "Didn't receive the code? ",
+        "resend_verification": "Resend it",
         "resend_cooldown": "Resend available in {{seconds}} seconds"
       },
       "verify_identity": {
-        "title": "Next, verify your identity",
-        "description": "To keep your account secure, Crypto Life needs to verify your identity through Veriff.\n\nYour info goes directly to Veriff and Crypto Life, MetaMask never sees or stores it.\n\nHave your ID and proof of address ready. This usually takes 5 minutes.",
-        "verify_button": "Start verification",
+        "title": "Verify your identity",
+        "description": "Our partner, Crypto Life, uses a service called Veriff to keep your account secure. ",
+        "terms_1": "Your info goes directly to Veriff and Crypto Life. MetaMask never sees it.",
+        "terms_2": "You'll need your ID and proof of address to get approved. This usually takes 5 minutes.",
+        "verify_button": "Next",
         "start_verification_error": "Error starting verification. Please try again shortly."
       },
       "kyc_webview": {
@@ -6549,8 +6544,10 @@
         "close_button": "Exit"
       },
       "validating_kyc": {
-        "title": "Validating your KYC...",
-        "timeout_button": "Restart verification"
+        "title": "Awaiting approval",
+        "description": "Our partner needs to approve your identity. Once you've been approved, you'll be ready to spend.",
+        "timeout_button": "Restart verification",
+        "terms": "Approvals usually take around 12 hours. We'll notify you when a decision is made."
       },
       "verifying_registration": {
         "title": "Verifying your identity",
@@ -6569,64 +6566,46 @@
         "success_toast": "Your ID was verified!"
       },
       "kyc_failed": {
-        "title": "Rejected",
-        "description": "Your KYC was rejected. Please try again."
+        "title": "You're not eligible for MetaMask Card right now",
+        "description": "Our partner approves based on set criteria. Learn more.",
+        "close_button": "Back to home"
       },
       "personal_details": {
-        "title": "Now, our partner needs some info about you",
-        "description": "Don't worry, this info is private and we never see it",
+        "title": "Add your info",
+        "description": "Enter your personal details. We'll use this info for verification purposes.",
         "first_name_label": "First name",
         "last_name_label": "Last name",
         "date_of_birth_label": "Date of birth",
-        "nationality_label": "Country of Nationality",
+        "nationality_label": "Nationality",
         "ssn_label": "Social Security Number",
-        "first_name_placeholder": "Enter your first name",
-        "last_name_placeholder": "Enter your last name",
-        "date_of_birth_placeholder": "Enter your date of birth",
-        "nationality_placeholder": "Select your nationality",
-        "ssn_placeholder": "Enter your SSN",
         "invalid_ssn": "Invalid SSN",
         "invalid_date_of_birth": "Invalid date of birth. You must be at least 18 years old"
       },
       "physical_address": {
-        "title": "Residential address",
-        "description": "Please provide your physical residence address to Crypto Life",
+        "title": "Add your address",
+        "description":"Enter your home address. If approved, we'll send your physical card here.",
         "address_line_1_label": "Address line 1",
         "address_line_2_label": "Address line 2",
         "city_label": "City",
         "state_label": "State",
-        "zip_code_label": "ZIP or Postal code",
-        "address_line_1_placeholder": "Street address",
-        "address_line_2_placeholder": "Floor, apartment or suite number",
-        "city_placeholder": "Enter your city",
-        "state_placeholder": "Enter your state",
-        "zip_code_placeholder": "Enter your ZIP code or postal code",
-        "same_mailing_address_label": "Residential address is the same as mailing address",
-        "electronic_consent_1": "I agree to the ",
-        "electronic_consent_2": "E-Sign Act Consent and Disclosure",
-        "electronic_consent_3": " and to receive all communications electronically",
-        "terms_and_conditions_1": "I agree to the ",
-        "terms_and_conditions_2": "Terms and Conditions",
-        "terms_and_conditions_3": " of MetaMask Card",
-        "privacy_policy_1": "I agree to the data practices described in the ",
-        "privacy_policy_2": "Privacy Policy",
-        "right_to_information_1": "I have been informed of my ",
-        "right_to_information_2": "Right to Information",
-        "right_to_information_3": " as provided by law",
-        "account_opening_disclosure_1": "I agree to the terms, conditions, fees, and features outlined in the ",
-        "account_opening_disclosure_2": "Account Opening Disclosure"
+        "zip_code_label": "Zip code",
+        "country_label": "Country",
+        "electronic_consent_1": "I agree to the E-Sign Act Consent and Disclosure and to receive all communications electronically. ",
+        "electronic_consent_2": "View document(PDF)"
       },
       "mailing_address": {
         "title": "Mailing address",
-        "description": "Please provide your mailing address"
+        "description": "Please provide a mailing address that we can send your card to."
       },
       "complete": {
-        "title": "Approved!",
-        "description": "Your KYC was approved. You can now use MetaMask Card."
+        "title": "You're in!",
+        "description": "Let's set up your card so you can start spending your crypto.",
+        "confirm_button": "Set up my card"
       },
       "continue_button": "Next",
       "confirm_button": "Confirm",
       "retry_button": "Try again",
+      "close_button": "Got it",
       "errors": {
         "email_already_exists": "Email already exists. Please use a different email.",
         "invalid_email_format": "Invalid email format. Please check your email and try again.",