diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 39f9bbc866..47f83b0043 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -318,6 +318,7 @@
 		6AC6DAB328804F97002723C0 /* BarsAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AC6DAB228804F97002723C0 /* BarsAnimator.swift */; };
 		6AC98419288055C1005FA9CA /* BarsAnimatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AC98418288055C1005FA9CA /* BarsAnimatorTests.swift */; };
 		6F655BE22BAB289E00AC3597 /* DefaultTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F655BE12BAB289E00AC3597 /* DefaultTheme.swift */; };
+		6F8496412BC3D8EE00ADA54E /* OnboardingButtonsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F8496402BC3D8EE00ADA54E /* OnboardingButtonsView.swift */; };
 		6FDA1FB32B59584400AC962A /* AddressDisplayHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FDA1FB22B59584400AC962A /* AddressDisplayHelper.swift */; };
 		83004E802193BB8200DA013C /* WKNavigationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83004E7F2193BB8200DA013C /* WKNavigationExtension.swift */; };
 		83004E862193E5ED00DA013C /* TabViewControllerBrowsingMenuExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83004E852193E5ED00DA013C /* TabViewControllerBrowsingMenuExtension.swift */; };
@@ -1433,6 +1434,7 @@
 		6AC6DAB228804F97002723C0 /* BarsAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BarsAnimator.swift; sourceTree = "<group>"; };
 		6AC98418288055C1005FA9CA /* BarsAnimatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BarsAnimatorTests.swift; sourceTree = "<group>"; };
 		6F655BE12BAB289E00AC3597 /* DefaultTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultTheme.swift; sourceTree = "<group>"; };
+		6F8496402BC3D8EE00ADA54E /* OnboardingButtonsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingButtonsView.swift; sourceTree = "<group>"; };
 		6FB030C7234331B400A10DB9 /* Configuration.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Configuration.xcconfig; path = Configuration/Configuration.xcconfig; sourceTree = "<group>"; };
 		6FDA1FB22B59584400AC962A /* AddressDisplayHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressDisplayHelper.swift; sourceTree = "<group>"; };
 		83004E7F2193BB8200DA013C /* WKNavigationExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKNavigationExtension.swift; sourceTree = "<group>"; };
@@ -5400,6 +5402,7 @@
 				F4B0B795252CB35700830156 /* OnboardingWidgetsDetailsViewController.swift */,
 				851B128B2220483A004781BC /* OnboardingViewController.swift */,
 				F47E53DA250A9A1C0037C686 /* Onboarding.xcassets */,
+				6F8496402BC3D8EE00ADA54E /* OnboardingButtonsView.swift */,
 			);
 			name = Onboarding;
 			sourceTree = "<group>";
@@ -6612,6 +6615,7 @@
 				D6E83C2E2B1EA06E006C8AFB /* SettingsViewModel.swift in Sources */,
 				8590CB612684D0600089F6BF /* CookieDebugViewController.swift in Sources */,
 				319A37152829A55F0079FBCE /* AutofillListItemTableViewCell.swift in Sources */,
+				6F8496412BC3D8EE00ADA54E /* OnboardingButtonsView.swift in Sources */,
 				1EA513782866039400493C6A /* TrackerAnimationLogic.swift in Sources */,
 				854A01332A558B3A00FCC628 /* UIView+Constraints.swift in Sources */,
 				C12726EE2A5FF88C00215B02 /* EmailSignupPromptView.swift in Sources */,
diff --git a/DuckDuckGo/Base.lproj/Onboarding.storyboard b/DuckDuckGo/Base.lproj/Onboarding.storyboard
index 2df197cfe4..d052444b85 100644
--- a/DuckDuckGo/Base.lproj/Onboarding.storyboard
+++ b/DuckDuckGo/Base.lproj/Onboarding.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Z3L-XQ-lW0">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Z3L-XQ-lW0">
     <device id="retina6_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -35,10 +35,10 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ubS-NY-rcT" userLabel="Header Container">
-                                <rect key="frame" x="0.0" y="88.000000000000014" width="414" height="132.33333333333337"/>
+                                <rect key="frame" x="0.0" y="87.999999999999986" width="414" height="140.66666666666663"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Welcome to DuckDuckGo!" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="u7Q-MU-drX">
-                                        <rect key="frame" x="20" y="65.333333333333343" width="374" height="64"/>
+                                        <rect key="frame" x="20" y="61.000000000000007" width="374" height="76.666666666666686"/>
                                         <accessibility key="accessibilityConfiguration">
                                             <accessibilityTraits key="traits" staticText="YES" header="YES"/>
                                         </accessibility>
@@ -55,7 +55,7 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oPA-w3-V6b" userLabel="Subheader Container">
-                                <rect key="frame" x="0.0" y="220.33333333333334" width="414" height="88.333333333333343"/>
+                                <rect key="frame" x="0.0" y="228.66666666666663" width="414" height="94"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JgA-Kx-QGf">
                                         <rect key="frame" x="20" y="3" width="374" height="22"/>
@@ -82,88 +82,45 @@
                                 </constraints>
                             </view>
                             <containerView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bos-sp-j80">
-                                <rect key="frame" x="30" y="308.66666666666674" width="354" height="441.33333333333326"/>
+                                <rect key="frame" x="30" y="322.66666666666674" width="354" height="469.33333333333326"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="276" id="poA-Sb-4vN"/>
                                 </constraints>
                             </containerView>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZEn-eD-MPB" userLabel="Continue Button" customClass="RoundedRectangleView" customModule="DuckDuckGo" customModuleProvider="target">
-                                <rect key="frame" x="30" y="762" width="354" height="50"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="ciS-pA-ovS">
-                                        <rect key="frame" x="0.0" y="0.0" width="354" height="50"/>
-                                        <accessibility key="accessibilityConfiguration" identifier="Continue"/>
-                                        <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                        <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <state key="normal" title="Continue"/>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="titleLabel.textAlignment">
-                                                <integer key="value" value="1"/>
-                                            </userDefinedRuntimeAttribute>
-                                        </userDefinedRuntimeAttributes>
-                                        <connections>
-                                            <action selector="nextWithSender:" destination="X59-2u-JR5" eventType="touchUpInside" id="kTk-d2-pSU"/>
-                                        </connections>
-                                    </button>
-                                </subviews>
-                                <color key="backgroundColor" red="0.40392156862745099" green="0.5607843137254902" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <view contentMode="scaleToFill" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="pwY-iy-NUS">
+                                <rect key="frame" x="30" y="804" width="354" height="50"/>
                                 <constraints>
