diff --git a/modules/ppcp-settings/node_modules/.gitkeep b/modules/ppcp-settings/node_modules/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/modules/ppcp-settings/resources/css/components/reusable-components/_button.scss b/modules/ppcp-settings/resources/css/components/reusable-components/_button.scss
index dbf41614c..e33085763 100644
--- a/modules/ppcp-settings/resources/css/components/reusable-components/_button.scss
+++ b/modules/ppcp-settings/resources/css/components/reusable-components/_button.scss
@@ -12,8 +12,6 @@ button.components-button, a.components-button {
 		border-radius: 2px;
 		padding: 14px 17px;
 		height: auto;
-
-
 	}
 
 	&.is-primary {
diff --git a/modules/ppcp-settings/resources/css/components/reusable-components/_onboarding-header.scss b/modules/ppcp-settings/resources/css/components/reusable-components/_onboarding-header.scss
index d6ea2b3f4..b73908da3 100644
--- a/modules/ppcp-settings/resources/css/components/reusable-components/_onboarding-header.scss
+++ b/modules/ppcp-settings/resources/css/components/reusable-components/_onboarding-header.scss
@@ -29,7 +29,7 @@
 
 	&__description {
 		@include font(14, 22, 400);
-		margin: 0;
+		margin: 0 20%;
 		text-align: center;
 	}
 }
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Onboarding.js b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Onboarding.js
index 587d59253..a91eabb48 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Onboarding.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Onboarding.js
@@ -1,8 +1,7 @@
 import Container from '../../ReusableComponents/Container';
 import { useOnboardingStep } from '../../../data';
 import { getSteps } from './availableSteps';
-import {__} from "@wordpress/i18n";
-import Navigation from "../../ReusableComponents/Navigation";
+import Navigation from '../../ReusableComponents/Navigation';
 
 const getCurrentStep = ( requestedStep, steps ) => {
 	const isValidStep = ( step ) =>
@@ -22,24 +21,24 @@ const Onboarding = () => {
 	const CurrentStepComponent = getCurrentStep( step, steps );
 
 	return (
-        <>
-            <Navigation
-                setStep={ setStep }
-                currentStep={ step }
-                setCompleted={ setCompleted }
-                stepperOrder={ steps }
-            />
-            <Container page="onboarding">
-                <div className="ppcp-r-card">
-                    <CurrentStepComponent
-                        setStep={ setStep }
-                        currentStep={ step }
-                        setCompleted={ setCompleted }
-                        stepperOrder={ steps }
-                    />
-                </div>
-            </Container>
-        </>
+		<>
+			<Navigation
+				setStep={ setStep }
+				currentStep={ step }
+				setCompleted={ setCompleted }
+				stepperOrder={ steps }
+			/>
+			<Container page="onboarding">
+				<div className="ppcp-r-card">
+					<CurrentStepComponent
+						setStep={ setStep }
+						currentStep={ step }
+						setCompleted={ setCompleted }
+						stepperOrder={ steps }
+					/>
+				</div>
+			</Container>
+		</>
 	);
 };
 
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/StepCompleteSetup.js b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/StepCompleteSetup.js
new file mode 100644
index 000000000..90650be72
--- /dev/null
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/StepCompleteSetup.js
@@ -0,0 +1,43 @@
+import OnboardingHeader from '../../ReusableComponents/OnboardingHeader';
+import { __ } from '@wordpress/i18n';
+import { Button, Icon } from '@wordpress/components';
+
+const StepCompleteSetup = ( {
+	setStep,
+	currentStep,
+	stepperOrder,
+	setCompleted,
+} ) => {
+	const ButtonIcon = () => <Icon icon="external" />;
+
+	return (
+		<div className="ppcp-r-page-products">
+			<OnboardingHeader
+				title={ __(
+					'Complete Your Payment Setup',
+					'woocommerce-paypal-payments'
+				) }
+				description={ __(
+					'To finalize your payment setup, please log in to PayPal. If you don’t have an account yet, don’t worry - we’ll guide you through the easy process of creating one.',
+					'woocommerce-paypal-payments'
+				) }
+			/>
+			<div className="ppcp-r-inner-container">
+				<div className="ppcp-r-onboarding-header__description">
+					<Button
+						variant="primary"
+						icon={ ButtonIcon }
+						onClick={ () => {} }
+					>
+						{ __(
+							'Connect to PayPal',
+							'woocommerce-paypal-payments'
+						) }
+					</Button>
+				</div>
+			</div>
+		</div>
+	);
+};
+
+export default StepCompleteSetup;
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/StepWelcome.js b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/StepWelcome.js
index 759fe28bc..7eb276361 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/StepWelcome.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/StepWelcome.js
@@ -19,7 +19,7 @@ const StepWelcome = ( { setStep, currentStep, setCompleted } ) => {
 					'woocommerce-paypal-payments'
 				) }
 				description={ __(
-					'Your all-in-one integration for PayPal checkout solutions that enable buyers<br/> to pay via PayPal, Pay Later, all major credit/debit cards, Apple Pay, Google Pay, and more.',
+					'Your all-in-one integration for PayPal checkout solutions that enable buyers to pay via PayPal, Pay Later, all major credit/debit cards, Apple Pay, Google Pay, and more.',
 					'woocommerce-paypal-payments'
 				) }
 			/>
@@ -100,144 +100,209 @@ const WelcomeDocs = () => {
 		'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
 	);
 
-    return (
-        <div className="ppcp-r-welcome-docs">
-            <h2 className="ppcp-r-welcome-docs__title">{ __( `Want to know more about PayPal Payments?`, 'woocommerce-paypal-payments' ) }</h2>
-            <div className="ppcp-r-welcome-docs__wrapper">
-                <div className="ppcp-r-welcome-docs__col">
-                    <BadgeBox
-                        title={ __( 'PayPal Checkout', 'woocommerce-paypal-payments' ) }
-                        titleType={ BADGE_BOX_TITLE_BIG }
-                        textBadge={ __( 'from 3.49% + $0.49 USD<sup>1</sup>', 'woocommerce-paypal-payments' ) }
-                        description={ __(
-                            'Our all-in-one checkout solution lets you offer PayPal, Venmo, Pay Later options, and more to help maximise conversion',
-                            'woocommerce-paypal-payments'
-                        ) }
-                    />
-                    <BadgeBox
-                        title={ __( 'Included in PayPal Checkout', 'woocommerce-paypal-payments' ) }
-                        titleType={ BADGE_BOX_TITLE_BIG }/>
-                    <BadgeBox
-                        title={ __( 'Pay with PayPal', 'woocommerce-paypal-payments' ) }
-                        imageBadge={ [ 'icon-button-paypal.svg' ] }
-                        description={ sprintf(
-                            // translators: %s: Link to PayPal REST application guide
-                            __(
-                                'Our brand recognition helps give customers the confidence to buy. <a target="_blank" href="%s">Learn more</a>',
-                                'woocommerce-paypal-payments'
-                            ),
-                            'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
-                        ) }
-                    />
-                    <Separator className="ppcp-r-page-welcome-mode-separator"/>
-                    <BadgeBox
-                        title={ __( 'Pay Later', 'woocommerce-paypal-payments' ) }
-                        imageBadge={ [ 'icon-payment-method-paypal-small.svg' ] }
-                        description={ sprintf(
-                            // translators: %s: Link to PayPal REST application guide
-                            __(
-                                'Offer installment payment options and get paid upfront - at no extra cost to you. <a target="_blank" href="%s">Learn more</a>',
-                                'woocommerce-paypal-payments'
-                            ),
-                            'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
-                        ) }
-                    />
-                    <Separator className="ppcp-r-page-welcome-mode-separator"/>
-                    <BadgeBox
-                        title={ __( 'Venmo', 'woocommerce-paypal-payments' ) }
-                        imageBadge={ [ 'icon-button-venmo.svg' ] }
-                        description={ sprintf(
-                            // translators: %s: Link to PayPal REST application guide
-                            __(
-                                'Automatically offer Venmo checkout to millions of active users. <a target="_blank" href="%s">Learn more</a>',
-                                'woocommerce-paypal-payments'
-                            ),
-                            'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
-                        ) }
-                    />
-                    <Separator className="ppcp-r-page-welcome-mode-separator"/>
-                    <BadgeBox
-                        title={ __( 'Crypto', 'woocommerce-paypal-payments' ) }
-                        imageBadge={ [ 'icon-payment-method-crypto.svg' ] }
-                        description={ sprintf(
-                            // translators: %s: Link to PayPal REST application guide
-                            __(
-                                'Let customers checkout with Crypto while you get paid in cash. <a target="_blank" href="%s">Learn more</a>',
-                                'woocommerce-paypal-payments'
-                            ),
-                            'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
-                        ) }
-                    />
-                </div>
-                <div className="ppcp-r-welcome-docs__col">
-                    <BadgeBox
-                        title={ __( 'Optional payment methods', 'woocommerce-paypal-payments' ) }
-                        titleType={ BADGE_BOX_TITLE_BIG }
-                        description={ __( 'with additional application', 'woocommerce-paypal-payments' ) }
-                    />
-                    <BadgeBox
-                        title={ __( 'Custom Card Fields', 'woocommerce-paypal-payments' ) }
-                        imageBadge={ [ 'icon-button-visa.svg', 'icon-button-mastercard.svg', 'icon-button-amex.svg', 'icon-button-discover.svg' ] }
-                        textBadge={ __( 'from 2.59% + $0.49 USD<sup>1</sup>', 'woocommerce-paypal-payments' ) }
-                        description={ sprintf(
-                            // translators: %s: Link to PayPal REST application guide
-                            __(
-                                'Style the credit card fields to match your own style. Includes advanced processing with risk management, 3D Secure, fraud protection options, and chargeback protection. <a target="_blank" href="%s">Learn more</a>',
-                                'woocommerce-paypal-payments'
-                            ),
-                            'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
-                        ) }
-                    />
-                    <Separator className="ppcp-r-page-welcome-mode-separator"/>
-                    <BadgeBox
-                        title={ __( 'Digital Wallets', 'woocommerce-paypal-payments' ) }
-                        imageBadge={ [ 'icon-button-apple-pay.svg', 'icon-button-google-pay.svg' ] }
-                        textBadge={ __( 'from 2.59% + $0.49 USD<sup>1</sup>', 'woocommerce-paypal-payments' ) }
-                        description={ sprintf(
-                            // translators: %s: Link to PayPal REST application guide
-                            __(
-                                'Accept Apple Pay on eligible devices and Google Pay through mobile and web. <a target="_blank" href="%s">Learn more</a>',
-                                'woocommerce-paypal-payments'
-                            ),
-                            'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
-                        ) }
-                    />
-                    <Separator className="ppcp-r-page-welcome-mode-separator"/>
-                    <BadgeBox
-                        title={ __( 'Alternative Payment Methods', 'woocommerce-paypal-payments' ) }
-                        imageBadge={ [ 'icon-button-sepa.svg', 'icon-button-ideal.svg', 'icon-button-blik.svg', 'icon-button-bancontact.svg' ] }
-                        textBadge={ __( 'from 3.49% + $0.49 USD<sup>1</sup>', 'woocommerce-paypal-payments' ) }
-                        description={ sprintf(
-                            // translators: %s: Link to PayPal REST application guide
-                            __(
-                                'Seamless payments for customers across the globe using their preferred payment methods. <a target="_blank" href="%s">Learn more</a>',
-                                'woocommerce-paypal-payments'
-                            ),
-                            'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
-                        ) }
-                    />
-                    <Separator className="ppcp-r-page-welcome-mode-separator"/>
-                    <BadgeBox
-                        title={ __( '', 'woocommerce-paypal-payments' ) }
-                        imageBadge={ [ 'icon-payment-method-fastlane-small.svg' ] }
-                        textBadge={ __( 'from 2.59% + $0.49 USD<sup>1</sup>', 'woocommerce-paypal-payments' ) }
-                        description={ sprintf(
-                            // translators: %s: Link to PayPal REST application guide
-                            __(
-                                'Speed up guest checkout with Fatslane. Link a customer\'s email address to their payment details. <a target="_blank" href="%s">Learn more</a>',
-                                'woocommerce-paypal-payments'
-                            ),
-                            'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
-                        ) }
-                    />
-                </div>
-            </div>
-            <p
-                className="ppcp-r-welcome-docs__description"
-                dangerouslySetInnerHTML={ { __html: pricesBasedDescription, } }
-            ></p>
-        </div>
-    );
+	return (
+		<div className="ppcp-r-welcome-docs">
+			<h2 className="ppcp-r-welcome-docs__title">
+				{ __(
+					`Want to know more about PayPal Payments?`,
+					'woocommerce-paypal-payments'
+				) }
+			</h2>
+			<div className="ppcp-r-welcome-docs__wrapper">
+				<div className="ppcp-r-welcome-docs__col">
+					<BadgeBox
+						title={ __(
+							'PayPal Checkout',
+							'woocommerce-paypal-payments'
+						) }
+						titleType={ BADGE_BOX_TITLE_BIG }
+						textBadge={ __(
+							'from 3.49% + $0.49 USD<sup>1</sup>',
+							'woocommerce-paypal-payments'
+						) }
+						description={ __(
+							'Our all-in-one checkout solution lets you offer PayPal, Venmo, Pay Later options, and more to help maximise conversion',
+							'woocommerce-paypal-payments'
+						) }
+					/>
+					<BadgeBox
+						title={ __(
+							'Included in PayPal Checkout',
+							'woocommerce-paypal-payments'
+						) }
+						titleType={ BADGE_BOX_TITLE_BIG }
+					/>
+					<BadgeBox
+						title={ __(
+							'Pay with PayPal',
+							'woocommerce-paypal-payments'
+						) }
+						imageBadge={ [ 'icon-button-paypal.svg' ] }
+						description={ sprintf(
+							// translators: %s: Link to PayPal REST application guide
+							__(
+								'Our brand recognition helps give customers the confidence to buy. <a target="_blank" href="%s">Learn more</a>',
+								'woocommerce-paypal-payments'
+							),
+							'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
+						) }
+					/>
+					<Separator className="ppcp-r-page-welcome-mode-separator" />
+					<BadgeBox
+						title={ __(
+							'Pay Later',
+							'woocommerce-paypal-payments'
+						) }
+						imageBadge={ [
+							'icon-payment-method-paypal-small.svg',
+						] }
+						description={ sprintf(
+							// translators: %s: Link to PayPal REST application guide
+							__(
+								'Offer installment payment options and get paid upfront - at no extra cost to you. <a target="_blank" href="%s">Learn more</a>',
+								'woocommerce-paypal-payments'
+							),
+							'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
+						) }
+					/>
+					<Separator className="ppcp-r-page-welcome-mode-separator" />
+					<BadgeBox
+						title={ __( 'Venmo', 'woocommerce-paypal-payments' ) }
+						imageBadge={ [ 'icon-button-venmo.svg' ] }
+						description={ sprintf(
+							// translators: %s: Link to PayPal REST application guide
+							__(
+								'Automatically offer Venmo checkout to millions of active users. <a target="_blank" href="%s">Learn more</a>',
+								'woocommerce-paypal-payments'
+							),
+							'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
+						) }
+					/>
+					<Separator className="ppcp-r-page-welcome-mode-separator" />
+					<BadgeBox
+						title={ __( 'Crypto', 'woocommerce-paypal-payments' ) }
+						imageBadge={ [ 'icon-payment-method-crypto.svg' ] }
+						description={ sprintf(
+							// translators: %s: Link to PayPal REST application guide
+							__(
+								'Let customers checkout with Crypto while you get paid in cash. <a target="_blank" href="%s">Learn more</a>',
+								'woocommerce-paypal-payments'
+							),
+							'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
+						) }
+					/>
+				</div>
+				<div className="ppcp-r-welcome-docs__col">
+					<BadgeBox
+						title={ __(
+							'Optional payment methods',
+							'woocommerce-paypal-payments'
+						) }
+						titleType={ BADGE_BOX_TITLE_BIG }
+						description={ __(
+							'with additional application',
+							'woocommerce-paypal-payments'
+						) }
+					/>
+					<BadgeBox
+						title={ __(
+							'Custom Card Fields',
+							'woocommerce-paypal-payments'
+						) }
+						imageBadge={ [
+							'icon-button-visa.svg',
+							'icon-button-mastercard.svg',
+							'icon-button-amex.svg',
+							'icon-button-discover.svg',
+						] }
+						textBadge={ __(
+							'from 2.59% + $0.49 USD<sup>1</sup>',
+							'woocommerce-paypal-payments'
+						) }
+						description={ sprintf(
+							// translators: %s: Link to PayPal REST application guide
+							__(
+								'Style the credit card fields to match your own style. Includes advanced processing with risk management, 3D Secure, fraud protection options, and chargeback protection. <a target="_blank" href="%s">Learn more</a>',
+								'woocommerce-paypal-payments'
+							),
+							'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
+						) }
+					/>
+					<Separator className="ppcp-r-page-welcome-mode-separator" />
+					<BadgeBox
+						title={ __(
+							'Digital Wallets',
+							'woocommerce-paypal-payments'
+						) }
+						imageBadge={ [
+							'icon-button-apple-pay.svg',
+							'icon-button-google-pay.svg',
+						] }
+						textBadge={ __(
+							'from 2.59% + $0.49 USD<sup>1</sup>',
+							'woocommerce-paypal-payments'
+						) }
+						description={ sprintf(
+							// translators: %s: Link to PayPal REST application guide
+							__(
+								'Accept Apple Pay on eligible devices and Google Pay through mobile and web. <a target="_blank" href="%s">Learn more</a>',
+								'woocommerce-paypal-payments'
+							),
+							'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
+						) }
+					/>
+					<Separator className="ppcp-r-page-welcome-mode-separator" />
+					<BadgeBox
+						title={ __(
+							'Alternative Payment Methods',
+							'woocommerce-paypal-payments'
+						) }
+						imageBadge={ [
+							'icon-button-sepa.svg',
+							'icon-button-ideal.svg',
+							'icon-button-blik.svg',
+							'icon-button-bancontact.svg',
+						] }
+						textBadge={ __(
+							'from 3.49% + $0.49 USD<sup>1</sup>',
+							'woocommerce-paypal-payments'
+						) }
+						description={ sprintf(
+							// translators: %s: Link to PayPal REST application guide
+							__(
+								'Seamless payments for customers across the globe using their preferred payment methods. <a target="_blank" href="%s">Learn more</a>',
+								'woocommerce-paypal-payments'
+							),
+							'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
+						) }
+					/>
+					<Separator className="ppcp-r-page-welcome-mode-separator" />
+					<BadgeBox
+						title={ __( '', 'woocommerce-paypal-payments' ) }
+						imageBadge={ [
+							'icon-payment-method-fastlane-small.svg',
+						] }
+						textBadge={ __(
+							'from 2.59% + $0.49 USD<sup>1</sup>',
+							'woocommerce-paypal-payments'
+						) }
+						description={ sprintf(
+							// translators: %s: Link to PayPal REST application guide
+							__(
+								'Speed up guest checkout with Fatslane. Link a customer\'s email address to their payment details. <a target="_blank" href="%s">Learn more</a>',
+								'woocommerce-paypal-payments'
+							),
+							'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input '
+						) }
+					/>
+				</div>
+			</div>
+			<p
+				className="ppcp-r-welcome-docs__description"
+				dangerouslySetInnerHTML={ { __html: pricesBasedDescription } }
+			></p>
+		</div>
+	);
 };
 
 export default StepWelcome;
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/availableSteps.js b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/availableSteps.js
index 32034ec57..a5555180d 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/availableSteps.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/availableSteps.js
@@ -1,9 +1,15 @@
 import StepWelcome from './StepWelcome';
 import StepBusiness from './StepBusiness';
 import StepProducts from './StepProducts';
+import StepCompleteSetup from './StepCompleteSetup';
 
 export const getSteps = ( flags ) => {
-	const allSteps = [ StepWelcome, StepBusiness, StepProducts ];
+	const allSteps = [
+		StepWelcome,
+		StepBusiness,
+		StepProducts,
+		StepCompleteSetup,
+	];
 
 	if ( ! flags.canUseCasualSelling ) {
 		return allSteps.filter( ( step ) => step !== StepBusiness );
diff --git a/node_modules/.gitkeep b/node_modules/.gitkeep
deleted file mode 100644
index e69de29bb..000000000