-                                    <constraint firstItem="ciS-pA-ovS" firstAttribute="centerX" secondItem="ZEn-eD-MPB" secondAttribute="centerX" id="CY6-lF-KZn"/>
-                                    <constraint firstAttribute="height" constant="50" id="ZTk-Ll-JZa"/>
-                                    <constraint firstItem="ciS-pA-ovS" firstAttribute="width" secondItem="ZEn-eD-MPB" secondAttribute="width" id="gpL-yi-tzk"/>
-                                    <constraint firstItem="ciS-pA-ovS" firstAttribute="centerY" secondItem="ZEn-eD-MPB" secondAttribute="centerY" id="iW9-BQ-e1H"/>
-                                    <constraint firstItem="ciS-pA-ovS" firstAttribute="height" secondItem="ZEn-eD-MPB" secondAttribute="height" id="wxs-qS-EGM"/>
+                                    <constraint firstAttribute="height" priority="250" constant="50" id="l85-P3-fSt"/>
                                 </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <integer key="value" value="8"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="J1y-Qk-FSX">
-                                <rect key="frame" x="30" y="825" width="354" height="29"/>
-                                <accessibility key="accessibilityConfiguration" identifier="Skip"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <state key="normal" title="SKIP">
-                                    <color key="titleColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </state>
-                                <connections>
-                                    <action selector="nextWithSender:" destination="X59-2u-JR5" eventType="touchUpInside" id="FsS-4V-mDy"/>
-                                </connections>
-                            </button>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="2Fp-cs-AKH"/>
                         <color key="backgroundColor" red="0.98039215686274506" green="0.98039215686274506" blue="0.98039215686274506" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="oPA-w3-V6b" firstAttribute="top" secondItem="ubS-NY-rcT" secondAttribute="bottom" id="6lE-HW-2zS"/>
+                            <constraint firstItem="pwY-iy-NUS" firstAttribute="top" secondItem="bos-sp-j80" secondAttribute="bottom" constant="12" id="88P-CI-bBR"/>
                             <constraint firstItem="2Fp-cs-AKH" firstAttribute="trailing" secondItem="oPA-w3-V6b" secondAttribute="trailing" id="Ajy-Uq-sd1"/>
-                            <constraint firstItem="J1y-Qk-FSX" firstAttribute="centerX" secondItem="2Fp-cs-AKH" secondAttribute="centerX" id="E7x-g7-gBV"/>
                             <constraint firstItem="bos-sp-j80" firstAttribute="width" secondItem="R3B-sO-IVB" secondAttribute="width" constant="-60" id="EKI-h0-VR8"/>
-                            <constraint firstItem="2Fp-cs-AKH" firstAttribute="bottom" secondItem="ZEn-eD-MPB" secondAttribute="bottom" constant="50" id="IjJ-lD-c8z"/>
-                            <constraint firstItem="ciS-pA-ovS" firstAttribute="top" secondItem="bos-sp-j80" secondAttribute="bottom" constant="12" id="MxJ-BY-JmD"/>
+                            <constraint firstItem="2Fp-cs-AKH" firstAttribute="bottom" secondItem="pwY-iy-NUS" secondAttribute="bottom" constant="8" id="G29-M6-YaA"/>
+                            <constraint firstItem="pwY-iy-NUS" firstAttribute="trailing" secondItem="bos-sp-j80" secondAttribute="trailing" id="L4h-EY-EI4"/>
                             <constraint firstItem="2Fp-cs-AKH" firstAttribute="top" secondItem="ubS-NY-rcT" secondAttribute="top" id="OGs-ay-qep"/>
                             <constraint firstItem="2Fp-cs-AKH" firstAttribute="trailing" secondItem="ubS-NY-rcT" secondAttribute="trailing" id="bHq-2P-wAN"/>
                             <constraint firstItem="oPA-w3-V6b" firstAttribute="height" secondItem="ubS-NY-rcT" secondAttribute="height" multiplier="2/3" id="dBk-Am-1cX"/>
+                            <constraint firstItem="pwY-iy-NUS" firstAttribute="leading" secondItem="bos-sp-j80" secondAttribute="leading" id="eEn-Eg-w4g"/>
                             <constraint firstItem="2Fp-cs-AKH" firstAttribute="leading" secondItem="ubS-NY-rcT" secondAttribute="leading" id="flP-zb-FYM"/>
                             <constraint firstItem="bos-sp-j80" firstAttribute="top" secondItem="oPA-w3-V6b" secondAttribute="bottom" id="iPu-7U-BMh"/>
                             <constraint firstItem="oPA-w3-V6b" firstAttribute="leading" secondItem="2Fp-cs-AKH" secondAttribute="leading" id="jHz-Eb-9hb"/>
                             <constraint firstItem="bos-sp-j80" firstAttribute="height" secondItem="oPA-w3-V6b" secondAttribute="height" multiplier="5" id="kf8-bq-C9J"/>
-                            <constraint firstItem="J1y-Qk-FSX" firstAttribute="width" secondItem="R3B-sO-IVB" secondAttribute="width" constant="-60" id="piD-VT-cUm"/>
-                            <constraint firstItem="ZEn-eD-MPB" firstAttribute="centerX" secondItem="2Fp-cs-AKH" secondAttribute="centerX" id="tQ7-Ks-K18"/>
-                            <constraint firstItem="2Fp-cs-AKH" firstAttribute="bottom" secondItem="J1y-Qk-FSX" secondAttribute="bottom" constant="8" id="tck-5q-i12"/>
-                            <constraint firstItem="ZEn-eD-MPB" firstAttribute="width" secondItem="R3B-sO-IVB" secondAttribute="width" constant="-60" id="v0N-37-UmX"/>
                             <constraint firstItem="bos-sp-j80" firstAttribute="centerX" secondItem="2Fp-cs-AKH" secondAttribute="centerX" id="yd2-2T-gt7"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="4R1-zb-0aW"/>
                     <connections>
+                        <outlet property="buttonsContainer" destination="pwY-iy-NUS" id="9rX-gb-BYT"/>
                         <outlet property="contentContainer" destination="bos-sp-j80" id="5Aw-TP-cka"/>
                         <outlet property="contentWidth" destination="EKI-h0-VR8" id="4gz-Z4-U2l"/>
-                        <outlet property="continueButton" destination="ciS-pA-ovS" id="fli-79-bAt"/>
                         <outlet property="header" destination="u7Q-MU-drX" id="sqo-IJ-qev"/>
                         <outlet property="headerContainer" destination="ubS-NY-rcT" id="KQM-mM-pVE"/>
-                        <outlet property="skipButton" destination="J1y-Qk-FSX" id="ScB-tm-3Uc"/>
                         <outlet property="subheader" destination="JgA-Kx-QGf" id="eGR-Va-uhA"/>
                         <outlet property="subheaderContainer" destination="oPA-w3-V6b" id="sXN-ME-vPf"/>
                     </connections>
@@ -262,14 +219,13 @@
                                 </userDefinedRuntimeAttributes>
                                 <connections>
                                     <action selector="ctaPressed:" destination="ukC-qX-bpq" eventType="touchUpInside" id="Xet-T9-1ZD"/>
-                                    <action selector="nextWithSender:" destination="X59-2u-JR5" eventType="touchUpInside" id="BXv-7D-bfP"/>
                                 </connections>
                             </button>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="35M-WT-Fs5">
                                 <rect key="frame" x="0.0" y="44" width="414" height="704"/>
                                 <subviews>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="748" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Yp-jL-Y1J">
-                                        <rect key="frame" x="32" y="80" width="24" height="24"/>
+                                        <rect key="frame" x="32" y="86.333333333333343" width="24" height="24"/>
                                         <color key="backgroundColor" red="0.40392156862745099" green="0.5607843137254902" blue="1" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="24" id="3zR-ah-ZAu"/>
@@ -285,7 +241,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </label>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XBd-OG-vC0">
-                                        <rect key="frame" x="32" y="149.66666666666666" width="24" height="24"/>
+                                        <rect key="frame" x="32" y="163" width="24" height="24"/>
                                         <color key="backgroundColor" red="0.4039215686" green="0.56078431370000004" blue="1" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="24" id="LYb-Z9-nPX"/>
@@ -301,7 +257,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IZh-cn-pjt">
-                                        <rect key="frame" x="72" y="80" width="310" height="37.666666666666657"/>
+                                        <rect key="frame" x="72" y="86.333333333333343" width="310" height="44.666666666666657"/>
                                         <attributedString key="attributedText">
                                             <fragment content="Long-press on the home screen to enter jiggle mode.">
                                                 <attributes>
@@ -314,20 +270,20 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="Widget Instructions" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WZv-GS-xyE">
-                                        <rect key="frame" x="16" y="16" width="382" height="32"/>
+                                        <rect key="frame" x="16" y="16.000000000000004" width="382" height="38.333333333333343"/>
                                         <fontDescription key="fontDescription" type="system" weight="heavy" pointSize="32"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="OnboardingWidgetInstructionsImage" translatesAutoresizingMaskIntoConstraints="NO" id="7jO-bh-iAP">
-                                        <rect key="frame" x="72" y="203.33333333333337" width="310" height="174"/>
+                                        <rect key="frame" x="72" y="223.66666666666669" width="310" height="174"/>
                                         <constraints>
                                             <constraint firstAttribute="width" priority="750" constant="350" id="QVG-Ac-nRR"/>
                                             <constraint firstAttribute="width" secondItem="7jO-bh-iAP" secondAttribute="height" multiplier="271:152" id="klt-u0-ZgQ"/>
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FVP-in-A0R">
-                                        <rect key="frame" x="72" y="149.66666666666666" width="310" height="37.666666666666657"/>
+                                        <rect key="frame" x="72" y="163" width="310" height="44.666666666666657"/>
                                         <attributedString key="attributedText">
                                             <fragment content="Tap the Add button %@ at the top of the screen.">
                                                 <attributes>
@@ -340,7 +296,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LP0-iP-Alk">
-                                        <rect key="frame" x="72" y="409.33333333333331" width="310" height="37.666666666666686"/>
+                                        <rect key="frame" x="72" y="429.66666666666669" width="310" height="44.666666666666686"/>
                                         <attributedString key="attributedText">
                                             <fragment content="Find DuckDuckGo in the list and choose a widget.">
                                                 <attributes>
@@ -353,7 +309,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="3" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kYm-7s-KFg">
-                                        <rect key="frame" x="32" y="409.33333333333331" width="24" height="24"/>
+                                        <rect key="frame" x="32" y="429.66666666666669" width="24" height="24"/>
                                         <color key="backgroundColor" red="0.4039215686" green="0.56078431370000004" blue="1" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="24" id="PXq-4y-GyI"/>
@@ -369,7 +325,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </label>
                                     <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O1x-XY-vpW">
-                                        <rect key="frame" x="0.0" y="463" width="414" height="0.0"/>
+                                        <rect key="frame" x="0.0" y="490.33333333333337" width="414" height="0.0"/>
                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                         <constraints>
                                             <constraint firstAttribute="height" id="gLN-iq-pby"/>
@@ -436,8 +392,8 @@
         </scene>
     </scenes>
     <resources>
-        <image name="OnboardingDefaultBrowserImage" width="259" height="266"/>
-        <image name="OnboardingWidgetImage" width="345" height="270"/>
+        <image name="OnboardingDefaultBrowserImage" width="259" height="267"/>
+        <image name="OnboardingWidgetImage" width="875" height="685"/>
         <image name="OnboardingWidgetInstructionsImage" width="1084" height="608"/>
         <namedColor name="AccentColor">
             <color red="0.40400001406669617" green="0.56099998950958252" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/DuckDuckGo/DaxOnboardingPadViewController.swift b/DuckDuckGo/DaxOnboardingPadViewController.swift
index 7690b90385..3363680a4a 100644
--- a/DuckDuckGo/DaxOnboardingPadViewController.swift
+++ b/DuckDuckGo/DaxOnboardingPadViewController.swift
@@ -27,6 +27,7 @@ class DaxOnboardingPadViewController: UIViewController, Onboarding {
         if let navController = segue.destination as? UINavigationController,
            let onboarding = navController.viewControllers.first as? OnboardingViewController {
             onboarding.delegate = delegate
+            self.view.backgroundColor = onboarding.view.backgroundColor
         }
     }
 
diff --git a/DuckDuckGo/Onboarding.xcassets/OnboardingDefaultBrowserImage.imageset/Contents.json b/DuckDuckGo/Onboarding.xcassets/OnboardingDefaultBrowserImage.imageset/Contents.json
index 5922f77d1c..3476c31dce 100644
--- a/DuckDuckGo/Onboarding.xcassets/OnboardingDefaultBrowserImage.imageset/Contents.json
+++ b/DuckDuckGo/Onboarding.xcassets/OnboardingDefaultBrowserImage.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "illustration.pdf",
+      "filename" : "Default-Browser.svg",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Onboarding.xcassets/OnboardingDefaultBrowserImage.imageset/Default-Browser.svg b/DuckDuckGo/Onboarding.xcassets/OnboardingDefaultBrowserImage.imageset/Default-Browser.svg
new file mode 100644
index 0000000000..7e3c610e94
--- /dev/null
+++ b/DuckDuckGo/Onboarding.xcassets/OnboardingDefaultBrowserImage.imageset/Default-Browser.svg
@@ -0,0 +1,33 @@
+<svg fill="none" viewBox="0 0 259 267" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#9BD96F" d="m49.547 266.823-12.77-12.704c6.595-1.858 12.41-.959 19.185 2.097l-14.928-25.347c15.528 2.277 28.778 14.621 32.915 31.22l1.199 4.734h-25.6Z"/>
+  <path fill="#9BD96F" d="M89.537 254.838H65.556v11.985h23.981v-11.985Z"/>
+  <path fill="#888" fill-opacity=".2" d="M258.537 49.93c-9.447-13.782-28.34-17.297-42.14-7.77-.185.093-.371.278-.556.37C209.08 27.545 195.188 17 177.498 17c-20.746 0-39.361 13.782-44.362 32.375-.556 1.943.648 3.977 2.685 4.532.371.093.649.093 1.019.093h119.474c1.482 0 2.686-1.203 2.686-2.59 0-.555-.185-1.11-.463-1.48ZM.404 97.394c5.146-7.199 13.52-11.398 22.4-11.298 5.752 0 11.302 1.7 15.943 5C44.801 78.097 57.212 69 73.155 69c18.567 0 35.317 11.897 39.756 27.994.404 1.7-.605 3.499-2.321 3.899-.302.1-.605.1-.908.1H2.422c-1.312.1-2.321-.9-2.422-2.2 0-.5.1-1 .404-1.4ZM205.799 68h1.199c1.019 0 1.798.779 1.798 1.798v1.198a1.766 1.766 0 0 1-1.798 1.798h-1.199A1.766 1.766 0 0 1 204 70.996v-1.198c0-1.019.779-1.798 1.799-1.798Zm-175 50h1.199c1.019 0 1.798.779 1.798 1.798v1.198c0 1.019-.78 1.798-1.798 1.798h-1.2A1.766 1.766 0 0 1 29 120.996v-1.198c0-1.019.78-1.798 1.799-1.798Zm190 60h1.199c1.019 0 1.798.779 1.798 1.798v1.198a1.766 1.766 0 0 1-1.798 1.798h-1.199a1.766 1.766 0 0 1-1.799-1.798v-1.198c0-1.019.779-1.798 1.799-1.798Zm-122-177h1.199c1.019 0 1.798.779 1.798 1.798v1.198a1.766 1.766 0 0 1-1.798 1.798h-1.2A1.766 1.766 0 0 1 97 3.996V2.798C97 1.779 97.78 1 98.799 1Z"/>
+  <path fill="#666" d="M84.74 43.908h86.334a14.35 14.35 0 0 1 14.389 14.381v194.152a14.35 14.35 0 0 1-14.389 14.382H84.74a14.35 14.35 0 0 1-14.388-14.382V58.289A14.35 14.35 0 0 1 84.74 43.908Z"/>
+  <path fill="#888" d="M91.935 43.908h86.333a14.35 14.35 0 0 1 14.389 14.381v194.152a14.35 14.35 0 0 1-14.389 14.382H91.935a14.35 14.35 0 0 1-14.39-14.382V58.289a14.35 14.35 0 0 1 14.39-14.381Z"/>
+  <path fill="#E6E6E6" d="M85 63v189.793c0 3.964 3.214 7.207 7.143 7.207h85.714c3.929 0 7.143-3.243 7.143-7.207V63H85Z"/>
+  <path fill="#B3B3B3" d="M112.919 248.846h44.365c1.02 0 1.799.779 1.799 1.797a1.766 1.766 0 0 1-1.799 1.798h-44.365a1.767 1.767 0 0 1-1.799-1.798c0-1.018.78-1.797 1.799-1.797Z"/>
+  <path fill="#F2F2F2" d="M185 154H85v24h100v-24Z"/>
+  <path fill="#CCC" d="M99 173a7 7 0 1 0 0-14 7 7 0 0 0 0 14Z"/>
+  <path fill="#999" d="m98 164.324 2.725 2.676 2.248-4.482c.068-.133 0-.334-.136-.468a.21.21 0 0 0-.272 0L98 164.324Z"/>
+  <path fill="#fff" d="m97.275 165-2.248 4.482c-.068.133 0 .334.136.468a.21.21 0 0 0 .273 0l4.564-2.208L97.275 165Z"/>
+  <path fill="#CCC" d="M118.641 164h31.718c.93 0 1.641.65 1.641 1.5v1c0 .85-.711 1.5-1.641 1.5h-31.718c-.93 0-1.641-.65-1.641-1.5v-1c0-.85.711-1.5 1.641-1.5Z"/>
+  <path fill="#353535" fill-opacity=".15" d="M85 95h155c6.627 0 12 5.373 12 12v35c0 6.627-5.373 12-12 12H85V95Z"/>
+  <path fill="#FBFBFB" d="M85 97h154.353c5.306 0 9.647 4.255 9.647 9.455v33.09c0 5.2-4.341 9.455-9.647 9.455H85V97Z"/>
+  <rect width="32" height="32" x="95" y="107" fill="#DE5833" rx="7.333"/>
+  <path fill="#DE5833" fill-rule="evenodd" d="M111 139c8.837 0 16-7.163 16-16s-7.163-16-16-16-16 7.163-16 16 7.163 16 16 16Z" clip-rule="evenodd"/>
+  <path fill="#DDD" fill-rule="evenodd" d="M113.25 134.938c0-.125.03-.154-.367-.946-1.056-2.115-2.117-5.096-1.635-7.019.088-.349-.994-12.936-1.76-13.341-.85-.453-1.897-1.172-2.854-1.332-.486-.078-1.123-.041-1.621.026-.088.012-.092.171-.007.199.327.111.724.303.957.594.045.055-.015.142-.085.144-.221.008-.621.101-1.148.549-.061.052-.011.148.068.133 1.134-.225 2.292-.114 2.975.506.044.04.021.113-.037.128-5.923 1.61-4.751 6.763-3.174 13.086 1.429 5.732 1.952 7.511 2.108 8.029a.12.12 0 0 0 .071.078c2.026.823 6.509.865 6.509-.522v-.312Z" clip-rule="evenodd"/>
+  <path fill="#fff" d="M114.063 136.125c-.719.281-2.125.406-2.938.406-1.191 0-2.906-.187-3.531-.468a140.47 140.47 0 0 1-2.794-10.004l-.001-.003c-1.356-5.539-2.463-10.063 3.607-11.485.056-.013.083-.079.046-.123-.696-.826-2.001-1.097-3.651-.528-.068.024-.126-.044-.084-.102.323-.446.955-.789 1.268-.94.064-.031.06-.125-.008-.146a6.93 6.93 0 0 0-.943-.225c-.093-.015-.101-.174-.008-.186 2.339-.315 4.781.387 6.007 1.931a.081.081 0 0 0 .046.029c4.489.964 4.81 8.059 4.293 8.382-.102.063-.429.027-.86-.021-1.746-.196-5.204-.583-2.35 4.736.028.053-.009.123-.068.132-1.61.25.453 5.293 1.969 8.615Z"/>
+  <path fill="#3CA82B" d="M116.07 129.674c-.342-.158-1.656.784-2.528 1.508-.182-.258-.526-.446-1.301-.311-.678.118-1.052.282-1.22.564-1.07-.406-2.872-1.033-3.307-.428-.475.662.119 3.79.751 4.197.33.212 1.908-.803 2.731-1.502.133.187.347.295.787.284.666-.015 1.745-.17 1.913-.48a.413.413 0 0 0 .026-.066c.847.316 2.337.651 2.67.601.868-.13-.121-4.18-.522-4.367Z"/>
+  <path fill="#4CBA3C" d="M113.623 131.274c.035.064.064.132.089.2.121.338.317 1.412.169 1.678-.149.265-1.115.393-1.711.403-.596.011-.73-.207-.851-.545-.097-.27-.144-.905-.143-1.269-.025-.539.173-.729 1.083-.876.674-.109 1.031.018 1.237.235.957-.715 2.553-1.723 2.709-1.538.777.918.875 3.105.707 3.985-.055.287-2.627-.285-2.627-.596 0-1.287-.334-1.641-.662-1.677Zm-5.633-.402c.211-.333 1.918.081 2.856.498 0 0-.193.873.114 1.901.09.301-2.157 1.64-2.45 1.409-.339-.266-.963-3.108-.52-3.808Z"/>
+  <path fill="#FC3" fill-rule="evenodd" d="M108.817 124.102c.138-.601.782-1.733 3.08-1.706 1.162-.005 2.606 0 3.563-.109a12.83 12.83 0 0 0 3.181-.774c.995-.379 1.348-.295 1.472-.068.136.25-.024.681-.372 1.078-.664.757-1.858 1.344-3.966 1.519-2.108.174-3.505-.392-4.106.529-.26.397-.059 1.333 1.98 1.628 2.755.398 5.018-.479 5.297.05.28.53-1.331 1.607-4.09 1.63-2.76.022-4.484-.966-5.095-1.458-.776-.623-1.123-1.533-.944-2.319Z" clip-rule="evenodd"/>
+  <path fill="#14307E" d="M112.332 117.532c.153-.252.495-.447 1.053-.447.559 0 .822.222 1.004.47.037.051-.019.11-.077.085l-.042-.018c-.204-.089-.455-.199-.885-.205-.459-.007-.749.109-.932.208-.061.033-.158-.034-.121-.093Zm-6.29.322c.543-.227.969-.197 1.271-.126.063.015.107-.053.056-.094-.234-.189-.757-.423-1.44-.168-.609.227-.896.699-.898 1.009 0 .073.15.079.189.017.105-.167.28-.411.822-.638Z"/>
+  <path fill="#14307E" fill-rule="evenodd" d="M113.86 120.98a.867.867 0 0 1-.869-.865.868.868 0 0 1 1.737 0 .867.867 0 0 1-.868.865Zm.612-1.152a.225.225 0 0 0-.45 0 .224.224 0 0 0 .45 0Zm-6.366.885c0 .558-.453 1.01-1.013 1.01a1.011 1.011 0 0 1-1.012-1.01c0-.557.454-1.009 1.012-1.009.559 0 1.013.452 1.013 1.009Zm-.299-.334a.261.261 0 1 0-.523 0 .261.261 0 0 0 .523 0Z" clip-rule="evenodd"/>
+  <path fill="#fff" fill-rule="evenodd" d="M111 135.5c6.904 0 12.5-5.596 12.5-12.5s-5.596-12.5-12.5-12.5-12.5 5.596-12.5 12.5 5.596 12.5 12.5 12.5Zm0 1.5c7.732 0 14-6.268 14-14s-6.268-14-14-14-14 6.268-14 14 6.268 14 14 14Z" clip-rule="evenodd"/>
+  <path fill="#fff" d="M177.857 51H160a3.584 3.584 0 0 0-3.571 3.577 3.585 3.585 0 0 1-3.572 3.577h-35.714a3.585 3.585 0 0 1-3.572-3.577A3.584 3.584 0 0 0 110 51H92.143C88.214 51 85 54.22 85 58.154V82h100V58.154c0-3.935-3.214-7.154-7.143-7.154Z"/>
+  <path fill="#CCC" d="m100.988 69.974-.479-.479a.58.58 0 0 0-.84 0l-2.758 2.756a.58.58 0 0 0 0 .84l2.758 2.756c.24.24.6.24.84 0l.479-.48a.579.579 0 0 0 0-.839l-1.978-1.797 1.978-1.798c.24-.24.3-.6.06-.839 0-.06-.06-.06-.06-.12Z"/>
+  <path fill="#6FBF5C" d="M165.678 55.892a1.766 1.766 0 0 0-1.798 1.798v1.199c0 1.018.779 1.797 1.798 1.797h7.794v-4.794h-7.794Z"/>
+  <path fill="#E6E6E6" d="M176.47 55.892h-2.997v4.794h2.997c1.02 0 1.799-.779 1.799-1.797V57.69a1.766 1.766 0 0 0-1.799-1.798Zm-82.736 0h10.792c1.019 0 1.798.78 1.798 1.798v1.199a1.766 1.766 0 0 1-1.798 1.797H93.734a1.766 1.766 0 0 1-1.798-1.797V57.69c0-1.019.779-1.798 1.798-1.798Z"/>
+  <path fill="#CCC" d="M112.919 70.873h13.19c1.019 0 1.798.78 1.798 1.798a1.766 1.766 0 0 1-1.798 1.798h-13.19a1.767 1.767 0 0 1-1.799-1.798c0-1.019.78-1.798 1.799-1.798Zm47.963 0h5.995c1.019 0 1.799.78 1.799 1.798 0 1.019-.78 1.798-1.799 1.798h-5.995a1.766 1.766 0 0 1-1.799-1.798c0-1.019.779-1.798 1.799-1.798Zm-26.379 0h17.986c1.019 0 1.798.78 1.798 1.798a1.766 1.766 0 0 1-1.798 1.798h-17.986a1.766 1.766 0 0 1-1.799-1.798c0-1.019.779-1.798 1.799-1.798Z"/>
+  <path fill="#678FFF" d="M227.392 129.239a.87.87 0 0 1-1.259 0l-5.036-5.034a.868.868 0 0 1 0-1.258l1.439-1.439a.87.87 0 0 1 1.259 0l2.938 2.937 8.333-8.33a.87.87 0 0 1 1.259 0l1.439 1.439c.36.359.36.898 0 1.258l-10.372 10.427Z"/>
+  <path fill="#000" d="M139.092 126.823c2.579 0 4.377-1.637 4.377-4.142 0-2.48-1.798-4.129-4.389-4.129h-3.262v8.271h3.274Zm-.012-1.55h-1.501v-5.171h1.513c1.686 0 2.579 1.128 2.579 2.579 0 1.414-.955 2.592-2.591 2.592Zm11.219 1.55v-5.989h-1.575v4.054c-.273.348-.756.682-1.364.682-.67 0-1.104-.272-1.104-1.103v-3.633h-1.574v4.253c0 1.165.62 1.885 1.934 1.885.98 0 1.699-.459 2.108-.906v.757h1.575Zm4.353.149c1.228 0 1.972-.546 2.369-1.092l-1.029-.967c-.286.409-.72.657-1.265.657-.955 0-1.625-.706-1.625-1.748s.67-1.736 1.625-1.736c.545 0 .979.223 1.265.645l1.029-.967c-.397-.546-1.141-1.079-2.369-1.079-1.835 0-3.174 1.302-3.174 3.137 0 1.848 1.339 3.15 3.174 3.15Zm9.251-.149-2.443-3.274 2.369-2.715h-1.935l-2.269 2.666v-4.948h-1.575v8.271h1.575v-1.538l.719-.769 1.587 2.307h1.972Zm4.106 0c2.579 0 4.377-1.637 4.377-4.142 0-2.48-1.798-4.129-4.389-4.129h-3.261v8.271h3.273Zm-.012-1.55h-1.501v-5.171h1.513c1.687 0 2.579 1.128 2.579 2.579 0 1.414-.954 2.592-2.591 2.592Zm11.219 1.55v-5.989h-1.575v4.054c-.273.348-.756.682-1.364.682-.669 0-1.103-.272-1.103-1.103v-3.633h-1.575v4.253c0 1.165.62 1.885 1.934 1.885.98 0 1.699-.459 2.108-.906v.757h1.575Zm4.354.149c1.227 0 1.971-.546 2.368-1.092l-1.029-.967a1.491 1.491 0 0 1-1.265.657c-.955 0-1.624-.706-1.624-1.748s.669-1.736 1.624-1.736c.546 0 .98.223 1.265.645l1.029-.967c-.397-.546-1.141-1.079-2.368-1.079-1.836 0-3.175 1.302-3.175 3.137 0 1.848 1.339 3.15 3.175 3.15Zm9.25-.149-2.443-3.274 2.369-2.715h-1.935l-2.269 2.666v-4.948h-1.575v8.271h1.575v-1.538l.719-.769 1.588 2.307h1.971Zm4.85.149c1.488 0 2.666-.608 3.51-1.55v-3.175h-3.944v1.538h2.183v.992c-.335.31-1.017.632-1.749.632-1.512 0-2.604-1.153-2.604-2.715 0-1.563 1.092-2.716 2.604-2.716.868 0 1.575.496 1.96 1.079l1.45-.794c-.62-.979-1.698-1.847-3.41-1.847-2.43 0-4.414 1.661-4.414 4.278 0 2.604 1.984 4.278 4.414 4.278Zm7.648 0c1.984 0 3.174-1.451 3.174-3.15 0-1.699-1.19-3.137-3.174-3.137-1.972 0-3.162 1.438-3.162 3.137s1.19 3.15 3.162 3.15Zm0-1.402c-.98 0-1.525-.806-1.525-1.748 0-.93.545-1.736 1.525-1.736.992 0 1.537.806 1.537 1.736 0 .942-.545 1.748-1.537 1.748Z"/>
+</svg>
diff --git a/DuckDuckGo/Onboarding.xcassets/OnboardingDefaultBrowserImage.imageset/illustration.pdf b/DuckDuckGo/Onboarding.xcassets/OnboardingDefaultBrowserImage.imageset/illustration.pdf
deleted file mode 100644
index ace8b4f06c..0000000000
Binary files a/DuckDuckGo/Onboarding.xcassets/OnboardingDefaultBrowserImage.imageset/illustration.pdf and /dev/null differ
diff --git a/DuckDuckGo/OnboardingButtonsView.swift b/DuckDuckGo/OnboardingButtonsView.swift
new file mode 100644
index 0000000000..60c71cde0e
--- /dev/null
+++ b/DuckDuckGo/OnboardingButtonsView.swift
@@ -0,0 +1,56 @@
+//
+//  OnboardingButtonsView.swift
+//  DuckDuckGo
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+import DuckUI
+
+struct OnboardingActions: View {
+
+    @ObservedObject var viewModel: Model
+
+    var primaryAction: (() -> Void)?
+    var secondaryAction: (() -> Void)?
+
+    var body: some View {
+        VStack(spacing: 8) {
+            Button(action: {
+                self.primaryAction?()
+            }, label: {
+                Text(viewModel.primaryButtonTitle)
+            })
+            .buttonStyle(PrimaryButtonStyle())
+            .disabled(!viewModel.isContinueEnabled)
+
+            Button(action: {
+                self.secondaryAction?()
+            }, label: {
+                Text(viewModel.secondaryButtonTitle)
+            })
+            .buttonStyle(GhostButtonStyle())
+        }
+    }
+}
+
+extension OnboardingActions {
+    class Model: ObservableObject {
+        @Published var primaryButtonTitle = ""
+        @Published var secondaryButtonTitle = ""
+        @Published var isContinueEnabled = true
+    }
+}
diff --git a/DuckDuckGo/OnboardingDefaultBroswerViewController.swift b/DuckDuckGo/OnboardingDefaultBroswerViewController.swift
index beb730753b..c6401b3d29 100644
--- a/DuckDuckGo/OnboardingDefaultBroswerViewController.swift
+++ b/DuckDuckGo/OnboardingDefaultBroswerViewController.swift
@@ -21,7 +21,7 @@ import UIKit
 import Core
 
 class OnboardingDefaultBroswerViewController: OnboardingContentViewController {
-    
+
     override var header: String {
         return UserText.onboardingDefaultBrowserTitle
     }
diff --git a/DuckDuckGo/OnboardingViewController.swift b/DuckDuckGo/OnboardingViewController.swift
index 2f4bf65606..15b95b78ab 100644
--- a/DuckDuckGo/OnboardingViewController.swift
+++ b/DuckDuckGo/OnboardingViewController.swift
@@ -19,6 +19,7 @@
 
 import UIKit
 import Core
+import SwiftUI
 
 class OnboardingViewController: UIViewController, Onboarding {
         
@@ -32,8 +33,12 @@ class OnboardingViewController: UIViewController, Onboarding {
     @IBOutlet weak var subheaderContainer: UIView!
     @IBOutlet weak var contentWidth: NSLayoutConstraint!
     @IBOutlet weak var contentContainer: UIView!
-    @IBOutlet weak var skipButton: UIButton!
-    @IBOutlet weak var continueButton: UIButton!
+    @IBOutlet weak var buttonsContainer: UIView!
+
+    private let buttonsController = UIHostingController(rootView: OnboardingActions(viewModel: .init()))
+    private var buttonsModel: OnboardingActions.Model {
+        self.buttonsController.rootView.viewModel
+    }
 
     var contentController: OnboardingContentViewController?
     
@@ -43,9 +48,11 @@ class OnboardingViewController: UIViewController, Onboarding {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        setUpButtons()
         loadInitialContent()
         updateForSmallerScreens()
         setUpNavigationBar()
+        decorate()
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -76,7 +83,33 @@ class OnboardingViewController: UIViewController, Onboarding {
         navigationController?.navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
         navigationController?.navigationBar.shadowImage = UIImage()
     }
-    
+
+    private func setUpButtons() {
+        
+        buttonsController.rootView.primaryAction = { [weak self] in
+            self?.next(on: .continue)
+        }
+
+        buttonsController.rootView.secondaryAction = { [weak self] in
+            self?.next(on: .skip)
+        }
+
+        buttonsController.view.backgroundColor = .clear
+
+        addChild(buttonsController)
+        buttonsContainer.addSubview(buttonsController.view)
+        buttonsController.didMove(toParent: self)
+
+        let buttonsView = buttonsController.view!
+        buttonsView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            buttonsView.leadingAnchor.constraint(equalTo: buttonsContainer.leadingAnchor),
+            buttonsView.trailingAnchor.constraint(equalTo: buttonsContainer.trailingAnchor),
+            buttonsView.topAnchor.constraint(equalTo: buttonsContainer.topAnchor),
+            buttonsView.bottomAnchor.constraint(equalTo: buttonsContainer.bottomAnchor),
+        ])
+    }
+
     private func adjustHeight(label: UILabel, toMaxHeight maxHeight: CGFloat) -> CGFloat {
         guard var fontSize = label.attributedText?.font?.pointSize else { return label.bounds.height }
         
@@ -107,33 +140,33 @@ class OnboardingViewController: UIViewController, Onboarding {
 
     private func updateContent(_ controller: OnboardingContentViewController) {
         controller.delegate = self
-        continueButton.isEnabled = controller.canContinue
+        buttonsModel.isContinueEnabled = controller.canContinue
         contentController = controller
         header.setAttributedTextString(controller.header)
         subheader.setAttributedTextString(controller.subtitle ?? "")
         UIAccessibility.post(notification: UIAccessibility.Notification.screenChanged, argument: header)
     }
-    
-    @IBAction func next(sender: UIButton) {
-        
+
+    private func next(on button: ActionButton) {
         let navigationHandler = {
             if let name = self.controllerNames.first,
-                let oldController = self.contentController,
-                let newController = self.storyboard?.instantiateViewController(withIdentifier: name) as? OnboardingContentViewController {
-                
+               let oldController = self.contentController,
+               let newController = self.storyboard?.instantiateViewController(withIdentifier: name) as? OnboardingContentViewController {
+
                 self.transition(from: oldController, to: newController)
             } else {
                 self.done()
             }
         }
 
-        if sender == continueButton {
+        switch button {
+        case .continue:
             contentController?.onContinuePressed(navigationHandler: navigationHandler)
-        } else {
+        case .skip:
             contentController?.onSkipPressed(navigationHandler: navigationHandler)
         }
     }
-    
+
     private func transition(from oldController: OnboardingContentViewController, to newController: OnboardingContentViewController) {
         let frame = oldController.view.frame
         
@@ -170,15 +203,11 @@ class OnboardingViewController: UIViewController, Onboarding {
     
     private func prepareFor(nextScreen: OnboardingContentViewController) {
         controllerNames = [String](controllerNames.dropFirst())
-        
-        let continueButtonTitle = nextScreen.continueButtonTitle
-        continueButton.setTitle(continueButtonTitle, for: .normal)
-        continueButton.setTitle(continueButtonTitle, for: .disabled)
-        continueButton.isEnabled = nextScreen.canContinue
-        
-        let skipButtonTitle = nextScreen.skipButtonTitle
-        skipButton.setTitle(skipButtonTitle, for: .normal)
-        skipButton.setTitle(skipButtonTitle, for: .disabled)
+
+        buttonsModel.primaryButtonTitle = nextScreen.continueButtonTitle
+        buttonsModel.isContinueEnabled = nextScreen.canContinue
+
+        buttonsModel.secondaryButtonTitle = nextScreen.skipButtonTitle
     }
     
     func done() {
@@ -202,7 +231,24 @@ class OnboardingViewController: UIViewController, Onboarding {
 extension OnboardingViewController: OnboardingContentDelegate {
     
     func setContinueEnabled(_ enabled: Bool) {
-        continueButton.isEnabled = enabled
+        buttonsModel.isContinueEnabled = enabled
     }
     
 }
+
+extension OnboardingViewController {
+    private func decorate() {
+        let theme = ThemeManager.shared.currentTheme
+
+        view.backgroundColor = theme.onboardingBackgroundColor
+        header.textColor = theme.onboardingHeaderColor
+        subheader.textColor = theme.onboardingSubheaderColor
+    }
+}
+
+private extension OnboardingViewController {
+    enum ActionButton {
+        case `continue`
+        case skip
+    }
+}
diff --git a/DuckDuckGo/Theme+DesignSystem.swift b/DuckDuckGo/Theme+DesignSystem.swift
index 4d5ccd89bc..a98dfdbb0a 100644
--- a/DuckDuckGo/Theme+DesignSystem.swift
+++ b/DuckDuckGo/Theme+DesignSystem.swift
@@ -91,4 +91,7 @@ extension Theme {
     // No design system colour yet, so fall back to SDK colours
     var tableCellAccessoryTextColor: UIColor { .secondaryLabel }
 
+    var onboardingBackgroundColor: UIColor { UIColor(designSystemColor: .surface) }
+    var onboardingHeaderColor: UIColor { UIColor(designSystemColor: .textPrimary) }
+    var onboardingSubheaderColor: UIColor { UIColor(designSystemColor: .textSecondary) }
 }
diff --git a/DuckDuckGo/Theme.swift b/DuckDuckGo/Theme.swift
index 8ee5e0fea2..8533cf8c8f 100644
--- a/DuckDuckGo/Theme.swift
+++ b/DuckDuckGo/Theme.swift
@@ -132,4 +132,7 @@ protocol Theme {
 
     var privacyDashboardWebviewBackgroundColor: UIColor { get }
 
+    var onboardingBackgroundColor: UIColor { get }
+    var onboardingHeaderColor: UIColor { get }
+    var onboardingSubheaderColor: UIColor { get }
 }
diff --git a/LocalPackages/DuckUI/Sources/DuckUI/Button.swift b/LocalPackages/DuckUI/Sources/DuckUI/Button.swift
index d87ff913b5..720ebd4386 100644
--- a/LocalPackages/DuckUI/Sources/DuckUI/Button.swift
+++ b/LocalPackages/DuckUI/Sources/DuckUI/Button.swift
@@ -31,11 +31,13 @@ public struct PrimaryButtonStyle: ButtonStyle {
     }
     
     public func makeBody(configuration: Configuration) -> some View {
-        let isLight = colorScheme == .light
-        let standardBackgroundColor = isLight ? Color.blueBase : Color.blue30
-        let disabledBackgroundColor = isLight ? Color.black.opacity(0.06) : Color.white.opacity(0.18)
-        let standardForegroundColor = isLight ? Color.white : Color.black.opacity(0.84)
-        let disabledForegroundColor = isLight ? Color.black.opacity(0.36) : Color.white.opacity(0.36)
+        let isDark = colorScheme == .dark
+        let standardBackgroundColor = isDark ? Color.blue30 : Color.blueBase
+        let pressedBackgroundColor = isDark ? Color.blueBase : Color.blue70
+        let disabledBackgroundColor = isDark ? Color.white.opacity(0.18) : Color.black.opacity(0.06)
+        let standardForegroundColor = isDark ? Color.black.opacity(0.84) : Color.white
+        let pressedForegroundColor = isDark ? Color.black.opacity(0.84) : Color.white
+        let disabledForegroundColor = isDark ? Color.white.opacity(0.36) : Color.black.opacity(0.36)
         let backgroundColor = disabled ? disabledBackgroundColor : standardBackgroundColor
         let foregroundColor = disabled ? disabledForegroundColor : standardForegroundColor
 
@@ -44,10 +46,10 @@ public struct PrimaryButtonStyle: ButtonStyle {
             .multilineTextAlignment(.center)
             .lineLimit(nil)
             .font(Font(UIFont.boldAppFont(ofSize: compact ? Consts.fontSize - 1 : Consts.fontSize)))
-            .foregroundColor(configuration.isPressed ? standardForegroundColor.opacity(Consts.pressedOpacity) : foregroundColor)
+            .foregroundColor(configuration.isPressed ? pressedForegroundColor : foregroundColor)
             .padding()
             .frame(minWidth: 0, maxWidth: .infinity, maxHeight: compact ? Consts.height - 10 : Consts.height)
-            .background(configuration.isPressed ? standardBackgroundColor.opacity(Consts.pressedOpacity) : backgroundColor)
+            .background(configuration.isPressed ? pressedBackgroundColor : backgroundColor)
             .cornerRadius(Consts.cornerRadius)
     }
 }
@@ -90,25 +92,47 @@ public struct SecondaryButtonStyle: ButtonStyle {
 
 public struct GhostButtonStyle: ButtonStyle {
     @Environment(\.colorScheme) private var colorScheme
-
+    
     public init() {}
-    private var foregroundColor: Color {
-        colorScheme == .light ? .blueBase : .white
-    }
     
     public func makeBody(configuration: Configuration) -> some View {
         configuration.label
             .font(Font(UIFont.boldAppFont(ofSize: Consts.fontSize)))
-            .foregroundColor(configuration.isPressed ? foregroundColor.opacity(Consts.pressedOpacity) : foregroundColor.opacity(1))
+            .foregroundColor(foregroundColor(configuration.isPressed))
             .padding()
             .frame(minWidth: 0, maxWidth: .infinity, maxHeight: Consts.height)
-            .background(Color.clear)
+            .background(backgroundColor(configuration.isPressed))
             .cornerRadius(Consts.cornerRadius)
+            .contentShape(Rectangle()) // Makes whole button area tappable, when there's no background
+    }
+    
+    private func foregroundColor(_ isPressed: Bool) -> Color {
+        switch (colorScheme, isPressed) {
+        case (.dark, false):
+            return .blue30
+        case (.dark, true):
+            return .blue20
+        case (_, false):
+            return .blueBase
+        case (_, true):
+            return .blue70
+        }
+    }
+    
+    private func backgroundColor(_ isPressed: Bool) -> Color {
+        switch (colorScheme, isPressed) {
+        case (.light, true):
+            return .blueBase.opacity(0.2)
+        case (.dark, true):
+            return .blue30.opacity(0.2)
+        default:
+            return .clear
+        }
     }
 }
 
 private enum Consts {
-    static let cornerRadius: CGFloat = 12
+    static let cornerRadius: CGFloat = 8
     static let height: CGFloat = 50
     static let fontSize: CGFloat = 16
     static let pressedOpacity: CGFloat = 0.7