diff --git a/Core/Pixel.swift b/Core/Pixel.swift
index 5c24bee78b..229598fd36 100644
--- a/Core/Pixel.swift
+++ b/Core/Pixel.swift
@@ -214,13 +214,14 @@ extension Pixel {
     
     public static func fire(pixel: Pixel.Event,
                             error: Error?,
+                            includedParameters: [QueryParameters] = [.appVersion],
                             withAdditionalParameters params: [String: String] = [:],
                             onComplete: @escaping (Error?) -> Void = { _ in }) {
         var newParams = params
         if let error {
             newParams.appendErrorPixelParams(error: error)
         }
-        fire(pixel: pixel, withAdditionalParameters: newParams, includedParameters: [], onComplete: onComplete)
+        fire(pixel: pixel, withAdditionalParameters: newParams, includedParameters: includedParameters, onComplete: onComplete)
     }
 }
 
diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
index 7036fbbe60..0365fca0f8 100644
--- a/Core/PixelEvent.swift
+++ b/Core/PixelEvent.swift
@@ -74,6 +74,19 @@ extension Pixel {
         case browsingMenuFireproof
         case browsingMenuAutofill
         
+        case addressBarShare
+        case addressBarSettings
+
+        case shareSheetResultSuccess
+        case shareSheetResultFail
+        case shareSheetActivityCopy
+        case shareSheetActivityAddBookmark
+        case shareSheetActivityAddFavorite
+        case shareSheetActivityFindInPage
+        case shareSheetActivityPrint
+        case shareSheetActivityAddToReadingList
+        case shareSheetActivityOther
+
         case tabBarBackPressed
         case tabBarForwardPressed
         case bookmarksButtonPressed
@@ -570,7 +583,6 @@ extension Pixel.Event {
         case .browsingMenuRemoveFromFavorites: return "mb_df"
         case .browsingMenuAddToFavoritesAddFavoriteFlow: return "mb_aff"
         case .browsingMenuToggleBrowsingMode: return "mb_dm"
-        case .browsingMenuShare: return "mb_sh"
         case .browsingMenuCopy: return "mb_cp"
         case .browsingMenuPrint: return "mb_pr"
         case .browsingMenuSettings: return "mb_st"
@@ -580,7 +592,21 @@ extension Pixel.Event {
         case .browsingMenuReportBrokenSite: return "mb_rb"
         case .browsingMenuFireproof: return "mb_f"
         case .browsingMenuAutofill: return "m_nav_autofill_menu_item_pressed"
-            
+
+        case .browsingMenuShare: return "m_browsingmenu_share"
+
+        case .addressBarShare: return "m_addressbar_share"
+        case .addressBarSettings: return "m_addressbar_settings"
+        case .shareSheetResultSuccess: return "m_sharesheet_result_success"
+        case .shareSheetResultFail: return "m_sharesheet_result_fail"
+        case .shareSheetActivityCopy: return "m_sharesheet_activity_copy"
+        case .shareSheetActivityAddBookmark: return "m_sharesheet_activity_addbookmark"
+        case .shareSheetActivityAddFavorite: return "m_sharesheet_activity_addfavorite"
+        case .shareSheetActivityFindInPage: return "m_sharesheet_activity_findinpage"
+        case .shareSheetActivityPrint: return "m_sharesheet_activity_print"
+        case .shareSheetActivityAddToReadingList: return "m_sharesheet_activity_addtoreadinglist"
+        case .shareSheetActivityOther: return "m_sharesheet_activity_other"
+
         case .tabBarBackPressed: return "mt_bk"
         case .tabBarForwardPressed: return "mt_fw"
         case .bookmarksButtonPressed: return "mt_bm"
diff --git a/Core/UIViewControllerExtension.swift b/Core/UIViewControllerExtension.swift
index f37bca411b..4e91074719 100644
--- a/Core/UIViewControllerExtension.swift
+++ b/Core/UIViewControllerExtension.swift
@@ -50,11 +50,15 @@ extension UIViewController {
         present(controller: shareController, fromButtonItem: buttonItem)
     }
 
-    public func presentShareSheet(withItems activityItems: [Any], fromView sourceView: UIView, atPoint point: Point? = nil, completion: UIActivityViewController.CompletionWithItemsHandler? = nil) {
+    public func presentShareSheet(withItems activityItems: [Any], fromView sourceView: UIView, atPoint point: Point? = nil, overrideInterfaceStyle: UIUserInterfaceStyle? = nil, completion: UIActivityViewController.CompletionWithItemsHandler? = nil) {
         let activities = buildActivities()
         let shareController = UIActivityViewController(activityItems: activityItems, applicationActivities: activities)
         shareController.completionWithItemsHandler = completion
-        shareController.overrideUserInterfaceStyle()
+        if let overrideInterfaceStyle {
+            shareController.overrideUserInterfaceStyle = overrideInterfaceStyle
+        } else {
+            shareController.overrideUserInterfaceStyle()
+        }
         shareController.excludedActivityTypes = [.markupAsPDF]
         present(controller: shareController, fromView: sourceView, atPoint: point)
     }
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 3afe4e093f..e8323140fd 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -156,7 +156,7 @@
       },
       {
         "package": "TrackerRadarKit",
-        "repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit.git",
+        "repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit",
         "state": {
           "branch": null,
           "revision": "4684440d03304e7638a2c8086895367e90987463",
diff --git a/DuckDuckGo/Base.lproj/Settings.storyboard b/DuckDuckGo/Base.lproj/Settings.storyboard
index 1d4eb7fa61..63439e5402 100644
--- a/DuckDuckGo/Base.lproj/Settings.storyboard
+++ b/DuckDuckGo/Base.lproj/Settings.storyboard
@@ -104,7 +104,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="343.66666666666669" height="43.666667938232422"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Sync &amp; Back Up" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="oXN-ez-gct" userLabel="Sync">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Sync &amp; Backup" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="oXN-ez-gct" userLabel="Sync">
                                                     <rect key="frame" x="20" y="0.0" width="315.66666666666669" height="43.666667938232422"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <accessibility key="accessibilityConfiguration">
@@ -753,11 +753,11 @@
                                         <rect key="frame" x="20" y="1324.6666603088379" width="374" height="55"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nAl-CW-4R7" id="eQZ-vi-vuJ">
-                                            <rect key="frame" x="0.0" y="0.0" width="343.66666666666669" height="55"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="355.66666666666669" height="55"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" text="Email Protection" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="azf-Nc-kvW">
-                                                    <rect key="frame" x="20" y="7.3333333333333339" width="118" height="19.333333333333332"/>
+                                                    <rect key="frame" x="8" y="7.3333333333333339" width="118" height="19.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <bool key="isElement" value="NO"/>
@@ -767,7 +767,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Block email trackers and hide your address" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y6Y-wA-n6Z">
-                                                    <rect key="frame" x="20" y="29.333333333333332" width="260" height="15.666666666666666"/>
+                                                    <rect key="frame" x="8" y="29.333333333333332" width="260" height="15.666666666666666"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
@@ -781,11 +781,11 @@
                                         <rect key="frame" x="20" y="1379.6666603088379" width="374" height="55"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WpO-kq-QM6" id="jdM-R6-KZO">
-                                            <rect key="frame" x="0.0" y="0.0" width="343.66666666666669" height="55"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="355.66666666666669" height="55"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" text="DuckDuckGo Mac App" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Yz9-17-qnn">
-                                                    <rect key="frame" x="20" y="7.3333333333333339" width="164.33333333333334" height="19.333333333333332"/>
+                                                    <rect key="frame" x="8" y="7.3333333333333339" width="164.33333333333334" height="19.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <bool key="isElement" value="NO"/>
@@ -795,7 +795,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Browse privately with our app for Mac " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="P0F-ts-ekd">
-                                                    <rect key="frame" x="20" y="29.333333333333332" width="232" height="15.666666666666666"/>
+                                                    <rect key="frame" x="8" y="29.333333333333332" width="232" height="15.666666666666666"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
@@ -809,11 +809,11 @@
                                         <rect key="frame" x="20" y="1434.6666603088379" width="374" height="55"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ubu-Mf-iUH" id="Sm8-Lv-wFY">
-                                            <rect key="frame" x="0.0" y="0.0" width="343.66666666666669" height="55"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="355.66666666666669" height="55"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" text="DuckDuckGo Windows App" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RQ8-H1-Ez1">
-                                                    <rect key="frame" x="20" y="7.3333333333333339" width="199.33333333333334" height="19.333333333333332"/>
+                                                    <rect key="frame" x="8" y="7.3333333333333339" width="199.33333333333334" height="19.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <bool key="isElement" value="NO"/>
@@ -823,7 +823,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Browse privately with our app for Windows" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hoT-Nu-KXP">
-                                                    <rect key="frame" x="20" y="29.333333333333332" width="257.66666666666669" height="15.666666666666666"/>
+                                                    <rect key="frame" x="8" y="29.333333333333332" width="257.66666666666669" height="15.666666666666666"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
@@ -837,11 +837,11 @@
                                         <rect key="frame" x="20" y="1489.6666603088379" width="374" height="55"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7pF-cg-5QN" id="5Yk-5T-8YE">
-                                            <rect key="frame" x="0.0" y="0.0" width="343.66666666666669" height="55"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="355.66666666666669" height="55"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" text="Network Protection" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="qah-gb-udB" userLabel="Network Protection">
-                                                    <rect key="frame" x="20" y="7.3333333333333339" width="140" height="19.333333333333332"/>
+                                                    <rect key="frame" x="8" y="7.3333333333333339" width="140" height="19.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <bool key="isElement" value="NO"/>
@@ -851,7 +851,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="Hide your location and conceal your online activity" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Cyw-ir-cSK">
-                                                    <rect key="frame" x="20" y="29.333333333333332" width="304.66666666666669" height="15.666666666666666"/>
+                                                    <rect key="frame" x="8" y="29.333333333333332" width="304.66666666666669" height="15.666666666666666"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
@@ -869,11 +869,11 @@
                                         <rect key="frame" x="20" y="1611.9999923706055" width="374" height="43.666667938232422"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iy0-gV-9MR" id="Msh-jY-fMD">
-                                            <rect key="frame" x="0.0" y="0.0" width="343.66666666666669" height="43.666667938232422"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="355.66666666666669" height="43.666667938232422"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" text="About DuckDuckGo" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="oM7-1o-9oY">
-                                                    <rect key="frame" x="20" y="0.0" width="315.66666666666669" height="43.666667938232422"/>
+                                                    <rect key="frame" x="8" y="0.0" width="339.66666666666669" height="43.666667938232422"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <bool key="isElement" value="NO"/>
@@ -900,14 +900,14 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" text="Version" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2ky-s9-1aZ">
-                                                    <rect key="frame" x="20.000000000000004" y="12.999999999999998" width="54.333333333333336" height="19.333333333333332"/>
+                                                    <rect key="frame" x="8.0000000000000036" y="12.999999999999998" width="54.333333333333336" height="19.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" text="10.0.1 (Build 10005)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="d5n-vG-8kF">
-                                                    <rect key="frame" x="211.33333333333337" y="12.999999999999998" width="142.66666666666666" height="19.333333333333332"/>
+                                                    <rect key="frame" x="223.33333333333337" y="12.999999999999998" width="142.66666666666666" height="19.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.74509803919999995" green="0.76078431369999999" blue="0.79607843140000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -925,7 +925,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" text="Share Feedback" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="m23-t6-9cb">
-                                                    <rect key="frame" x="20" y="0.0" width="334" height="43.666667938232422"/>
+                                                    <rect key="frame" x="8" y="0.0" width="358" height="43.666667938232422"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
@@ -949,11 +949,11 @@
                                         <rect key="frame" x="20" y="1782.9999961853027" width="374" height="43.666667938232422"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FqT-nq-YvQ" id="DgP-Pj-wOt">
-                                            <rect key="frame" x="0.0" y="0.0" width="343.66666666666669" height="43.666667938232422"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="355.66666666666669" height="43.666667938232422"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" text="Debug Menu" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="A9G-5I-RSn">
-                                                    <rect key="frame" x="20" y="0.0" width="315.66666666666669" height="43.666667938232422"/>
+                                                    <rect key="frame" x="8" y="0.0" width="339.66666666666669" height="43.666667938232422"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <bool key="isElement" value="NO"/>
@@ -2346,7 +2346,7 @@
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="secondaryLabelColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
index f043f52def..fa2a0b7336 100644
--- a/DuckDuckGo/MainViewController.swift
+++ b/DuckDuckGo/MainViewController.swift
@@ -1463,7 +1463,7 @@ extension MainViewController: OmniBarDelegate {
     func onSharePressed() {
         hideSuggestionTray()
         guard let link = currentTab?.link else { return }
-        currentTab?.onShareAction(forLink: link, fromView: viewCoordinator.omniBar.shareButton, orginatedFromMenu: false)
+        currentTab?.onShareAction(forLink: link, fromView: viewCoordinator.omniBar.shareButton)
     }
     
     func onVoiceSearchPressed() {
diff --git a/DuckDuckGo/NetworkProtectionInviteView.swift b/DuckDuckGo/NetworkProtectionInviteView.swift
index 424b7ef79e..35b5d87af3 100644
--- a/DuckDuckGo/NetworkProtectionInviteView.swift
+++ b/DuckDuckGo/NetworkProtectionInviteView.swift
@@ -55,7 +55,7 @@ struct NetworkProtectionInviteView: View {
             )
             .frame(height: 44)
             .padding(EdgeInsets(top: 0, leading: 16, bottom: 0, trailing: 16))
-            .background(Color.textFieldBackground)
+            .background(Color(designSystemColor: .surface))
             .cornerRadius(10)
             .disabled(model.shouldDisableTextField)
             Button(UserText.inviteDialogContinueButton) {
@@ -102,27 +102,27 @@ private struct NetworkProtectionInviteMessageView<Content>: View where Content:
                         .scaledToFit()
                         .frame(height: 102.5)
                     Text(messageData.title)
-                        .font(.system(size: 22, weight: .semibold))
+                        .daxTitle2()
                         .multilineTextAlignment(.center)
-                        .foregroundColor(.textPrimary)
+                        .foregroundColor(.init(designSystemColor: .textPrimary))
                     Text(messageData.message)
-                        .font(.system(size: 16))
+                        .daxBodyRegular()
                         .multilineTextAlignment(.center)
-                        .foregroundColor(.textSecondary)
+                        .foregroundColor(.init(designSystemColor: .textSecondary))
                         .padding(.bottom, 16)
                     interactiveContent()
                     Spacer()
                     Text(UserText.netPInviteOnlyMessage)
-                        .foregroundColor(.textSecondary)
-                        .font(.system(size: 13))
+                        .foregroundColor(.init(designSystemColor: .textSecondary))
+                        .daxFootnoteRegular()
                         .multilineTextAlignment(.center)
                 }
                 .padding(24)
                 .frame(minHeight: proxy.size.height)
-                .background(Color.viewBackground)
+                .background(Color(designSystemColor: .background))
             }
         }
-        .background(Color.viewBackground)
+        .background(Color(designSystemColor: .background))
     }
 }
 
@@ -137,14 +137,9 @@ extension AnyTransition {
     static var slideFromRight: AnyTransition {
         AnyTransition.asymmetric(
             insertion: .move(edge: .trailing),
-            removal: .move(edge: .leading))}
-}
-
-private extension Color {
-    static let textPrimary = Color(designSystemColor: .textPrimary)
-    static let textSecondary = Color(designSystemColor: .textSecondary)
-    static let textFieldBackground = Color(designSystemColor: .surface)
-    static let viewBackground = Color(designSystemColor: .background)
+            removal: .move(edge: .leading)
+        )
+    }
 }
 
 import NetworkProtection
diff --git a/DuckDuckGo/NetworkProtectionStatusView.swift b/DuckDuckGo/NetworkProtectionStatusView.swift
index 93c335afdb..ab0698aa52 100644
--- a/DuckDuckGo/NetworkProtectionStatusView.swift
+++ b/DuckDuckGo/NetworkProtectionStatusView.swift
@@ -56,11 +56,11 @@ struct NetworkProtectionStatusView: View {
             HStack {
                 VStack(alignment: .leading, spacing: 4) {
                     Text(UserText.netPStatusViewTitle)
-                        .font(.system(size: 16))
-                        .foregroundColor(.textPrimary)
+                        .daxBodyRegular()
+                        .foregroundColor(.init(designSystemColor: .textPrimary))
                     Text(statusModel.statusMessage)
-                        .font(.system(size: 13))
-                        .foregroundColor(.textSecondary)
+                        .daxFootnoteRegular()
+                        .foregroundColor(.init(designSystemColor: .textSecondary))
                 }
 
                 Toggle("", isOn: Binding(
@@ -72,13 +72,13 @@ struct NetworkProtectionStatusView: View {
                     }
                 ))
                 .disabled(statusModel.shouldDisableToggle)
-                .toggleStyle(SwitchToggleStyle(tint: .controlColor))
+                .toggleStyle(SwitchToggleStyle(tint: .init(designSystemColor: .accent)))
             }
-            .listRowBackground(Color.cellBackground)
         } header: {
             header()
         }
         .increaseHeaderProminence()
+        .listRowBackground(Color(designSystemColor: .surface))
     }
 
     @ViewBuilder
@@ -92,19 +92,19 @@ struct NetworkProtectionStatusView: View {
                     .frame(height: 96)
                     .padding(8)
                 Text(statusModel.headerTitle)
-                    .font(.system(size: 17, weight: .semibold))
+                    .daxHeadline()
                     .multilineTextAlignment(.center)
-                    .foregroundColor(.textPrimary)
+                    .foregroundColor(.init(designSystemColor: .textPrimary))
                 Text(UserText.netPStatusHeaderMessage)
-                    .font(.system(size: 13))
+                    .daxFootnoteRegular()
                     .multilineTextAlignment(.center)
-                    .foregroundColor(.textSecondary)
+                    .foregroundColor(.init(designSystemColor: .textSecondary))
                     .padding(.bottom, 8)
             }
             .padding(.bottom, 4)
             // Pads beyond the default header inset
             .padding(.horizontal, -16)
-            .background(Color.viewBackground)
+            .background(Color(designSystemColor: .background))
             Spacer(minLength: 0)
         }
     }
@@ -129,33 +129,35 @@ struct NetworkProtectionStatusView: View {
                 )
             }
         } header: {
-            Text(UserText.netPStatusViewConnectionDetails).foregroundColor(.textSecondary)
+            Text(UserText.netPStatusViewConnectionDetails).foregroundColor(.init(designSystemColor: .textSecondary))
         }
+        .listRowBackground(Color(designSystemColor: .surface))
     }
 
     @ViewBuilder
     private func settings() -> some View {
         Section {
             NavigationLink(UserText.netPVPNSettingsTitle, destination: NetworkProtectionVPNSettingsView())
-                .font(.system(size: 16))
-                .foregroundColor(.textPrimary)
+                .daxBodyRegular()
+                .foregroundColor(.init(designSystemColor: .textPrimary))
             NavigationLink(UserText.netPVPNNotificationsTitle, destination: NetworkProtectionVPNNotificationsView())
-                .font(.system(size: 16))
-                .foregroundColor(.textPrimary)
+                .daxBodyRegular()
+                .foregroundColor(.init(designSystemColor: .textPrimary))
         } header: {
-            Text(UserText.netPStatusViewSettingsSectionTitle).foregroundColor(.textSecondary)
+            Text(UserText.netPStatusViewSettingsSectionTitle).foregroundColor(.init(designSystemColor: .textSecondary))
         } footer: {
             inviteOnlyFooter()
         }
+        .listRowBackground(Color(designSystemColor: .surface))
     }
 
     @ViewBuilder
     private func inviteOnlyFooter() -> some View {
         // Needs to be inlined like this for the markdown parsing to work
         Text("\(UserText.netPInviteOnlyMessage) [\(UserText.netPStatusViewShareFeedback)](https://form.asana.com/?k=_wNLt6YcT5ILpQjDuW0Mxw&d=137249556945)")
-            .foregroundColor(.textSecondary)
-            .accentColor(Color.controlColor)
-            .font(.system(size: 13))
+            .foregroundColor(.init(designSystemColor: .textSecondary))
+            .accentColor(.init(designSystemColor: .accent))
+            .daxFootnoteRegular()
             .padding(.top, 6)
     }
 }
@@ -169,15 +171,14 @@ private struct NetworkProtectionErrorView: View {
             HStack {
                 Image("Alert-Color-16")
                 Text(title)
-                    .font(.system(size: 16))
+                    .daxBodyBold()
                     .foregroundColor(.primary)
-                    .bold()
             }
             Text(message)
-                .font(.system(size: 16))
+                .daxBodyRegular()
                 .foregroundColor(.primary)
         }
-        .listRowBackground(Color.cellBackground)
+        .listRowBackground(Color(designSystemColor: .accent))
     }
 }
 
@@ -190,23 +191,15 @@ private struct NetworkProtectionServerItemView: View {
         HStack(spacing: 16) {
             Image(imageID)
             Text(title)
-                .font(.system(size: 16))
-                .foregroundColor(.textPrimary)
+                .daxBodyRegular()
+                .foregroundColor(.init(designSystemColor: .textPrimary))
             Spacer(minLength: 2)
             Text(value)
-                .font(.system(size: 16))
-                .foregroundColor(.textSecondary)
+                .daxBodyRegular()
+                .foregroundColor(.init(designSystemColor: .textSecondary))
         }
-        .listRowBackground(Color.cellBackground)
+        .listRowBackground(Color(designSystemColor: .surface))
     }
 }
 
-private extension Color {
-    static let textPrimary = Color(designSystemColor: .textPrimary)
-    static let textSecondary = Color(designSystemColor: .textSecondary)
-    static let cellBackground = Color(designSystemColor: .surface)
-    static let viewBackground = Color(designSystemColor: .background)
-    static let controlColor = Color(designSystemColor: .accent)
-}
-
 #endif
diff --git a/DuckDuckGo/NetworkProtectionVPNLocationView.swift b/DuckDuckGo/NetworkProtectionVPNLocationView.swift
index 31425e33d7..2708c23d49 100644
--- a/DuckDuckGo/NetworkProtectionVPNLocationView.swift
+++ b/DuckDuckGo/NetworkProtectionVPNLocationView.swift
@@ -52,19 +52,20 @@ struct NetworkProtectionVPNLocationView: View {
                     }
                 }, label: {
                     Text(UserText.netPPreferredLocationNearest)
-                        .foregroundStyle(Color.textPrimary)
-                        .font(.system(size: 16))
+                        .foregroundStyle(Color(designSystemColor: .textPrimary))
+                        .daxBodyRegular()
                 }
             )
         } header: {
             Text(UserText.netPVPNLocationRecommendedSectionTitle)
-                .foregroundStyle(Color.textPrimary)
+                .foregroundStyle(Color(designSystemColor: .textPrimary))
         } footer: {
             Text(UserText.netPVPNLocationRecommendedSectionFooter)
-                .foregroundStyle(Color.textSecondary)
-                .font(.system(size: 13))
+                .foregroundStyle(Color(designSystemColor: .textSecondary))
+                .daxFootnoteRegular()
                 .padding(.top, 6)
         }
+        .listRowBackground(Color(designSystemColor: .surface))
     }
 
     @ViewBuilder
@@ -89,9 +90,10 @@ struct NetworkProtectionVPNLocationView: View {
             }
         } header: {
             Text(UserText.netPVPNLocationAllCountriesSectionTitle)
-                .foregroundStyle(Color.textPrimary)
+                .foregroundStyle(Color(designSystemColor: .textPrimary))
         }
         .animation(.default, value: model.state.isLoading)
+        .listRowBackground(Color(designSystemColor: .surface))
     }
 }
 
@@ -115,12 +117,12 @@ private struct CountryItem: View {
                 Text(itemModel.emoji)
                 VStack(alignment: .leading, spacing: 4) {
                     Text(itemModel.title)
-                        .font(.system(size: 16))
-                        .foregroundStyle(Color.textPrimary)
+                        .daxBodyRegular()
+                        .foregroundStyle(Color(designSystemColor: .textPrimary))
                     if let subtitle = itemModel.subtitle {
                         Text(subtitle)
-                            .font(.system(size: 13))
-                            .foregroundStyle(Color.textSecondary)
+                            .daxFootnoteRegular()
+                            .foregroundStyle(Color(designSystemColor: .textSecondary))
                     }
                 }
                 if itemModel.shouldShowPicker {
@@ -134,7 +136,8 @@ private struct CountryItem: View {
                     } label: {
                         Image(systemName: "ellipsis.circle")
                             .resizable()
-                            .frame(width: 22, height: 22).tint(.textSecondary)
+                            .frame(width: 22, height: 22)
+                            .tint(.init(designSystemColor: .textSecondary))
                     }
                 }
             }
@@ -154,7 +157,7 @@ private struct ChecklistItem<Content>: View where Content: View {
             label: {
                 HStack(spacing: 12) {
                     Image(systemName: "checkmark")
-                        .tint(.controlColor)
+                        .tint(.init(designSystemColor: .accent))
                         .if(!isSelected) {
                             $0.hidden()
                         }
@@ -178,13 +181,13 @@ private struct MenuItem: View {
             action: action,
             label: {
                 HStack(spacing: 12) {
-                    Text(title)
+                    Text(title).daxBodyRegular()
                     Spacer()
                     Image(systemName: "checkmark")
                         .if(!isSelected) {
                             $0.hidden()
                         }
-                        .tint(.textPrimary)
+                        .tint(Color(designSystemColor: .textPrimary))
                 }
             }
         )
@@ -192,10 +195,4 @@ private struct MenuItem: View {
     }
 }
 
-private extension Color {
-    static let textPrimary = Color(designSystemColor: .textPrimary)
-    static let textSecondary = Color(designSystemColor: .textSecondary)
-    static let controlColor = Color(designSystemColor: .accent)
-}
-
 #endif
diff --git a/DuckDuckGo/NetworkProtectionVPNNotificationsView.swift b/DuckDuckGo/NetworkProtectionVPNNotificationsView.swift
index d5b0d22fd2..e492c73000 100644
--- a/DuckDuckGo/NetworkProtectionVPNNotificationsView.swift
+++ b/DuckDuckGo/NetworkProtectionVPNNotificationsView.swift
@@ -54,37 +54,35 @@ struct NetworkProtectionVPNNotificationsView: View {
             Button(UserText.netPTurnOnNotificationsButtonTitle) {
                 model.turnOnNotifications()
             }
-            .foregroundColor(.controlColor)
+            .foregroundColor(.init(designSystemColor: .accent))
         } footer: {
             Text(UserText.netPTurnOnNotificationsSectionFooter)
-                .foregroundColor(.textSecondary)
-                .font(.system(size: 13))
+                .foregroundColor(.init(designSystemColor: .textSecondary))
+                .daxFootnoteRegular()
                 .padding(.top, 6)
         }
+        .listRowBackground(Color(designSystemColor: .surface))
     }
 
     @ViewBuilder
     private var authorizedView: some View {
         Section {
-            Toggle(UserText.netPVPNAlertsToggleTitle, isOn: Binding(
-                get: { model.alertsEnabled },
-                set: model.didToggleAlerts(to:)
-            ))
-            .toggleStyle(SwitchToggleStyle(tint: .controlColor))
+            Toggle(
+                UserText.netPVPNAlertsToggleTitle,
+                isOn: Binding(
+                    get: { model.alertsEnabled },
+                    set: model.didToggleAlerts(to:)
+                )
+            )
+            .toggleStyle(SwitchToggleStyle(tint: .init(designSystemColor: .accent)))
         } footer: {
             Text(UserText.netPVPNAlertsToggleSectionFooter)
-                .foregroundColor(.textSecondary)
-                .font(.system(size: 13))
+                .foregroundColor(.init(designSystemColor: .textSecondary))
+                .daxFootnoteRegular()
                 .padding(.top, 6)
         }
+        .listRowBackground(Color(designSystemColor: .surface))
     }
 }
 
-private extension Color {
-    static let textPrimary = Color(designSystemColor: .textPrimary)
-    static let textSecondary = Color(designSystemColor: .textSecondary)
-    static let cellBackground = Color(designSystemColor: .surface)
-    static let controlColor = Color(designSystemColor: .accent)
-}
-
 #endif
diff --git a/DuckDuckGo/NetworkProtectionVPNSettingsView.swift b/DuckDuckGo/NetworkProtectionVPNSettingsView.swift
index 74a50a3c95..ee080da61b 100644
--- a/DuckDuckGo/NetworkProtectionVPNSettingsView.swift
+++ b/DuckDuckGo/NetworkProtectionVPNSettingsView.swift
@@ -41,14 +41,15 @@ struct NetworkProtectionVPNSettingsView: View {
                             VStack(alignment: .leading) {
                                 Text(UserText.netPPreferredLocationSettingTitle)
                                     .daxBodyRegular()
-                                    .foregroundColor(.textPrimary)
+                                    .foregroundColor(.init(designSystemColor: .textPrimary))
                                 Text(viewModel.preferredLocation.title)
                                     .daxFootnoteRegular()
-                                    .foregroundColor(.textSecondary)
+                                    .foregroundColor(.init(designSystemColor: .textSecondary))
                             }
                         }
                     }
                 }
+                .listRowBackground(Color(designSystemColor: .surface))
                 toggleSection(
                     text: UserText.netPExcludeLocalNetworksSettingTitle,
                     footerText: UserText.netPExcludeLocalNetworksSettingFooter
@@ -61,12 +62,13 @@ struct NetworkProtectionVPNSettingsView: View {
                 Section {
                     HStack(spacing: 16) {
                         Image("Info-Solid-24")
-                            .foregroundColor(.icon)
+                            .foregroundColor(.init(designSystemColor: .icons).opacity(0.3))
                         Text(UserText.netPSecureDNSSettingFooter)
                             .daxFootnoteRegular()
-                            .foregroundColor(.textSecondary)
+                            .foregroundColor(.init(designSystemColor: .textSecondary))
                     }
                 }
+                .listRowBackground(Color(designSystemColor: .surface))
             }
         }
         .applyInsetGroupedListStyle()
@@ -80,30 +82,22 @@ struct NetworkProtectionVPNSettingsView: View {
                 VStack(alignment: .leading, spacing: 4) {
                     Text(text)
                         .daxBodyRegular()
-                        .foregroundColor(.textPrimary)
+                        .foregroundColor(.init(designSystemColor: .textPrimary))
                         .layoutPriority(1)
                 }
 
                 toggle()
-                    .toggleStyle(SwitchToggleStyle(tint: .controlColor))
+                    .toggleStyle(SwitchToggleStyle(tint: .init(designSystemColor: .accent)))
             }
-            .listRowBackground(Color.cellBackground)
         } footer: {
             Text(footerText)
-                .foregroundColor(.textSecondary)
-                .accentColor(Color.controlColor)
+                .foregroundColor(.init(designSystemColor: .textSecondary))
+                .accentColor(Color(designSystemColor: .accent))
                 .daxFootnoteRegular()
                 .padding(.top, 6)
         }
+        .listRowBackground(Color(designSystemColor: .surface))
     }
 }
 
-private extension Color {
-    static let textPrimary = Color(designSystemColor: .textPrimary)
-    static let textSecondary = Color(designSystemColor: .textSecondary)
-    static let cellBackground = Color(designSystemColor: .surface)
-    static let controlColor = Color(designSystemColor: .accent)
-    static let icon = Color(designSystemColor: .icons).opacity(0.3)
-}
-
 #endif
diff --git a/DuckDuckGo/OmniBar.swift b/DuckDuckGo/OmniBar.swift
index bb8c6944ff..9498074044 100644
--- a/DuckDuckGo/OmniBar.swift
+++ b/DuckDuckGo/OmniBar.swift
@@ -446,6 +446,7 @@ class OmniBar: UIView {
     }
 
     @IBAction func onSettingsButtonPressed(_ sender: Any) {
+        Pixel.fire(pixel: .addressBarSettings)
         omniDelegate?.onSettingsPressed()
     }
     
@@ -474,6 +475,7 @@ class OmniBar: UIView {
     }
     
     @IBAction func onSharePressed(_ sender: Any) {
+        Pixel.fire(pixel: .addressBarShare)
         omniDelegate?.onSharePressed()
     }
     
diff --git a/DuckDuckGo/SettingsViewController.swift b/DuckDuckGo/SettingsViewController.swift
index 81834edc50..1ee3f0ef18 100644
--- a/DuckDuckGo/SettingsViewController.swift
+++ b/DuckDuckGo/SettingsViewController.swift
@@ -258,9 +258,9 @@ class SettingsViewController: UITableViewController {
     }
 
     private func configureSyncCell() {
-        syncCell.textLabel?.text = "Sync & Back Up"
+        syncCell.textLabel?.text = "Sync & Backup"
         if SyncBookmarksAdapter.isSyncBookmarksPaused || SyncCredentialsAdapter.isSyncCredentialsPaused {
-            syncCell.textLabel?.text = "⚠️ " + "Sync & Back Up"
+            syncCell.textLabel?.text = "⚠️ " + "Sync & Backup"
         }
         syncCell.isHidden = !shouldShowSyncCell
     }
diff --git a/DuckDuckGo/SyncAssets.xcassets/Arrow-Circle-Right-12.imageset/Arrow-Circle-Right-12.svg b/DuckDuckGo/SyncAssets.xcassets/Arrow-Circle-Right-12.imageset/Arrow-Circle-Right-12.svg
new file mode 100644
index 0000000000..898b40d43c
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Arrow-Circle-Right-12.imageset/Arrow-Circle-Right-12.svg
@@ -0,0 +1,11 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_9153_12928)">
+<path d="M5.81451 8.6983C5.56692 8.45778 5.56119 8.0621 5.8017 7.81451L6.95722 6.625H3.625C3.27982 6.625 3 6.34518 3 6C3 5.65482 3.27982 5.375 3.625 5.375H6.8358L5.8017 4.31049C5.56119 4.0629 5.56692 3.66721 5.81451 3.4267C6.0621 3.18618 6.45778 3.19192 6.6983 3.43951L8.8233 5.62701C9.0589 5.86954 9.0589 6.25546 8.8233 6.49799L6.6983 8.68549C6.45778 8.93308 6.0621 8.93881 5.81451 8.6983Z" fill="#7295F6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6 0C2.68629 0 0 2.68629 0 6C0 9.31371 2.68629 12 6 12C9.31371 12 12 9.31371 12 6C12 2.68629 9.31371 0 6 0ZM1.25 6C1.25 3.37665 3.37665 1.25 6 1.25C8.62335 1.25 10.75 3.37665 10.75 6C10.75 8.62335 8.62335 10.75 6 10.75C3.37665 10.75 1.25 8.62335 1.25 6Z" fill="#7295F6"/>
+</g>
+<defs>
+<clipPath id="clip0_9153_12928">
+<rect width="12" height="12" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/DuckDuckGo/SyncAssets.xcassets/Arrow-Circle-Right-12.imageset/Contents.json b/DuckDuckGo/SyncAssets.xcassets/Arrow-Circle-Right-12.imageset/Contents.json
new file mode 100644
index 0000000000..c8db4cda36
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Arrow-Circle-Right-12.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Arrow-Circle-Right-12.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/DuckDuckGo/SyncAssets.xcassets/Sync-128.imageset/Contents.json b/DuckDuckGo/SyncAssets.xcassets/Sync-128.imageset/Contents.json
new file mode 100644
index 0000000000..825d823565
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Sync-128.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Sync-128.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/SyncAssets.xcassets/Sync-128.imageset/Sync-128.svg b/DuckDuckGo/SyncAssets.xcassets/Sync-128.imageset/Sync-128.svg
new file mode 100644
index 0000000000..3cb06d383e
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Sync-128.imageset/Sync-128.svg
@@ -0,0 +1,9 @@
+<svg width="128" height="97" viewBox="0 0 128 97" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.2" d="M105.629 38.8665L107.171 38.4665C107.457 38.4094 107.743 38.1236 107.8 37.8379L108.2 36.2951C108.314 35.8951 108.657 35.6665 109 35.6665C109.4 35.6665 109.743 35.9522 109.8 36.2951L110.2 37.8379C110.257 38.1236 110.543 38.4094 110.829 38.4665L112.371 38.8665C112.771 38.9808 113 39.3236 113 39.6665C113 40.0665 112.714 40.4094 112.371 40.4665L110.829 40.8665C110.543 40.9236 110.257 41.2094 110.2 41.4951L109.8 43.0379C109.686 43.4379 109.343 43.6665 109 43.6665C108.6 43.6665 108.257 43.3808 108.2 43.0379L107.8 41.4951C107.743 41.2094 107.457 40.9236 107.171 40.8665L105.629 40.4665C105.229 40.3522 105 40.0094 105 39.6665C105 39.2665 105.286 38.9236 105.629 38.8665Z" fill="#888888"/>
+<path opacity="0.2" d="M15.9428 32.4665L18.2571 31.8665C18.6857 31.7808 19.1143 31.3522 19.2 30.9236L19.8 28.6094C19.9714 28.0094 20.4857 27.6665 21 27.6665C21.6 27.6665 22.1143 28.0951 22.2 28.6094L22.8 30.9236C22.8857 31.3522 23.3143 31.7808 23.7429 31.8665L26.0572 32.4665C26.6572 32.6379 27 33.1522 27 33.6665C27 34.2665 26.5714 34.7808 26.0572 34.8665L23.7429 35.4665C23.3143 35.5522 22.8857 35.9808 22.8 36.4094L22.2 38.7236C22.0286 39.3236 21.5143 39.6665 21 39.6665C20.4 39.6665 19.8857 39.2379 19.8 38.7236L19.2 36.4094C19.1143 35.9808 18.6857 35.5522 18.2571 35.4665L15.9428 34.8665C15.3428 34.6951 15 34.1808 15 33.6665C15 33.0665 15.4286 32.5522 15.9428 32.4665Z" fill="#888888"/>
+<path opacity="0.2" d="M0.628558 53.8665L2.17142 53.4665C2.45714 53.4094 2.74287 53.1236 2.80001 52.8379L3.19999 51.2951C3.31427 50.8951 3.65714 50.6665 4 50.6665C4.4 50.6665 4.74287 50.9522 4.80001 51.2951L5.19999 52.8379C5.25713 53.1236 5.54286 53.4094 5.82858 53.4665L7.37144 53.8665C7.77144 53.9808 8 54.3236 8 54.6665C8 55.0665 7.7143 55.4094 7.37144 55.4665L5.82858 55.8665C5.54286 55.9236 5.25713 56.2094 5.19999 56.4951L4.80001 58.0379C4.68573 58.4379 4.34286 58.6665 4 58.6665C3.6 58.6665 3.25713 58.3808 3.19999 58.0379L2.80001 56.4951C2.74287 56.2094 2.45714 55.9236 2.17142 55.8665L0.628558 55.4665C0.228558 55.3522 4.76837e-07 55.0094 4.76837e-07 54.6665C4.76837e-07 54.2665 0.285701 53.9236 0.628558 53.8665Z" fill="#888888"/>
+<path opacity="0.2" d="M126.5 52.6665C125.675 52.6665 125 51.9915 125 51.1665C125 50.3415 125.675 49.6665 126.5 49.6665C127.325 49.6665 128 50.3415 128 51.1665C128 51.9915 127.325 52.6665 126.5 52.6665Z" fill="#888888"/>
+<path opacity="0.2" d="M23 70.6665C21.9 70.6665 21 69.7665 21 68.6665C21 67.5665 21.9 66.6665 23 66.6665C24.1 66.6665 25 67.5665 25 68.6665C25 69.7665 24.1 70.6665 23 70.6665Z" fill="#888888"/>
+<path d="M79.6082 56.7804C74.4095 65.6597 63.2694 68.9187 54.1814 64.4303C53.4778 64.079 53.2433 63.1813 53.6342 62.4983L56.214 58.1074C56.8394 57.0536 55.8622 55.7657 54.67 56.0779L37.8817 60.4688C37.139 60.6639 36.7091 61.425 36.9045 62.147L41.2823 78.9689C41.595 80.1593 43.1781 80.3739 43.8035 79.3201L46.3247 75.0073C46.696 74.3633 47.5169 74.1487 48.1814 74.4999C62.859 82.3059 81.2108 77.193 89.7125 62.6934C93.1718 56.7999 94.4617 50.2429 93.8558 43.9201C93.7386 42.7492 92.6246 41.9491 91.491 42.2418L85.0219 43.9396C83.3998 44.369 82.3249 45.813 82.2858 47.4913C82.1881 50.6527 81.3476 53.8337 79.6278 56.7609L79.6082 56.7804Z" fill="#DE5833"/>
+<path d="M47.3124 37.4324C52.1212 29.2361 62.4257 26.2278 70.8321 30.371C71.4829 30.6952 71.6999 31.5239 71.3383 32.1544L68.952 36.2075C68.3735 37.1802 69.2774 38.3691 70.3802 38.0809L85.9094 34.0278C86.5964 33.8476 86.9941 33.1451 86.8133 32.4786L82.7638 16.9508C82.4745 15.8519 81.0102 15.6538 80.4317 16.6265L78.0996 20.6075C77.7561 21.202 76.9968 21.4002 76.3822 21.0759C62.8054 13.8704 45.8299 18.59 37.9659 31.9742C34.766 37.4144 33.5729 43.467 34.1333 49.3035C34.2418 50.3843 35.2722 51.1228 36.3208 50.8526L42.3047 49.2854C43.8052 48.8891 44.7994 47.5561 44.8356 46.0069C44.926 43.0887 45.7034 40.1525 47.2943 37.4504L47.3124 37.4324Z" fill="#3969EF"/>
+</svg>
diff --git a/DuckDuckGo/SyncAssets.xcassets/Sync-Recover-128.imageset/Contents.json b/DuckDuckGo/SyncAssets.xcassets/Sync-Recover-128.imageset/Contents.json
new file mode 100644
index 0000000000..19881bb976
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Sync-Recover-128.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Sync-Recover-128.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/DuckDuckGo/SyncAssets.xcassets/Sync-Recover-128.imageset/Sync-Recover-128.svg b/DuckDuckGo/SyncAssets.xcassets/Sync-Recover-128.imageset/Sync-Recover-128.svg
new file mode 100644
index 0000000000..b0ace196dd
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Sync-Recover-128.imageset/Sync-Recover-128.svg
@@ -0,0 +1,20 @@
+<svg width="128" height="96" viewBox="0 0 128 96" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.2" d="M105.629 38.2L107.171 37.8C107.457 37.7429 107.743 37.4571 107.8 37.1714L108.2 35.6286C108.314 35.2286 108.657 35 109 35C109.4 35 109.743 35.2857 109.8 35.6286L110.2 37.1714C110.257 37.4571 110.543 37.7429 110.829 37.8L112.371 38.2C112.771 38.3143 113 38.6571 113 39C113 39.4 112.714 39.7429 112.371 39.8L110.829 40.2C110.543 40.2571 110.257 40.5429 110.2 40.8286L109.8 42.3714C109.686 42.7714 109.343 43 109 43C108.6 43 108.257 42.7143 108.2 42.3714L107.8 40.8286C107.743 40.5429 107.457 40.2571 107.171 40.2L105.629 39.8C105.229 39.6857 105 39.3429 105 39C105 38.6 105.286 38.2571 105.629 38.2Z" fill="#888888"/>
+<path opacity="0.2" d="M15.9428 31.8L18.2571 31.2C18.6857 31.1143 19.1143 30.6857 19.2 30.2571L19.8 27.9429C19.9714 27.3429 20.4857 27 21 27C21.6 27 22.1143 27.4286 22.2 27.9429L22.8 30.2571C22.8857 30.6857 23.3143 31.1143 23.7429 31.2L26.0572 31.8C26.6572 31.9714 27 32.4857 27 33C27 33.6 26.5714 34.1143 26.0572 34.2L23.7429 34.8C23.3143 34.8857 22.8857 35.3143 22.8 35.7429L22.2 38.0571C22.0286 38.6571 21.5143 39 21 39C20.4 39 19.8857 38.5714 19.8 38.0571L19.2 35.7429C19.1143 35.3143 18.6857 34.8857 18.2571 34.8L15.9428 34.2C15.3428 34.0286 15 33.5143 15 33C15 32.4 15.4286 31.8857 15.9428 31.8Z" fill="#888888"/>
+<path opacity="0.2" d="M0.628557 53.2L2.17142 52.8C2.45714 52.7429 2.74287 52.4571 2.80001 52.1714L3.19999 50.6286C3.31427 50.2286 3.65714 50 4 50C4.4 50 4.74287 50.2857 4.80001 50.6286L5.19999 52.1714C5.25713 52.4571 5.54286 52.7429 5.82858 52.8L7.37144 53.2C7.77144 53.3143 8 53.6571 8 54C8 54.4 7.7143 54.7429 7.37144 54.8L5.82858 55.2C5.54286 55.2571 5.25713 55.5429 5.19999 55.8286L4.80001 57.3714C4.68573 57.7714 4.34286 58 4 58C3.6 58 3.25713 57.7143 3.19999 57.3714L2.80001 55.8286C2.74287 55.5429 2.45714 55.2571 2.17142 55.2L0.628557 54.8C0.228557 54.6857 0 54.3429 0 54C0 53.6 0.2857 53.2571 0.628557 53.2Z" fill="#888888"/>
+<path opacity="0.2" d="M126.5 52C125.675 52 125 51.325 125 50.5C125 49.675 125.675 49 126.5 49C127.325 49 128 49.675 128 50.5C128 51.325 127.325 52 126.5 52Z" fill="#888888"/>
+<path opacity="0.2" d="M23 70C21.9 70 21 69.1 21 68C21 66.9 21.9 66 23 66C24.1 66 25 66.9 25 68C25 69.1 24.1 70 23 70Z" fill="#888888"/>
+<path d="M70 76C70 78.2091 68.2091 80 66 80H47C42.5817 80 39 76.4183 39 72V24C39 19.5817 42.5817 16 47 16H84C88.4183 16 92 19.5817 92 24V36C92 38.2091 90.2091 40 88 40H78C73.5817 40 70 43.5817 70 48V76Z" fill="#C18010"/>
+<path d="M70 76C70 78.2091 68.2091 80 66 80H46C41.5817 80 38 76.4183 38 72V24C38 19.5817 41.5817 16 46 16H80C84.4183 16 88 19.5817 88 24V40H78C73.5817 40 70 43.5817 70 48V76Z" fill="#E2A412"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45 20C43.8954 20 43 20.8954 43 22V48C43 60.8559 41.9798 69.6309 41.3967 73.5965C41.2131 74.8452 42.1775 76 43.4396 76H70.0002V48C70.0002 43.5817 73.5819 40 78.0002 40H83V21.9924C83 20.8878 82.1046 20 81 20H45Z" fill="#FFDE7A"/>
+<path d="M51 20C51 18.8954 51.8954 18 53 18H73C74.1046 18 75 18.8954 75 20V24C75 25.1046 74.1046 26 73 26H53C51.8954 26 51 25.1046 51 24V20Z" fill="#999999"/>
+<path d="M51 20C51 18.8954 51.8954 18 53 18H73C74.1046 18 75 18.8954 75 20V22C75 23.1046 74.1046 24 73 24H53C51.8954 24 51 23.1046 51 22V20Z" fill="#D9D9D9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M70 59.5H68.75C66.4028 59.5 64.5 57.5972 64.5 55.25V50.75C64.5 48.4028 66.4028 46.5 68.75 46.5H70.1404C70.0482 46.9859 70 47.4873 70 48V49H68.75C67.7835 49 67 49.7835 67 50.75V55.25C67 56.2165 67.7835 57 68.75 57H70V59.5ZM70 55C69.4477 55 69 54.5523 69 54V52C69 51.4477 69.4477 51 70 51V55ZM73.1681 41.6235C73.3623 41.2889 73.7073 41.0526 74.1101 41.0077C73.7811 41.1912 73.4664 41.3971 73.1681 41.6235ZM75 40.5815V38.25C75 37.5596 75.5596 37 76.25 37C76.9404 37 77.5 37.5596 77.5 38.25V40.0154C76.6207 40.0696 75.7798 40.2659 75 40.5815ZM52.75 59.5C50.4028 59.5 48.5 57.5972 48.5 55.25V50.75C48.5 48.4028 50.4028 46.5 52.75 46.5H57.25C59.5972 46.5 61.5 48.4028 61.5 50.75V55.25C61.5 57.5972 59.5972 59.5 57.25 59.5H52.75ZM51 55.25C51 56.2165 51.7835 57 52.75 57H57.25C58.2165 57 59 56.2165 59 55.25V50.75C59 49.7835 58.2165 49 57.25 49H52.75C51.7835 49 51 49.7835 51 50.75V55.25ZM54 55C53.4477 55 53 54.5523 53 54V52C53 51.4477 53.4477 51 54 51H56C56.5523 51 57 51.4477 57 52V54C57 54.5523 56.5523 55 56 55H54ZM54 39C53.4477 39 53 38.5523 53 38V36C53 35.4477 53.4477 35 54 35H56C56.5523 35 57 35.4477 57 36V38C57 38.5523 56.5523 39 56 39H54ZM52.75 43.5C50.4028 43.5 48.5 41.5972 48.5 39.25V34.75C48.5 32.4028 50.4028 30.5 52.75 30.5H57.25C59.5972 30.5 61.5 32.4028 61.5 34.75V39.25C61.5 41.5972 59.5972 43.5 57.25 43.5H52.75ZM51 39.25C51 40.2165 51.7835 41 52.75 41H57.25C58.2165 41 59 40.2165 59 39.25V34.75C59 33.7835 58.2165 33 57.25 33H52.75C51.7835 33 51 33.7835 51 34.75V39.25ZM65.75 37C66.4404 37 67 36.4404 67 35.75V33.25H67.75C68.4404 33.25 69 32.6904 69 32C69 31.3096 68.4404 30.75 67.75 30.75H65.75C65.0596 30.75 64.5 31.3096 64.5 32V35.75C64.5 36.4404 65.0596 37 65.75 37ZM72.25 33.25C71.5596 33.25 71 32.6904 71 32C71 31.3096 71.5596 30.75 72.25 30.75H76.25C76.9404 30.75 77.5 31.3096 77.5 32V33.75C77.5 34.4404 76.9404 35 76.25 35C75.5596 35 75 34.4404 75 33.75V33.25H72.25ZM66 43.25C65.9578 43.25 65.9161 43.2479 65.875 43.2438C65.8339 43.2479 65.7922 43.25 65.75 43.25C65.0596 43.25 64.5 42.6904 64.5 42V40.25C64.5 39.5596 65.0596 39 65.75 39C66.4404 39 67 39.5596 67 40.25V40.75H69.75C70.4404 40.75 71 41.3096 71 42C71 42.6904 70.4404 43.25 69.75 43.25H66ZM69 37.75C69 38.4404 69.5596 39 70.25 39H71.75C72.4404 39 73 38.4404 73 37.75V36.25C73 35.5596 72.4404 35 71.75 35H70.25C69.5596 35 69 35.5596 69 36.25V37.75Z" fill="#F9BE1A"/>
+<path d="M78 44H86C88.2091 44 90 45.7909 90 48V71V84C90 86.2091 88.2091 88 86 88H79.9474H78C75.7909 88 74 86.2091 74 84V48C74 45.7909 75.7909 44 78 44Z" fill="#444444"/>
+<path d="M80.6668 44H99.3335C101.543 44 103.333 45.7909 103.333 48V84C103.333 86.2091 101.543 88 99.3335 88H80.6668C78.4577 88 76.6668 86.2091 76.6668 84V76.1538V48C76.6668 45.7909 78.4577 44 80.6668 44Z" fill="#666666"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.5718 85.3327H80.4279C79.8216 85.3327 79.3332 84.8054 79.3332 84.161V47.8377C79.3332 47.1933 79.8216 46.666 80.4279 46.666H99.5718C100.178 46.666 100.667 47.1933 100.667 47.8377V84.161C100.667 84.8054 100.178 85.3327 99.5718 85.3327ZM87.3331 47.9995C86.5967 47.9995 85.9998 48.5965 85.9998 49.3328C85.9998 50.0692 86.5967 50.6662 87.3331 50.6662H92.6664C93.4028 50.6662 93.9998 50.0692 93.9998 49.3328C93.9998 48.5965 93.4028 47.9995 92.6664 47.9995H87.3331Z" fill="#ADC2FC"/>
+<path d="M107.404 63.5244H111.006C111.667 63.5244 112.207 64.0647 112.207 64.7251C112.207 65.3855 111.667 65.9258 111.006 65.9258H107.404C106.744 65.9258 106.204 65.3855 106.204 64.7251C106.204 64.0647 106.744 63.5244 107.404 63.5244Z" fill="#CCCCCC"/>
+<path d="M108.605 52.7188C108.911 52.7188 109.217 52.8388 109.452 53.0729C109.92 53.5412 109.92 54.3036 109.452 54.7719L107.05 57.1733C106.582 57.6415 105.819 57.6415 105.351 57.1733C104.883 56.705 104.883 55.9426 105.351 55.4743L107.753 53.0729C107.987 52.8388 108.293 52.7188 108.599 52.7188H108.605Z" fill="#CCCCCC"/>
+<path d="M106.21 71.9302C105.904 71.9302 105.598 72.0502 105.363 72.2844C104.895 72.7526 104.895 73.5151 105.363 73.9833L107.765 76.3847C108.233 76.853 108.995 76.853 109.464 76.3847C109.932 75.9164 109.932 75.154 109.464 74.6857L107.062 72.2844C106.828 72.0502 106.522 71.9302 106.216 71.9302H106.21Z" fill="#CCCCCC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M82 63.4723V70.3335C82 71.8062 83.1939 73.0001 84.6667 73.0001H95.3333C96.8061 73.0001 98 71.8062 98 70.3335V63.4723C98 62.1069 96.8932 61.0001 95.5279 61.0001H95.118C94.4328 61.0001 93.8064 60.613 93.5 60.0001C93.1936 59.3873 92.5672 59.0001 91.882 59.0001H88.118C87.4328 59.0001 86.8064 59.3873 86.5 60.0001C86.1936 60.613 85.5672 61.0001 84.882 61.0001H84.4721C83.1068 61.0001 82 62.1069 82 63.4723ZM90 71.0001C92.2091 71.0001 94 69.2093 94 67.0001C94 64.791 92.2091 63.0001 90 63.0001C87.7909 63.0001 86 64.791 86 67.0001C86 69.2093 87.7909 71.0001 90 71.0001Z" fill="#8FABF9"/>
+</svg>
diff --git a/DuckDuckGo/SyncAssets.xcassets/Sync-Server-128.imageset/Contents.json b/DuckDuckGo/SyncAssets.xcassets/Sync-Server-128.imageset/Contents.json
new file mode 100644
index 0000000000..ca8f234f0d
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Sync-Server-128.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Sync-Server-128.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/DuckDuckGo/SyncAssets.xcassets/Sync-Server-128.imageset/Sync-Server-128.svg b/DuckDuckGo/SyncAssets.xcassets/Sync-Server-128.imageset/Sync-Server-128.svg
new file mode 100644
index 0000000000..c9a50a0589
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Sync-Server-128.imageset/Sync-Server-128.svg
@@ -0,0 +1,18 @@
+<svg width="128" height="96" viewBox="0 0 128 96" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.2" d="M105.629 38.2L107.171 37.8C107.457 37.7429 107.743 37.4571 107.8 37.1714L108.2 35.6286C108.314 35.2286 108.657 35 109 35C109.4 35 109.743 35.2857 109.8 35.6286L110.2 37.1714C110.257 37.4571 110.543 37.7429 110.829 37.8L112.371 38.2C112.771 38.3143 113 38.6571 113 39C113 39.4 112.714 39.7429 112.371 39.8L110.829 40.2C110.543 40.2571 110.257 40.5429 110.2 40.8286L109.8 42.3714C109.686 42.7714 109.343 43 109 43C108.6 43 108.257 42.7143 108.2 42.3714L107.8 40.8286C107.743 40.5429 107.457 40.2571 107.171 40.2L105.629 39.8C105.229 39.6857 105 39.3429 105 39C105 38.6 105.286 38.2571 105.629 38.2Z" fill="#888888"/>
+<path opacity="0.2" d="M15.9428 31.8L18.2571 31.2C18.6857 31.1143 19.1143 30.6857 19.2 30.2571L19.8 27.9429C19.9714 27.3429 20.4857 27 21 27C21.6 27 22.1143 27.4286 22.2 27.9429L22.8 30.2571C22.8857 30.6857 23.3143 31.1143 23.7429 31.2L26.0572 31.8C26.6572 31.9714 27 32.4857 27 33C27 33.6 26.5714 34.1143 26.0572 34.2L23.7429 34.8C23.3143 34.8857 22.8857 35.3143 22.8 35.7429L22.2 38.0571C22.0286 38.6571 21.5143 39 21 39C20.4 39 19.8857 38.5714 19.8 38.0571L19.2 35.7429C19.1143 35.3143 18.6857 34.8857 18.2571 34.8L15.9428 34.2C15.3428 34.0286 15 33.5143 15 33C15 32.4 15.4286 31.8857 15.9428 31.8Z" fill="#888888"/>
+<path opacity="0.2" d="M0.628557 53.2L2.17142 52.8C2.45714 52.7429 2.74287 52.4571 2.80001 52.1714L3.19999 50.6286C3.31427 50.2286 3.65714 50 4 50C4.4 50 4.74287 50.2857 4.80001 50.6286L5.19999 52.1714C5.25713 52.4571 5.54286 52.7429 5.82858 52.8L7.37144 53.2C7.77144 53.3143 8 53.6571 8 54C8 54.4 7.7143 54.7429 7.37144 54.8L5.82858 55.2C5.54286 55.2571 5.25713 55.5429 5.19999 55.8286L4.80001 57.3714C4.68573 57.7714 4.34286 58 4 58C3.6 58 3.25713 57.7143 3.19999 57.3714L2.80001 55.8286C2.74287 55.5429 2.45714 55.2571 2.17142 55.2L0.628557 54.8C0.228557 54.6857 0 54.3429 0 54C0 53.6 0.2857 53.2571 0.628557 53.2Z" fill="#888888"/>
+<path opacity="0.2" d="M126.5 52C125.675 52 125 51.325 125 50.5C125 49.675 125.675 49 126.5 49C127.325 49 128 49.675 128 50.5C128 51.325 127.325 52 126.5 52Z" fill="#888888"/>
+<path opacity="0.2" d="M23 70C21.9 70 21 69.1 21 68C21 66.9 21.9 66 23 66C24.1 66 25 66.9 25 68C25 69.1 24.1 70 23 70Z" fill="#888888"/>
+<path d="M70 76.1259C70 78.0475 68.6342 79.7249 66.7193 79.8861C65.8229 79.9615 64.9159 80 64 80C46.3269 80 32 65.6731 32 48C32 30.3269 46.3269 16 64 16C77.0944 16 88.3519 23.865 93.306 35.1287C94.3584 37.5212 92.4457 40 89.832 40H78C73.5817 40 70 43.5817 70 48V76.1259Z" fill="#557FF3"/>
+<path d="M70 76.1254C70 78.0471 68.6342 79.7245 66.7193 79.8856C65.8229 79.9611 64.9159 79.9995 64 79.9995C55.8512 79.9995 48.4138 76.9537 42.7642 71.9383C43.5042 71.979 44.2496 71.9997 44.9999 71.9997C54.4594 71.9997 63.152 68.7161 70 63.2265V76.1254Z" fill="#7295F6" fill-opacity="0.6" style="mix-blend-mode:multiply"/>
+<path d="M84.1997 40C84.7244 37.415 84.9999 34.7395 84.9999 31.9997C84.9999 28.9072 84.649 25.8967 83.9847 23.0059C87.9931 26.2151 91.2127 30.3686 93.3064 35.1291C94.3587 37.5217 92.4458 40 89.8321 40H84.1997Z" fill="#7295F6" fill-opacity="0.6" style="mix-blend-mode:multiply"/>
+<path d="M78 44H86C88.2091 44 90 45.7909 90 48V71V84C90 86.2091 88.2091 88 86 88H79.9474H78C75.7909 88 74 86.2091 74 84V48C74 45.7909 75.7909 44 78 44Z" fill="#444444"/>
+<path d="M80.6668 44H99.3335C101.543 44 103.333 45.7909 103.333 48V84C103.333 86.2091 101.543 88 99.3335 88H80.6668C78.4577 88 76.6668 86.2091 76.6668 84V76.1538V48C76.6668 45.7909 78.4577 44 80.6668 44Z" fill="#666666"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.5718 85.3327H80.4279C79.8216 85.3327 79.3332 84.8054 79.3332 84.161V47.8377C79.3332 47.1933 79.8216 46.666 80.4279 46.666H99.5718C100.178 46.666 100.667 47.1933 100.667 47.8377V84.161C100.667 84.8054 100.178 85.3327 99.5718 85.3327ZM87.3331 47.9995C86.5967 47.9995 85.9998 48.5965 85.9998 49.3328C85.9998 50.0692 86.5967 50.6662 87.3331 50.6662H92.6664C93.4028 50.6662 93.9998 50.0692 93.9998 49.3328C93.9998 48.5965 93.4028 47.9995 92.6664 47.9995H87.3331Z" fill="#FFCC33"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M98 65C98 69.4198 94.4198 73 90 73C85.5802 73 82 69.4198 82 65C82 60.5802 85.5802 57 90 57C94.4198 57 98 60.5802 98 65ZM96 65C96 67.2379 94.7748 69.1897 92.9586 70.2211C93.0322 69.7556 92.9724 68.7203 92.5967 68.2732C92.5189 68.1799 91.7221 68.6852 91.2439 69.0429C91.1429 68.934 90.964 68.8718 90.6258 68.9263C90.5941 68.9308 90.565 68.9367 90.5369 68.9423C90.517 68.9463 90.4975 68.9502 90.4781 68.9535C90.311 68.4092 90.2138 67.9311 90.2527 67.6201C89.8795 67.4219 89.6307 67.1925 89.5841 67.1031C89.5024 66.9554 89.6385 66.8854 89.7084 66.9243C89.7123 66.9282 89.7201 66.9321 89.7318 66.936C90.1244 67.1498 90.7541 67.383 91.6093 67.4258C91.7104 67.4297 91.8153 67.4335 91.9203 67.4335C93.3003 67.4219 94.105 66.8854 93.965 66.6172C93.899 66.4925 93.6125 66.5244 93.1838 66.572H93.1838C92.7035 66.6254 92.0448 66.6986 91.3178 66.5939C90.2993 66.4462 90.1982 65.9797 90.3265 65.7815C90.5224 65.4813 90.8897 65.4974 91.4153 65.5204C91.693 65.5326 92.0149 65.5467 92.379 65.5171C93.4325 65.4316 94.0311 65.1362 94.3615 64.7591C94.5364 64.5608 94.6142 64.347 94.5481 64.2188C94.4859 64.106 94.311 64.0633 93.8134 64.2538C93.4674 64.3859 92.9465 64.557 92.2507 64.6386C92.3712 63.865 92.0097 61.0623 90.0311 60.6386C90.0233 60.6347 90.0155 60.6308 90.0078 60.623C89.4579 59.9206 88.39 59.5679 87.3211 59.6298C88.1275 59.2268 89.0373 59 90 59C93.3137 59 96 61.6863 96 65ZM91.7337 69.9496C91.7337 70.0738 92.4851 70.296 92.8074 70.304C92.3144 70.5655 91.7806 70.7603 91.218 70.8763C91.18 70.7892 91.143 70.7033 91.1079 70.6211C90.8941 70.6872 90.5909 70.7183 90.3732 70.7261C90.208 70.7261 90.0739 70.7183 90.0039 70.6211C89.869 70.7361 89.6905 70.8634 89.5042 70.9798C89.2049 71.1668 88.8856 71.3259 88.6955 71.3613C88.6321 71.373 88.5831 71.3711 88.554 71.3519C88.4408 71.2792 88.3301 71.0376 88.2438 70.7389L88.2437 70.7389C88.0809 70.1751 88.0051 69.4077 88.1652 69.1867C88.2196 69.109 88.3207 69.0701 88.4451 69.0584C88.3285 69.5366 88.6006 70.7183 88.7522 70.8388C88.8999 70.9554 89.9582 70.3257 89.9116 70.1779C89.8183 69.867 89.8183 69.5871 89.8299 69.4122C89.8727 69.3538 90.0039 69.2644 90.0933 69.2256C90.0855 69.2683 90.0816 69.315 90.0855 69.3694C90.0855 69.5521 90.1088 69.867 90.1555 70.003C90.2177 70.1702 90.2838 70.279 90.5792 70.2751C90.8785 70.2712 91.3605 70.2052 91.4344 70.073C91.5083 69.9408 91.4111 69.4044 91.3489 69.2333L91.3139 69.1517C91.31 69.1439 91.3061 69.1362 91.3022 69.1323H91.4062C91.5617 69.1673 91.6949 69.2333 91.7337 69.9496ZM84 65C84 67.4627 85.4837 69.5789 87.606 70.5034C87.4127 69.7974 87.1366 68.756 86.7813 67.3325C85.9922 64.1721 85.4052 61.5949 88.3673 60.7902C88.3984 60.7824 88.4101 60.7474 88.3868 60.728C88.0447 60.417 87.4655 60.3626 86.898 60.4753C86.8707 60.4792 86.8513 60.4598 86.8513 60.4365C86.8513 60.4287 86.8513 60.4209 86.8591 60.4131C86.9951 60.2227 87.24 60.0749 87.4072 59.9855C87.302 59.8909 87.1652 59.8247 87.0424 59.7784C85.2257 60.8096 84 62.7617 84 65ZM97 65C97 68.866 93.866 72 90 72C86.134 72 83 68.866 83 65C83 61.134 86.134 58 90 58C93.866 58 97 61.134 97 65ZM91.656 62.3218L91.6409 62.3151C91.5387 62.2694 91.4119 62.2128 91.1934 62.2091C90.964 62.2052 90.8202 62.2635 90.7269 62.314C90.6958 62.3296 90.6492 62.2985 90.6647 62.2674C90.7425 62.143 90.9135 62.0458 91.1934 62.0458C91.4733 62.0458 91.6054 62.1585 91.6948 62.279C91.7143 62.3023 91.6832 62.3334 91.656 62.3218ZM91.8659 63.5579C91.8659 63.7951 91.6715 63.9894 91.4305 63.9894C91.1895 63.9894 90.9951 63.7951 90.9951 63.5579C90.9951 63.3208 91.1895 63.1264 91.4305 63.1264C91.6715 63.1264 91.8659 63.3169 91.8659 63.5579ZM88.0486 63.3519C88.3285 63.3519 88.5539 63.5774 88.5539 63.8573C88.5539 64.1371 88.3285 64.3626 88.0486 64.3626C87.7687 64.3626 87.5432 64.1371 87.5432 63.8573C87.5394 63.5774 87.7687 63.3519 88.0486 63.3519ZM87.5199 62.4267C87.2478 62.5395 87.1623 62.6639 87.1079 62.7455C87.0884 62.7766 87.0146 62.7727 87.0146 62.7377C87.0146 62.5822 87.1584 62.3451 87.4616 62.2324C87.8037 62.1041 88.0641 62.2207 88.1808 62.3179C88.208 62.3373 88.1846 62.3723 88.1535 62.3645C88.0058 62.3296 87.792 62.314 87.5199 62.4267ZM91.7376 63.4141C91.7376 63.4763 91.6871 63.5268 91.6249 63.5268C91.5627 63.5268 91.5122 63.4763 91.5122 63.4141C91.5122 63.3519 91.5627 63.3014 91.6249 63.3014C91.6871 63.3014 91.7376 63.3519 91.7376 63.4141ZM88.4062 63.6862C88.4062 63.76 88.3479 63.8184 88.2741 63.8184C88.2002 63.8184 88.1419 63.76 88.1419 63.6862C88.1419 63.6123 88.2002 63.554 88.2741 63.554C88.3479 63.554 88.4062 63.6123 88.4062 63.6862Z" fill="#E2A412"/>
+<path d="M108.605 52.7188C108.911 52.7188 109.217 52.8388 109.451 53.0729C109.919 53.5412 109.919 54.3036 109.451 54.7719L107.05 57.1733C106.581 57.6415 105.819 57.6415 105.351 57.1733C104.882 56.705 104.882 55.9426 105.351 55.4743L107.752 53.0729C107.986 52.8388 108.292 52.7188 108.599 52.7188H108.605Z" fill="#CCCCCC"/>
+<path d="M107.404 63.5244H111.006C111.666 63.5244 112.207 64.0647 112.207 64.7251C112.207 65.3855 111.666 65.9258 111.006 65.9258H107.404C106.743 65.9258 106.203 65.3855 106.203 64.7251C106.203 64.0647 106.743 63.5244 107.404 63.5244Z" fill="#CCCCCC"/>
+<path d="M105.363 72.2844C105.597 72.0502 105.903 71.9302 106.209 71.9302H106.215C106.522 71.9302 106.828 72.0502 107.062 72.2844L109.463 74.6857C109.931 75.154 109.931 75.9164 109.463 76.3847C108.995 76.853 108.233 76.853 107.764 76.3847L105.363 73.9833C104.895 73.5151 104.895 72.7526 105.363 72.2844Z" fill="#CCCCCC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M73.5951 41.3208C74.1972 40.9229 74.8563 40.6043 75.5575 40.3797C74.7076 39.6235 73.8311 38.8965 72.9298 38.2002C72.9757 37.974 72.9998 37.7398 72.9998 37.5C72.9998 36.1021 72.1802 34.8956 70.9954 34.3348C70.9852 33.5673 70.9573 32.8041 70.9122 32.0456C71.6043 32.0153 72.3003 32 72.9998 32C80.3853 32 87.373 33.7035 93.5913 36.7391C93.6299 36.2324 93.5495 35.7018 93.3259 35.1745C93.1825 34.847 93.0337 34.5223 92.8797 34.2006C86.804 31.5005 80.0771 30 72.9998 30C72.2467 30 71.4977 30.017 70.7529 30.0506C70.2639 25.1752 69.0602 20.5106 67.2482 16.1629C66.5086 16.0883 65.7615 16.0389 65.0079 16.0156C66.9564 20.4232 68.2471 25.1866 68.7558 30.1813C66.1416 30.4056 63.5861 30.8351 61.1053 31.4537C57.5394 30.035 53.7676 29.0229 49.8472 28.4747C49.6295 27.7631 49.1911 27.1479 48.6119 26.7089C50.4833 23.2415 52.7778 20.036 55.4262 17.1616C54.1437 17.5173 52.8936 17.951 51.6813 18.4571C49.8058 20.8069 48.1419 23.3331 46.7186 26.0068C46.6462 26.0023 46.5733 26 46.4998 26C45.1032 26 43.8976 26.8181 43.3361 28.0012C43.2241 28.0004 43.112 28 42.9998 28C41.6132 28 40.24 28.0576 38.8826 28.1706C38.3289 28.8709 37.8039 29.595 37.3093 30.341C39.1747 30.1159 41.0737 30 42.9998 30L43.0352 30.0001C43.1456 30.7713 43.5073 31.4614 44.0348 31.9847C42.9209 34.9925 42.0939 38.1394 41.5868 41.3923C38.0165 44.3777 34.8777 47.8621 32.2777 51.7382L32.208 51.6705C32.3324 52.7597 32.5114 53.8322 32.7424 54.8853C35.7406 57.5095 39.0616 59.774 42.638 61.6116C43.8267 66.087 45.6328 70.3108 47.9596 74.1864C47.5621 74.4502 47.1603 74.7082 46.7544 74.9602C47.383 75.3631 48.0265 75.7446 48.6841 76.1037C48.7978 76.0297 48.9112 75.9553 49.0243 75.8804C49.1617 76.0894 49.3007 76.2973 49.4412 76.5041C50.6142 77.1044 51.8292 77.6345 53.0805 78.0887C52.2296 77.0102 51.4249 75.8935 50.6695 74.7417C53.2209 72.8979 55.5877 70.8144 57.7369 68.5243C58.2546 68.8267 58.857 69 59.4998 69C60.917 69 62.1374 68.1578 62.6879 66.9465C63.454 66.9821 64.2248 67 64.9998 67C66.6878 67 68.3559 66.9147 70 66.7481V64.7372C68.357 64.9109 66.6888 65 64.9998 65C64.3156 65 63.6349 64.9854 62.9578 64.9565C62.8512 64.2723 62.5463 63.6538 62.1039 63.1615C66.6589 56.6868 69.6856 49.0593 70.6597 40.8033C71.1555 40.6292 71.6003 40.3466 71.9655 39.9841C72.5188 40.4177 73.0621 40.8634 73.5951 41.3208ZM46.4998 33C48.0866 33 49.4268 31.9441 49.8559 30.4965C52.6011 30.8977 55.2692 31.5363 57.8388 32.3906C52.8034 34.0274 48.1259 36.4574 43.9536 39.5332C44.4165 37.2698 45.042 35.0657 45.8175 32.9336C46.0382 32.9772 46.2663 33 46.4998 33ZM41.215 44.377C38.3906 46.9713 35.8846 49.9066 33.7621 53.1178C36.2868 55.3651 39.0554 57.3443 42.0232 59.0106C41.3523 55.7789 40.9998 52.4306 40.9998 49C40.9998 47.441 41.0726 45.8989 41.215 44.377ZM60.9639 33.5553C54.4693 35.2708 48.5254 38.3416 43.453 42.4469C43.1542 44.5884 42.9998 46.7762 42.9998 49C42.9998 52.8714 43.4679 56.6335 44.3505 60.2328C48.069 62.0543 52.0634 63.3992 56.2541 64.1878C56.7732 62.905 58.0308 62 59.4998 62C59.8089 62 60.1086 62.0401 60.3941 62.1153C64.7436 55.9679 67.6538 48.7299 68.634 40.8921C67.1198 40.5068 65.9998 39.1342 65.9998 37.5C65.9998 37.0232 66.0951 36.5687 66.2678 36.1545C64.5637 35.1817 62.7929 34.3124 60.9639 33.5553ZM45.0484 62.7676C48.5261 64.3199 52.218 65.4788 56.0673 66.1878C56.1287 66.4955 56.2303 66.7887 56.3666 67.0616C54.3116 69.2633 52.0476 71.2674 49.6061 73.0422C47.6981 69.8435 46.1593 66.399 45.0484 62.7676ZM67.5568 34.5884C66.4693 33.9574 65.3553 33.367 64.2169 32.8193C65.7581 32.5279 67.3259 32.3119 68.9163 32.175C68.9529 32.7925 68.9776 33.4132 68.9901 34.0369C68.4656 34.1134 67.9788 34.3063 67.5568 34.5884Z" fill="#ADC2FC"/>
+</svg>
diff --git a/DuckDuckGo/SyncSettingsViewController+PDFRendering.swift b/DuckDuckGo/SyncSettingsViewController+PDFRendering.swift
index fe164242f4..a3701ef4ac 100644
--- a/DuckDuckGo/SyncSettingsViewController+PDFRendering.swift
+++ b/DuckDuckGo/SyncSettingsViewController+PDFRendering.swift
@@ -31,10 +31,14 @@ extension SyncSettingsViewController {
 
         let pdf = RecoveryCodeItem(data: data)
         navigationController?.visibleViewController?.presentShareSheet(withItems: [pdf],
-                                                                       fromView: view) { [weak self] _, success, _, _ in
-            guard success else { return }
-            self?.navigationController?.visibleViewController?.dismiss(animated: true)
-        }
+                                                                       fromView: view)
+    }
+
+    func shareCode(_ code: String) {
+
+        navigationController?.visibleViewController?.presentShareSheet(withItems: [code],
+                                                                       fromView: view,
+                                                                       overrideInterfaceStyle: .dark)
     }
 
 }
diff --git a/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift b/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift
index 082b312ace..c8854639c5 100644
--- a/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift
+++ b/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift
@@ -52,10 +52,12 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
     func createAccountAndStartSyncing(optionsViewModel: SyncSettingsViewModel) {
         Task { @MainActor in
             do {
+                self.dismissPresentedViewController()
+                self.showPreparingSync()
                 try await syncService.createAccount(deviceName: deviceName, deviceType: deviceType)
                 self.rootView.model.syncEnabled(recoveryCode: recoveryCode)
                 self.refreshDevices()
-                self.showDeviceConnected([], optionsModel: optionsViewModel, isSingleSetUp: true, shouldShowOptions: false)
+                navigationController?.topViewController?.dismiss(animated: true, completion: showRecoveryPDF)
             } catch {
                 handleError(error)
             }
@@ -69,50 +71,49 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
     }
 
     func showSyncWithAnotherDevice() {
-        collectCode(showConnectMode: syncService.account == nil)
-    }
-
-    func showSyncWithAnotherDeviceEnterText() {
-        collectCode(showConnectMode: syncService.account == nil, showEnterTextCode: true)
+        collectCode(showConnectMode: true)
     }
 
     func showRecoverData() {
+        dismissPresentedViewController()
         collectCode(showConnectMode: false)
     }
 
-    func showDeviceConnected(_ devices: [SyncSettingsViewModel.Device], optionsModel: SyncSettingsViewModel, isSingleSetUp: Bool, shouldShowOptions: Bool) {
-        let model = SaveRecoveryKeyViewModel(key: recoveryCode) { [weak self] in
-            self?.shareRecoveryPDF()
-        }
+    func showDeviceConnected() {
         let controller = UIHostingController(
-            rootView: DeviceConnectedView(model,
-                                        optionsViewModel: optionsModel,
-                                          devices: devices,
-                                          isSingleSetUp: isSingleSetUp,
-                                          shouldShowOptions: shouldShowOptions))
+            rootView: DeviceConnectedView())
         navigationController?.present(controller, animated: true) { [weak self] in
             self?.rootView.model.syncEnabled(recoveryCode: self!.recoveryCode)
-            self?.refreshDevices()
         }
     }
 
+    func showPreparingSync() {
+        let controller = UIHostingController(rootView: PreparingToSyncView())
+        navigationController?.present(controller, animated: true)
+    }
+
+    @MainActor
     func showRecoveryPDF() {
         let model = SaveRecoveryKeyViewModel(key: recoveryCode) { [weak self] in
             self?.shareRecoveryPDF()
+        } onDismiss: {
+            self.showDeviceConnected()
         }
         let controller = UIHostingController(rootView: SaveRecoveryKeyView(model: model))
-        navigationController?.present(controller, animated: true)
+        navigationController?.present(controller, animated: true) { [weak self] in
+            self?.rootView.model.syncEnabled(recoveryCode: self!.recoveryCode)
+        }
     }
 
-    private func collectCode(showConnectMode: Bool, showEnterTextCode: Bool = false) {
-        let model = ScanOrPasteCodeViewModel(showConnectMode: showConnectMode)
+    private func collectCode(showConnectMode: Bool) {
+        let model = ScanOrPasteCodeViewModel(showConnectMode: showConnectMode, recoveryCode: recoveryCode.isEmpty ? nil : recoveryCode)
         model.delegate = self
 
         var controller: UIHostingController<AnyView>
-        if showEnterTextCode {
-            controller = UIHostingController(rootView: AnyView(PasteCodeView(model: model, isfirstScreen: true)))
+        if showConnectMode {
+            controller = UIHostingController(rootView: AnyView(ScanOrSeeCode(model: model)))
         } else {
-            controller = UIHostingController(rootView: AnyView(ScanOrPasteCodeView(model: model)))
+            controller = UIHostingController(rootView: AnyView(ScanOrEnterCodeToRecoverSyncedDataView(model: model)))
         }
 
         let navController = UIDevice.current.userInterfaceIdiom == .phone
diff --git a/DuckDuckGo/SyncSettingsViewController.swift b/DuckDuckGo/SyncSettingsViewController.swift
index 7e1f5558ea..f523ca0990 100644
--- a/DuckDuckGo/SyncSettingsViewController.swift
+++ b/DuckDuckGo/SyncSettingsViewController.swift
@@ -34,7 +34,6 @@ class SyncSettingsViewController: UIHostingController<SyncSettingsView> {
 
     var recoveryCode: String {
         guard let code = syncService.account?.recoveryCode else {
-            assertionFailure("No recovery code")
             return ""
         }
 
@@ -173,7 +172,10 @@ class SyncSettingsViewController: UIHostingController<SyncSettingsView> {
     }
 
     func dismissPresentedViewController() {
-        navigationController?.topViewController?.dismiss(animated: true)
+        guard let presentedViewController = navigationController?.presentedViewController,
+              !(presentedViewController is UIHostingController<SyncSettingsView>) else { return }
+        presentedViewController.dismiss(animated: true, completion: nil)
+        endConnectMode()
     }
 
     func refreshDevices(clearDevices: Bool = true) {
@@ -226,21 +228,21 @@ extension SyncSettingsViewController: ScanOrPasteCodeViewModelDelegate {
         }
     }
 
-    func loginAndShowDeviceConnected(recoveryKey: SyncCode.RecoveryKey, isActiveSyncDevice: Bool) async throws {
-        let knownDevices = Set(self.rootView.model.devices.map { $0.id })
+    func loginAndShowDeviceConnected(recoveryKey: SyncCode.RecoveryKey) async throws {
         let registeredDevices = try await syncService.login(recoveryKey, deviceName: deviceName, deviceType: deviceType)
         mapDevices(registeredDevices)
-        dismissPresentedViewController()
-        let devices = self.rootView.model.devices.filter { !knownDevices.contains($0.id) && !$0.isThisDevice }
-        let isSecondDevice = devices.count == 1
-        showDeviceConnected(devices, optionsModel: self.rootView.model, isSingleSetUp: false, shouldShowOptions: isActiveSyncDevice && isSecondDevice)
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            self.dismissVCAndShowRecoveryPDF()
+        }
     }
 
     func startPolling() {
         Task { @MainActor in
             do {
                 if let recoveryKey = try await connector?.pollForRecoveryKey() {
-                    try await loginAndShowDeviceConnected(recoveryKey: recoveryKey, isActiveSyncDevice: false)
+                    dismissPresentedViewController()
+                    showPreparingSync()
+                    try await loginAndShowDeviceConnected(recoveryKey: recoveryKey)
                 } else {
                     // Likely cancelled elsewhere
                     return
@@ -252,35 +254,36 @@ extension SyncSettingsViewController: ScanOrPasteCodeViewModelDelegate {
     }
 
     func syncCodeEntered(code: String) async -> Bool {
+        var shouldShowSyncEnabled = true
         do {
             guard let syncCode = try? SyncCode.decodeBase64String(code) else {
                 return false
             }
-
             if let recoveryKey = syncCode.recovery {
-                try await loginAndShowDeviceConnected(recoveryKey: recoveryKey, isActiveSyncDevice: true)
+                dismissPresentedViewController()
+                showPreparingSync()
+                try await loginAndShowDeviceConnected(recoveryKey: recoveryKey)
                 return true
             } else if let connectKey = syncCode.connect {
+                dismissPresentedViewController()
+                showPreparingSync()
                 if syncService.account == nil {
                     try await syncService.createAccount(deviceName: deviceName, deviceType: deviceType)
+                    self.dismissVCAndShowRecoveryPDF()
+                    shouldShowSyncEnabled = false
                     rootView.model.syncEnabled(recoveryCode: recoveryCode)
                 }
                 try await syncService.transmitRecoveryKey(connectKey)
-                self.dismissPresentedViewController()
-                self.rootView.model.isSyncingDevices = true
 
                 self.rootView.model.$devices
                     .removeDuplicates()
                     .dropFirst()
                     .prefix(1)
-                    .sink { [weak self] devices in
+                    .sink { [weak self] _ in
                         guard let self else { return }
-                        self.showDeviceConnected(
-                            devices.filter { !$0.isThisDevice },
-                            optionsModel: self.rootView.model,
-                            isSingleSetUp: false,
-                            shouldShowOptions: devices.count == 2)
-                        self.rootView.model.isSyncingDevices = false
+                        if shouldShowSyncEnabled {
+                            self.dismissVCAndShowRecoveryPDF()
+                        }
                     }.store(in: &cancellables)
 
                 return true
@@ -292,6 +295,10 @@ extension SyncSettingsViewController: ScanOrPasteCodeViewModelDelegate {
         return false
     }
 
+    func dismissVCAndShowRecoveryPDF() {
+        self.navigationController?.topViewController?.dismiss(animated: true, completion: self.showRecoveryPDF)
+    }
+
     func codeCollectionCancelled() {
         assert(navigationController?.visibleViewController is UIHostingController<AnyView>)
         dismissPresentedViewController()
diff --git a/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift b/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift
index 835f9eb89d..b946236540 100644
--- a/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift
+++ b/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift
@@ -42,7 +42,8 @@ extension TabViewController {
         entries.append(BrowsingMenuEntry.regular(name: UserText.actionShare, image: UIImage(named: "Share-24")!, action: { [weak self] in
             guard let self = self else { return }
             guard let menu = self.chromeDelegate?.omniBar.menuButton else { return }
-            self.onShareAction(forLink: self.link!, fromView: menu, orginatedFromMenu: true)
+            Pixel.fire(pixel: .browsingMenuShare)
+            self.onShareAction(forLink: self.link!, fromView: menu)
         }))
         
         entries.append(BrowsingMenuEntry.regular(name: UserText.actionCopy, image: UIImage(named: "Copy-24")!, action: { [weak self] in
@@ -302,10 +303,7 @@ extension TabViewController {
         }
     }
 
-    func onShareAction(forLink link: Link, fromView view: UIView, orginatedFromMenu: Bool) {
-        Pixel.fire(pixel: .browsingMenuShare,
-                   withAdditionalParameters: [PixelParameters.originatedFromMenu: orginatedFromMenu ? "1" : "0"])
-        
+    func onShareAction(forLink link: Link, fromView view: UIView) {
         shareLinkWithTemporaryDownload(temporaryDownloadForPreviewedFile, originalLink: link) { [weak self] link in
             guard let self = self else { return }
             var items: [Any] = [link, self.webView.viewPrintFormatter()]
@@ -313,10 +311,40 @@ extension TabViewController {
             if let webView = self.webView {
                 items.append(webView)
             }
-            self.presentShareSheet(withItems: items, fromView: view)
+
+            self.presentShareSheet(withItems: items, fromView: view) { [weak self] activityType, result, _, error in
+                if result {
+                    Pixel.fire(pixel: .shareSheetResultSuccess)
+                } else {
+                    Pixel.fire(pixel: .shareSheetResultFail, error: error)
+                }
+
+                if let activityType {
+                    self?.firePixelForActivityType(activityType)
+                }
+            }
         }
     }
     
+    private func firePixelForActivityType(_ activityType: UIActivity.ActivityType) {
+        switch activityType {
+        case .copyToPasteboard:
+            Pixel.fire(pixel: .shareSheetActivityCopy)
+        case .saveBookmarkInDuckDuckGo:
+            Pixel.fire(pixel: .shareSheetActivityAddBookmark)
+        case .saveFavoriteInDuckDuckGo:
+            Pixel.fire(pixel: .shareSheetActivityAddFavorite)
+        case .findInPage:
+            Pixel.fire(pixel: .shareSheetActivityFindInPage)
+        case .print:
+            Pixel.fire(pixel: .shareSheetActivityPrint)
+        case .addToReadingList:
+            Pixel.fire(pixel: .shareSheetActivityAddToReadingList)
+        default:
+            Pixel.fire(pixel: .shareSheetActivityOther)
+        }
+    }
+
     private func shareLinkWithTemporaryDownload(_ temporaryDownload: Download?,
                                                 originalLink: Link,
                                                 completion: @escaping(Link) -> Void) {
diff --git a/DuckDuckGo/UserText.swift b/DuckDuckGo/UserText.swift
index 5a03382223..e603b23c24 100644
--- a/DuckDuckGo/UserText.swift
+++ b/DuckDuckGo/UserText.swift
@@ -868,7 +868,7 @@ But if you *do* want a peek under the hood, you can find more information about
     }
     public static let syncRemoveDeviceConfirmAction = "Remove"
     public static let syncCodeCopied = "Recovery Code copied"
-    public static let syncTitle = "Sync & Back Up"
+    public static let syncTitle = "Sync & Backup"
 
     // MARK: Errors
 
diff --git a/DuckDuckGo/VPNWaitlistDebugViewController.swift b/DuckDuckGo/VPNWaitlistDebugViewController.swift
index 6b3fa717ef..a206f38631 100644
--- a/DuckDuckGo/VPNWaitlistDebugViewController.swift
+++ b/DuckDuckGo/VPNWaitlistDebugViewController.swift
@@ -37,6 +37,7 @@ final class VPNWaitlistDebugViewController: UITableViewController {
         WaitlistInformationRows.waitlistTimestamp: "Timestamp",
         WaitlistInformationRows.waitlistToken: "Token",
         WaitlistInformationRows.waitlistInviteCode: "Invite Code",
+        WaitlistInformationRows.termsAccepted: "T&C Accepted",
         WaitlistInformationRows.backgroundTask: "Earliest Refresh Date"
     ]
 
@@ -45,6 +46,7 @@ final class VPNWaitlistDebugViewController: UITableViewController {
         case waitlistTimestamp
         case waitlistToken
         case waitlistInviteCode
+        case termsAccepted
         case backgroundTask
 
     }
@@ -128,6 +130,13 @@ final class VPNWaitlistDebugViewController: UITableViewController {
             case .waitlistInviteCode:
                 cell.detailTextLabel?.text = storage.getWaitlistInviteCode() ?? "None"
 
+            case .termsAccepted:
+                if NetworkProtectionTermsAndConditionsUserDefaultsStore().networkProtectionWaitlistTermsAndConditionsAccepted {
+                    cell.detailTextLabel?.text = "Yes"
+                } else {
+                    cell.detailTextLabel?.text = "No"
+                }
+
             case .backgroundTask:
                 cell.detailTextLabel?.text = backgroundTaskExecutionDate ?? "None"
             }
@@ -192,6 +201,9 @@ final class VPNWaitlistDebugViewController: UITableViewController {
 
     private func clearDataAndReload() {
         storage.deleteWaitlistState()
+        var termsAndConditionsStore = NetworkProtectionTermsAndConditionsUserDefaultsStore()
+        termsAndConditionsStore.networkProtectionWaitlistTermsAndConditionsAccepted = false
+
         tableView.reloadData()
     }
 }
diff --git a/DuckDuckGoTests/NetworkProtectionVPNLocationViewModelTests.swift<_NSMainThread: 0x60000170c180>{number = 1, name = main}.plist b/DuckDuckGoTests/NetworkProtectionVPNLocationViewModelTests.swift<_NSMainThread: 0x60000170c180>{number = 1, name = main}.plist
new file mode 100644
index 0000000000..4c375cd9b4
Binary files /dev/null and b/DuckDuckGoTests/NetworkProtectionVPNLocationViewModelTests.swift<_NSMainThread: 0x60000170c180>{number = 1, name = main}.plist differ
diff --git a/DuckDuckGoTests/SyncManagementViewModelTests.swift b/DuckDuckGoTests/SyncManagementViewModelTests.swift
index 7964c0910c..5edc9b8ba4 100644
--- a/DuckDuckGoTests/SyncManagementViewModelTests.swift
+++ b/DuckDuckGoTests/SyncManagementViewModelTests.swift
@@ -42,6 +42,16 @@ class SyncManagementViewModelTests: XCTestCase, SyncManagementViewModelDelegate
         XCTAssertNotNil(caprturedOptionModel)
     }
 
+    func testWhenShowRecoveryPDFPressed_ShowRecoveryPDFIsShown() {
+        model.delegate?.showRecoveryPDF()
+
+        // You can either test one individual call was made x number of times or check for a whole number of calls
+        monitor.assert(#selector(showRecoveryPDF).description, calls: 1)
+        monitor.assertCalls([
+            #selector(showRecoveryPDF).description: 1
+        ])
+    }
+
     func testWhenScanQRCodePressed_ThenSyncWithAnotherDeviceViewIsShown() {
         model.scanQRCode()
 
@@ -52,23 +62,34 @@ class SyncManagementViewModelTests: XCTestCase, SyncManagementViewModelDelegate
         ])
     }
 
-    func testWhenSyncIsNotSetup_EnterTextCodePressed_ThenSyncWithAnotherDeviceEnterTextViewIsShown() {
-        model.showEnterTextView()
+    func testWhenCopyCodePressed_CodeIsCopied() {
+        model.copyCode()
 
         // You can either test one individual call was made x number of times or check for a whole number of calls
-        monitor.assert(#selector(showSyncWithAnotherDeviceEnterText).description, calls: 1)
+        monitor.assert(#selector(copyCode).description, calls: 1)
         monitor.assertCalls([
-            #selector(showSyncWithAnotherDeviceEnterText).description: 1
+            #selector(copyCode).description: 1
         ])
     }
 
-    func testWhenRecoverYourDataPressed_RecoverDataViewIsShown() {
-        model.showRecoverDataView()
+
+    func testWhenManageBookmarkPressed_BookmarkVCIsLaunched() {
+        model.manageBookmarks()
 
         // You can either test one individual call was made x number of times or check for a whole number of calls
-        monitor.assert(#selector(showRecoverData).description, calls: 1)
+        monitor.assert(#selector(launchBookmarksViewController).description, calls: 1)
         monitor.assertCalls([
-            #selector(showRecoverData).description: 1
+            #selector(launchBookmarksViewController).description: 1
+        ])
+    }
+
+    func testWhenManageLoginsPressed_LoginsVCIsLaunched() {
+        model.manageLogins()
+
+        // You can either test one individual call was made x number of times or check for a whole number of calls
+        monitor.assert(#selector(launchAutofillViewController).description, calls: 1)
+        monitor.assertCalls([
+            #selector(launchAutofillViewController).description: 1
         ])
     }
 
@@ -102,13 +123,23 @@ class SyncManagementViewModelTests: XCTestCase, SyncManagementViewModelDelegate
         ])
     }
 
+
+    func testWhenRecoverSyncDataPressed_RecoverDataViewShown() {
+        model.recoverSyncDataPressed()
+
+        // You can either test one individual call was made x number of times or check for a whole number of calls
+        monitor.assert(#selector(showRecoverData).description, calls: 1)
+        monitor.assertCalls([
+            #selector(showRecoverData).description: 1
+        ])
+    }
     // MARK: Delegate functions
 
     func showSyncWithAnotherDeviceEnterText() {
         monitor.incrementCalls(function: #function.cleaningFunctionName())
     }
 
-    func createAccountAndStartSyncing(optionsViewModel: SyncSettingsViewModel) {
+   func createAccountAndStartSyncing(optionsViewModel: SyncSettingsViewModel) {
         createAccountAndStartSyncingCalled = true
         caprturedOptionModel = optionsViewModel
     }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SaveRecoveryKeyViewModel.swift b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SaveRecoveryKeyViewModel.swift
index ced8831904..0e696b8885 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SaveRecoveryKeyViewModel.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SaveRecoveryKeyViewModel.swift
@@ -24,14 +24,20 @@ public class SaveRecoveryKeyViewModel: ObservableObject {
 
     let key: String
     let showRecoveryPDFAction: () -> Void
+    let onDismiss: () -> Void
 
-    public init(key: String, showRecoveryPDFAction: @escaping () -> Void) {
+    public init(key: String, showRecoveryPDFAction: @escaping () -> Void, onDismiss: @escaping () -> Void) {
         self.key = key
         self.showRecoveryPDFAction = showRecoveryPDFAction
+        self.onDismiss = onDismiss
     }
 
     func copyKey() {
         UIPasteboard.general.string = key
     }
 
+    func dismissed() {
+        onDismiss()
+    }
+
 }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ScanOrPasteCodeViewModel.swift b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ScanOrPasteCodeViewModel.swift
index 7c5d1f181a..1e71082564 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ScanOrPasteCodeViewModel.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ScanOrPasteCodeViewModel.swift
@@ -31,6 +31,7 @@ public protocol ScanOrPasteCodeViewModelDelegate: AnyObject {
 
     func codeCollectionCancelled()
     func gotoSettings()
+    func shareCode(_ code: String)
 
 }
 
@@ -62,12 +63,16 @@ public class ScanOrPasteCodeViewModel: ObservableObject {
 
     public weak var delegate: ScanOrPasteCodeViewModelDelegate?
 
-    var showQRCodeModel: ShowQRCodeViewModel?
+    var showQRCodeModel: ShowQRCodeViewModel
 
     let showConnectMode: Bool
+    let recoveryCode: String?
 
-    public init(showConnectMode: Bool) {
+    public init(showConnectMode: Bool, recoveryCode: String?) {
         self.showConnectMode = showConnectMode
+        self.recoveryCode = recoveryCode
+        showQRCodeModel = ShowQRCodeViewModel()
+        showQRCodeModel.code = recoveryCode
     }
 
     func codeScanned(_ code: String) async -> Bool {
@@ -92,6 +97,7 @@ public class ScanOrPasteCodeViewModel: ObservableObject {
         Task { @MainActor in
             let codeUsed = await delegate?.syncCodeEntered(code: string) == true
             if !codeUsed {
+                isValidating = false
                 invalidCode = true
             }
         }
@@ -103,12 +109,14 @@ public class ScanOrPasteCodeViewModel: ObservableObject {
     }
 
     func startConnectMode() -> ShowQRCodeViewModel {
-        let model = ShowQRCodeViewModel()
-        showQRCodeModel = model
         Task { @MainActor in
-            showQRCodeModel?.code = await delegate?.startConnectMode()
+            showQRCodeModel.code = await delegate?.startConnectMode()
         }
-        return model
+        return showQRCodeModel
+    }
+
+    func showShareCodeSheet() {
+        delegate?.shareCode(showQRCodeModel.code ?? "")
     }
 
     func endConnectMode() {
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SyncSettingsViewModel.swift b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SyncSettingsViewModel.swift
index 8f78f1ea59..6923a9322d 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SyncSettingsViewModel.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SyncSettingsViewModel.swift
@@ -24,7 +24,6 @@ public protocol SyncManagementViewModelDelegate: AnyObject {
 
     func showRecoverData()
     func showSyncWithAnotherDevice()
-    func showSyncWithAnotherDeviceEnterText()
     func showRecoveryPDF()
     func shareRecoveryPDF()
     func createAccountAndStartSyncing(optionsViewModel: SyncSettingsViewModel)
@@ -121,14 +120,6 @@ public class SyncSettingsViewModel: ObservableObject {
         delegate?.showSyncWithAnotherDevice()
     }
 
-    func showEnterTextView() {
-        delegate?.showSyncWithAnotherDeviceEnterText()
-    }
-
-    func showRecoverDataView() {
-        delegate?.showRecoverData()
-    }
-
     func createEditDeviceModel(_ device: Device) -> EditDeviceViewModel {
         return EditDeviceViewModel(device: device) { [weak self] newValue in
             self?.delegate?.updateDeviceName(newValue.name)
@@ -160,4 +151,7 @@ public class SyncSettingsViewModel: ObservableObject {
         delegate?.launchAutofillViewController()
     }
 
+    public func recoverSyncDataPressed() {
+        delegate?.showRecoverData()
+    }
 }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/DeviceConnectedView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/DeviceConnectedView.swift
index 2a04672468..aaf57001e9 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/DeviceConnectedView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/DeviceConnectedView.swift
@@ -22,128 +22,38 @@ import DuckUI
 
 public struct DeviceConnectedView: View {
 
-    @Environment(\.verticalSizeClass) var verticalSizeClass
+    @Environment(\.presentationMode) var presentation
 
-    var isCompact: Bool {
-        verticalSizeClass == .compact
-    }
-    let isSingleSetUp: Bool
-    let shouldShowOptions: Bool
-    @State var showRecoveryPDF = false
-
-    let saveRecoveryKeyViewModel: SaveRecoveryKeyViewModel
-    @ObservedObject var optionsViewModel: SyncSettingsViewModel
-    let devices: [SyncSettingsViewModel.Device]
-
-    public init(_ saveRecoveryKeyViewModel: SaveRecoveryKeyViewModel, optionsViewModel: SyncSettingsViewModel, devices: [SyncSettingsViewModel.Device], isSingleSetUp: Bool, shouldShowOptions: Bool) {
-        self.saveRecoveryKeyViewModel = saveRecoveryKeyViewModel
-        self.devices = devices
-        self.optionsViewModel = optionsViewModel
-        self.isSingleSetUp = isSingleSetUp
-        self.shouldShowOptions = shouldShowOptions
-    }
-
-    var title: String {
-        if isSingleSetUp {
-            return UserText.syngleDeviceConnectedTitle
-        }
-        return UserText.deviceSyncedTitle
-    }
-
-    var message: String {
-        if isSingleSetUp {
-            return UserText.firstDeviceSyncedMessage
-        }
-        if devices.count == 1 {
-            return UserText.deviceSyncedMessage
-        }
-        return UserText.multipleDevicesSyncedMessage
-    }
-
-    var devicesOnMessageText: String {
-        if devices.isEmpty {
-            return ""
-        }
-        if devices.count == 1 {
-            return devices[0].name
-        }
-        return "\(devices.count + 1) " + UserText.wordDevices
-    }
+    public init() {}
 
     @ViewBuilder
     func deviceSyncedView() -> some View {
         UnderflowContainer {
             VStack(spacing: 0) {
                 Image("Sync-Start-128")
-                    .padding(.bottom, 20)
+                    .padding(20)
 
-                Text(title)
+                Text(UserText.deviceSyncedSheetTitle)
                     .daxTitle1()
                     .padding(.bottom, 24)
-
-                Text("\(message) \(Text(devicesOnMessageText).bold())")
-                    .multilineTextAlignment(.center)
-                
-                if shouldShowOptions {
-                    options()
-                }
             }
             .padding(.horizontal, 20)
+            .padding(.top, 56)
         } foregroundContent: {
             Button {
-                withAnimation {
-                    self.showRecoveryPDF = true
-                }
+                presentation.wrappedValue.dismiss()
             } label: {
-                Text(UserText.nextButton)
+                Text(UserText.doneButton)
             }
             .buttonStyle(PrimaryButtonStyle())
             .frame(maxWidth: 360)
             .padding(.horizontal, 30)
         }
-        .padding(.top, isCompact ? 0 : 56)
         .padding(.bottom)
     }
 
-    @ViewBuilder
-    func options() -> some View {
-        VStack {
-            Spacer(minLength: 71)
-            Text(UserText.options.uppercased())
-                .daxFootnoteRegular()
-            Toggle(isOn: $optionsViewModel.isUnifiedFavoritesEnabled) {
-                HStack(spacing: 16) {
-                    Image("SyncAllDevices")
-                    VStack(alignment: .leading) {
-                        Text(UserText.unifiedFavoritesTitle)
-                            .foregroundColor(.primary)
-                            .daxBodyRegular()
-                        Text(UserText.unifiedFavoritesInstruction)
-                            .daxCaption()
-                            .foregroundColor(.secondary)
-                    }
-                }
-            }
-            .padding(16)
-            .background(
-                RoundedRectangle(cornerRadius: 10)
-                    .fill(.black.opacity(0.01))
-            )
-            .overlay(
-                RoundedRectangle(cornerRadius: 10)
-                    .stroke(.black.opacity(0.2), lineWidth: 0.2)
-            )
-        }
-    }
-
     public var body: some View {
-        if showRecoveryPDF {
-            SaveRecoveryKeyView(model: saveRecoveryKeyViewModel)
-                .transition(.move(edge: .trailing))
-        } else {
-            deviceSyncedView()
-                .transition(.move(edge: .leading))
-        }
+        deviceSyncedView()
+            .transition(.move(edge: .leading))
     }
-
 }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/CameraView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/CameraView.swift
new file mode 100644
index 0000000000..86096b1518
--- /dev/null
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/CameraView.swift
@@ -0,0 +1,154 @@
+//
+//  CameraView.swift
+//  DuckDuckGo
+//
+//  Copyright © 2023 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
+
+public struct CameraView: View {
+    
+    @ObservedObject var model: ScanOrPasteCodeViewModel
+
+    public var body: some View {
+        GeometryReader { g in
+            ZStack(alignment: .top) {
+                fullscreenCameraBackground()
+                
+                VStack(spacing: 0) {
+                    Rectangle() // Also acts as the blur for the camera
+                        .fill(.black)
+                        .frame(height: g.safeAreaInsets.top)
+                    
+                    ZStack {
+                        // Background in case fullscreen camera view doesn't work
+                        if !model.showCamera {
+                            Rectangle().fill(Color.black)
+                        }
+                        
+                        Group {
+                            cameraPermissionDenied()
+                            cameraUnavailable()
+                        }
+                        .padding(.horizontal, 0)
+
+                        if model.showCamera {
+                            VStack {
+                                Spacer()
+                                Text(UserText.cameraPointCameraIndication)
+                                    .padding(.vertical, 8)
+                                    .padding(.horizontal, 20)
+                                    .background(
+                                        RoundedRectangle(cornerRadius: 56)
+                                            .fill(.clear)
+                                            .background(BlurView(style: .light))
+                                            .cornerRadius(20)
+                                    )
+                                    .daxCaption()
+                            }
+                            .padding(.bottom, 20)
+                        }
+                    }
+                }
+                .ignoresSafeArea()
+            }
+        }
+    }
+
+    @ViewBuilder
+    func fullscreenCameraBackground() -> some View {
+        Group {
+            if model.showCamera {
+                QRCodeScannerView {
+                    return await model.codeScanned($0)
+                } onCameraUnavailable: {
+                    model.cameraUnavailable()
+                }
+            } else {
+                Rectangle()
+                    .fill(.black)
+            }
+        }
+        .ignoresSafeArea()
+    }
+
+    @ViewBuilder
+    func cameraPermissionDenied() -> some View {
+        if model.videoPermission == .denied {
+            VStack(spacing: 0) {
+
+                Image("SyncCameraPermission")
+                    .padding(.top, 40)
+                    .padding(.bottom, 20)
+
+                Text(UserText.cameraPermissionRequired)
+                    .daxTitle3()
+                    .lineSpacing(1.05)
+                    .padding(.bottom, 8)
+
+                Text(UserText.cameraPermissionInstructions)
+                    .lineLimit(nil)
+                    .multilineTextAlignment(.center)
+                    .daxBodyRegular()
+                    .lineSpacing(1.1)
+
+                Spacer()
+
+                Button {
+                    model.gotoSettings()
+                } label: {
+                    HStack {
+                        Image("SyncGotoButton")
+                        Text(UserText.cameraGoToSettingsButton)
+                    }
+                }
+                .buttonStyle(SyncLabelButtonStyle())
+                .padding(.bottom, 40)
+            }
+            .padding(.horizontal, 40)
+        }
+    }
+
+    @ViewBuilder
+    func cameraUnavailable() -> some View {
+        if model.videoPermission == .authorised && !model.showCamera {
+            VStack(spacing: 0) {
+
+                Image("SyncCameraUnavailable")
+                    .padding(.top, 40)
+                    .padding(.bottom, 20)
+
+                Text(UserText.cameraIsUnavailableTitle)
+                    .daxTitle3()
+                    .lineSpacing(1.05)
+
+            }
+            .padding(.horizontal, 40)
+        }
+    }
+
+    struct BlurView: UIViewRepresentable {
+        var style: UIBlurEffect.Style
+
+        func makeUIView(context: Context) -> UIVisualEffectView {
+            return UIVisualEffectView(effect: UIBlurEffect(style: style))
+        }
+
+        func updateUIView(_ uiView: UIVisualEffectView, context: Context) {
+            uiView.effect = UIBlurEffect(style: style)
+        }
+    }
+}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/ConnectModeView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/ConnectModeView.swift
deleted file mode 100644
index 7ccb491200..0000000000
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/ConnectModeView.swift
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-//  ConnectModeView.swift
-//  DuckDuckGo
-//
-//  Copyright © 2023 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
-
-/// We have to defer starting connect mode untl we're visible because otherwise SwiftUI might start it prematurely as a result of the NavigationLink.
-///  In iOS 16 we use a value binding on the NavigationLink, but this better anyway as we can show progress.
-struct ConnectModeView: View {
-
-    @ObservedObject var model: ScanOrPasteCodeViewModel
-    @State var qrCodeModel = ShowQRCodeViewModel()
-
-    var body: some View {
-        QRCodeCopierView(model: qrCodeModel)
-            .padding(.vertical, 20)
-            .frame(maxWidth: Constants.maxFullScreenWidth)
-            .onAppear {
-                self.qrCodeModel = model.startConnectMode()
-            }
-    }
-
-}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/EditDeviceView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/EditDeviceView.swift
index 02d3ac5202..e2e9e0fa8b 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/EditDeviceView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/EditDeviceView.swift
@@ -31,11 +31,11 @@ struct EditDeviceView: View {
                 Section {
                     TextField("", text: $model.name)
                 } header: {
-                    Text(UserText.editDeviceLabel)
+                    Text(UserText.editDeviceHeader)
                 }
             }
             .applyListStyle()
-            .navigationTitle(UserText.editDevice(model.name))
+            .navigationTitle(UserText.editDeviceTitle(model.name))
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
                 ToolbarItem(placement: .cancellationAction) {
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/QRCodeCopierView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/QRCodeCopierView.swift
deleted file mode 100644
index 292ae5dd18..0000000000
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/QRCodeCopierView.swift
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-//  QRCodeCopierView.swift
-//  DuckDuckGo
-//
-//  Copyright © 2023 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 DesignResourcesKit
-
-struct QRCodeCopierView: View {
-
-    @ObservedObject var model: ShowQRCodeViewModel
-
-    @ViewBuilder
-    func progressView() -> some View {
-        if model.code == nil {
-            ZStack {
-                SwiftUI.ProgressView()
-            }.frame(width: 200, height: 200)
-        }
-    }
-
-    @ViewBuilder
-    func qrCodeView() -> some View {
-        if let code = model.code {
-            VStack(spacing: 20) {
-                Spacer()
-
-                QRCodeView(string: code, size: 220)
-                    .padding()
-
-                Spacer()
-
-                Button {
-                    model.copy()
-                } label: {
-                    Label(UserText.copyCodeLabel, image: "SyncCopy")
-                }
-                .buttonStyle(SyncLabelButtonStyle())
-                .padding(.bottom, 20)
-            }
-        }
-    }
-
-    @ViewBuilder
-    func instructions() -> some View {
-
-        if model.code != nil {
-            Text(UserText.viewQRCodeInstructions)
-                .daxCaption()
-                .foregroundColor(.secondary)
-                .lineLimit(nil)
-                .multilineTextAlignment(.center)
-        }
-
-    }
-
-    @ViewBuilder
-    func qrCodeSection() -> some View {
-        ZStack {
-            VStack {
-                HStack { Spacer() }
-                Spacer()
-            }
-            RoundedRectangle(cornerRadius: 8).foregroundColor(.white.opacity(0.12))
-            progressView()
-            qrCodeView()
-        }
-        .frame(maxWidth: 350, maxHeight: 350)
-        .padding()
-    }
-
-    var body: some View {
-        ZStack(alignment: .top) {
-            VStack(spacing: 20) {
-                qrCodeSection()
-                instructions()
-                Spacer()
-            }
-            .padding(.horizontal, 20)
-            .frame(maxWidth: Constants.maxFullScreenWidth, alignment: .center)
-        }
-        .navigationTitle(UserText.viewQRCodeTitle)
-        .modifier(BackButtonModifier())
-    }
-
-}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/QRCodeScannerView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/QRCodeScannerView.swift
index 1a2bbb1476..48c6b8aec7 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/QRCodeScannerView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/QRCodeScannerView.swift
@@ -25,12 +25,10 @@ struct QRCodeScannerView: UIViewRepresentable {
     let scanningQueue: ScanningQueue
 
     let onCameraUnavailable: () -> Void
-    let onInvalidCodeScanned: () -> Void
 
-    init(onQRCodeScanned: @escaping (String) async -> Bool, onCameraUnavailable: @escaping () -> Void, onInvalidCodeScanned: @escaping () -> Void) {
+    init(onQRCodeScanned: @escaping (String) async -> Bool, onCameraUnavailable: @escaping () -> Void) {
         scanningQueue = ScanningQueue(onQRCodeScanned)
         self.onCameraUnavailable = onCameraUnavailable
-        self.onInvalidCodeScanned = onInvalidCodeScanned
     }
 
     func makeCoordinator() -> Coordinator {
@@ -112,7 +110,6 @@ struct QRCodeScannerView: UIViewRepresentable {
             Task { @MainActor in
                 let codeAccepted = await cameraView.scanningQueue.codeScanned(code)
                 if !codeAccepted {
-                    cameraView.onInvalidCodeScanned()
                     captureCodes = true
                 }
             }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/ShowCodeView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/ShowCodeView.swift
deleted file mode 100644
index ebd2f79b73..0000000000
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/ShowCodeView.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-//  ShowCodeView.swift
-//  DuckDuckGo
-//
-//  Copyright © 2023 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
-
-struct ShowCodeView: View {
-
-    let code: String
-    let copyCode: () -> Void
-
-    var body: some View {
-
-        List {
-            Text(code)
-                .monospaceSystemFont(ofSize: 16)
-
-            Button {
-                copyCode()
-            } label: {
-                Label("Copy Code", image: "SyncCopy")
-            }
-        }
-        .lineSpacing(1.47)
-        .navigationTitle("Code")
-        .applyListStyle()
-    }
-
-}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/UserText.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/UserText.swift
index 060af63f53..f9691a5ff9 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/UserText.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/UserText.swift
@@ -23,107 +23,142 @@ import Foundation
 // Localise these later, when feature is closer to exernal release
 struct UserText {
 
-    static let syncWithAnotherDeviceTitle = "Sync with Another Device"
-    static let syncWithAnotherDeviceMessage = "Securely sync bookmarks and Logins between your devices."
-
-    static let recoveryMessage = "If you lose access to your devices, you will need this code to recover your synced data."
-    static let recoveryWarning = "Anyone with access to this code can access your synced data, so please keep it in a safe place."
-
-    static let scanQRCode = "Scan QR Code"
-    static let enterTextCode = "Enter Text Code"
-    static let turnSyncOff = "Turn Off Sync & Back Up"
-
-    static let singleDeviceSetUpTitle = "Single-Device Setup"
-    static let singleDeviceSetUpInstruction = "Set up this device now, sync with other devices later."
-    static let turnSyncOn = "Start Sync & Back Up"
-    static let recoverYourData = "Recover Your Data"
-
-    static let options = "Options"
-    static let fetchFaviconsOptionTitle = "Fetch Bookmark Icons"
-    static let fetchFaviconsOptionCaption = "Automatically download icons for synced bookmarks."
-
-    static let unifiedFavoritesTitle = "Share Favorites"
-    static let unifiedFavoritesInstruction = "Use the same favorites on all devices. Leave off to keep mobile and desktop favorites separate."
-
-    static let syncSettingsFooter = "Your data is end-to-end encrypted, and DuckDuckGo does not have access to the decryption key."
-
-    static let connectDeviceInstructions = "Go to Settings > Sync & Back Up in the DuckDuckGo App on a different device and scan the QR code to sync."
-
-    static let recoveryModeInstructions = "Scan the QR code from your Recovery PDF or in the DuckDuckGo app under Settings > Sync & Back Up on a signed-in device."
-
-    static let validatingCode = "Validating code"
-    static let validatingCodeFailed = "Invalid code."
-
-    static let pasteCodeInstructions = "Copy the code from the\n Settings > Sync & Back Up page in the DuckDuckGo App on another synced device and paste it here to sync this device."
-
-    static let viewQRCodeInstructions = "Open the DuckDuckGo app on another device. Navigate to Settings > Sync & Back Up and scan this QR code."
-    static let viewQRCodeTitle = "Your Sync Code"
-
-    static let syngleDeviceConnectedTitle = "All Set!"
-    static let deviceSyncedTitle = "Device Synced!"
-    static let firstDeviceSyncedMessage = "You can sync this device’s bookmarks and Logins with additional devices at any time from the Sync & Back Up menu in Settings."
-    static let deviceSyncedMessage = "Your bookmarks and Logins are now syncing with "
-    static let multipleDevicesSyncedMessage = "Your bookmarks and Logins are now syncing on "
-    static let wordDevices = "devices"
-
-    static let saveRecoveryTitle = "Save Recovery Code?"
-    static let copyCode = "Copy Code"
-
-    static let cameraPermissionRequired = "Camera Permission is Required"
-    static let cameraPermissionInstructions = "Please go to your device's settings and grant permission for this app to access your camera."
-    static let cameraIsUnavailableTitle = "Camera is Unavailable"
-
-    static let goToSettingsButton = "Go to Settings"
-
-    static let syncTitle = "Sync & Back Up"
-
-    static let thisDevice = "This Device"
-    static let connectedDevicesTitle = "Synced Devices"
-
-    static let pasteLabel = "Paste"
-    static let copyCodeLabel = "Copy Code"
-
-    static let manuallyEnterCodeTitle = "Enter Text Code"
-
-    static let showQRCodeLabel = "Show QR Code"
-    static let showQRCodeSubLabel = "Display code to scan with another device"
-
-    static let settingsNewDeviceInstructions1 = "Go to Settings > Sync in the"
-    static let settingsNewDeviceInstructions2 = "DuckDuckGo App"
-    static let settingsNewDeviceInstructions3 = "on a different device and scan to connect instantly"
-    static let settingsScanQRCodeButton = "Scan QR Code"
-    static let settingsShowCodeButton = "Show Text Code"
-    static let settingsSaveRecoveryPDFButton = "Save Recovery PDF"
-    static let settingsRecoveryPDFWarning = "If you lose your device, you will need this recovery code to restore your synced data."
-    static let settingsDeleteAllButton = "Turn Off and Delete Server Data..."
-
-    static let removeButton = "Remove"
-    static let cancelButton = "Cancel"
-    static let doneButton = "Done"
-    static let nextButton = "Next"
-    static let notNowButton = "Not Now"
-    static let backButton = "Back"
+    // Sync Title
+    static let syncTitle = NSLocalizedString("sync.title", value: "Sync & Backup", comment: "Sync & Backup Title")
+
+    // Sync Set Up
+    // Sync With Another Device Card
+    static let syncWithAnotherDeviceTitle = NSLocalizedString("sync.with.another.device.title", value: "Begin Syncing", comment: "Title for syncing with another device")
+    static let syncWithAnotherDeviceMessage = NSLocalizedString("sync.with.another.device.message", value: "Securely sync bookmarks and passwords between your devices.", comment: "Message for syncing with another device")
+    static let syncWithAnotherDeviceButton = NSLocalizedString("sync.with.another.device.button", value: "Sync with Another Device", comment: "Button label for syncing with another device")
+    static let syncWithAnotherDeviceFooter = NSLocalizedString("sync.with.another.device.footer", value: "Your data is end-to-end encrypted, and DuckDuckGo does not have access to the encryption key.", comment: "Footer message for syncing with another device")
+    // Other Options
+    static let syncAndBackUpThisDeviceLink = NSLocalizedString("sync.and.backup.this.device.link", value: "Sync and Back Up This Device", comment: "Link label for syncing and backing up the device")
+    static let recoverSyncedDataLink = NSLocalizedString("recover.synced.data.link", value: "Recover Synced Data", comment: "Link label for recovering synced data")
+    static let otherOptionsSectionHeader = NSLocalizedString("other.options.section.header", value: "Other Options", comment: "Section header for other syncing options")
+
+    // Sync Enabled View
+    // Turn Sync Off
+    static let turnSyncOff = NSLocalizedString("turn.sync.off", value: "Turn Off Sync & Backup...", comment: "Turn Sync Off - Button")
+    static let turnSyncOffSectionHeader = NSLocalizedString("turn.sync.off.section.header", value: "Sync Enabled", comment: "Turn Sync Off - Section Header")
+    static let turnSyncOffSectionFooter = NSLocalizedString("turn.sync.off.section.footer", value: "Bookmarks and passwords are currently synced across your devices.", comment: "Turn Sync Off - Section Footer")
+    // Sync Paused Errors
+    static let syncLimitExceededTitle = NSLocalizedString("sync.limit.exceeded.title", value: "⚠️ Sync Paused", comment: "Sync Paused Errors - Title")
+    static let bookmarksLimitExceededDescription = NSLocalizedString("bookmarks.limit.exceeded.description", value: "Bookmark limit exceeded. Delete some to resume syncing.", comment: "Sync Paused Errors - Bookmarks Limit Exceeded Description")
+    static let credentialsLimitExceededDescription = NSLocalizedString("credentials.limit.exceeded.description", value: "Logins limit exceeded. Delete some to resume syncing.", comment: "Sync Paused Errors - Credentials Limit Exceeded Description")
+    static let bookmarksLimitExceededAction = NSLocalizedString("bookmarks.limit.exceeded.action", value: "Manage Bookmarks", comment: "Sync Paused Errors - Bookmarks Limit Exceeded Action")
+    static let credentialsLimitExceededAction = NSLocalizedString("credentials.limit.exceeded.action", value: "Manage Logins", comment: "Sync Paused Errors - Credentials Limit Exceeded Action")
+    // Synced Devices
+    static let syncedDevicesSectionHeader = NSLocalizedString("synced.devices.section.header", value: "Synced Devices", comment: "Synced Devices - Section Header")
+    static let syncedDevicesThisDeviceLabel = NSLocalizedString("synced.devices.this.device.label", value: "This Device", comment: "Synced Devices - This Device Label")
+    static let syncedDevicesSyncWithAnotherDeviceLabel = NSLocalizedString("synced.devices.sync.with.another.device.label", value: "Sync with Another Device", comment: "Synced Devices - Sync with Another Device Label")
+    // Options
+    static let optionsSectionHeader = NSLocalizedString("options.section.header", value: "Options", comment: "Options - Section Header")
+    static let unifiedFavoritesTitle = NSLocalizedString("unified.favorites.title", value: "Unify Favorites", comment: "Options - Unify Favorites Title")
+    static let unifiedFavoritesInstruction = NSLocalizedString("unified.favorites.instruction", value: "Use the same favorite bookmarks on all your devices. Leave off to keep mobile and desktop favorites separate.", comment: "Options - Unify Favorites Instruction")
+    static let fetchFaviconsOptionTitle = NSLocalizedString("fetch.favicons.option.title", value: "Auto-Download Icons", comment: "Automatically download icons for your synced bookmarks. Icon downloads are exposed to your network.")
+    static let fetchFaviconsOptionCaption = NSLocalizedString("fetch.favicons.option.caption", value: "Automatically download icons for synced bookmarks.", comment: "Options - Fetch Favicons Caption")
+
+    // Save RecoveryPDF
+    static let saveRecoveryPDFButton = NSLocalizedString("save.recovery.pdf.button", value: "Save Recovery PDF", comment: "Save RecoveryPDF - Button")
+    static let saveRecoveryPDFFooter = NSLocalizedString("save.recovery.pdf.footer", value: "If you lose your device, you will need this recovery code to restore your synced data.", comment: "Save RecoveryPDF - Footer")
+    // Delete Server Data
+    static let deleteServerData = NSLocalizedString("delete.server.data", value: "Turn Off and Delete Server Data...", comment: "Delete Server Data - Button")
+
+    // Connect With Server Sheet
+    static let connectWithServerSheetTitle = NSLocalizedString("connect.with.server.sheet.title", value: "Sync and Back Up This Device", comment: "Connect With Server Sheet - Title")
+    static let connectWithServerSheetDescriptionPart1 = NSLocalizedString("connect.with.server.sheet.description.part1", value: "This creates an encrypted backup of your bookmarks and passwords on DuckDuckGo’s secure server, which can be synced with your other devices.", comment: "Connect With Server Sheet - Description Part 1")
+    static let connectWithServerSheetDescriptionPart2 = NSLocalizedString("connect.with.server.sheet.description.part2", value: "The encryption key is only stored on your device, DuckDuckGo cannot access it.", comment: "Connect With Server Sheet - Description Part 2")
+    static let connectWithServerSheetButton = NSLocalizedString("connect.with.server.sheet.button", value: "Turn on Sync & Backup", comment: "Connect With Server Sheet - Button")
+    static let connectWithServerSheetFooter = NSLocalizedString("connect.with.server.sheet.footer", value: "You can sync with your other devices later.", comment: "Connect With Server Sheet - Footer")
+
+    // Preparing To Sync Sheet
+    static let preparingToSyncSheetTitle = NSLocalizedString("preparing.to.sync.sheet.title", value: "Setting Up Sync and Backup", comment: "Preparing To Sync Sheet - Title")
+    static let preparingToSyncSheetDescription = NSLocalizedString("preparing.to.sync.sheet.description", value: "Your bookmarks and passwords are being prepared to sync. This should only take a moment.", comment: "Preparing To Sync Sheet - Description")
+    static let preparingToSyncSheetFooter = NSLocalizedString("preparing.to.sync.sheet.footer", value: "Connecting…", comment: "Preparing To Sync Sheet - Footer")
+
+    // Save Recovery Code Sheet
+    static let saveRecoveryCodeSheetTitle = NSLocalizedString("save.recovery.code.sheet.title", value: "Save Recovery Code", comment: "Save Recovery Code Sheet - Title")
+    static let saveRecoveryCodeSheetDescription = NSLocalizedString("save.recovery.code.sheet.description", value: "If you lose access to your devices, you will need this code to recover your synced data.", comment: "Save Recovery Code Sheet - Description")
+    static let saveRecoveryCodeSheetFooter = NSLocalizedString("save.recovery.code.sheet.footer", value: "Anyone with access to this code can access your synced data, so please keep it in a safe place.", comment: "Save Recovery Code Sheet - Footer")
+    static let saveRecoveryCodeCopyCodeButton = NSLocalizedString("save.recovery.code.copy.code.button", value: "Copy Code", comment: "Save Recovery Code Sheet - Copy Code Button")
+    static let saveRecoveryCodeSaveAsPdfButton = NSLocalizedString("save.recovery.code.save.as.pdf.button", value: "Save as PDF", comment: "Save Recovery Code Sheet - Save as PDF Button")
+    static let saveRecoveryCodeSaveCodeCopiedToast = NSLocalizedString("save.recovery.code.code.copied.button", value: "Recovery code copied to clipboard", comment: "Save Recovery Code Sheet - Copy Code Toast")
+
+    // Device Synced Sheet
+    static let deviceSyncedSheetTitle = NSLocalizedString("device.synced.sheet.title", value: "Your Data is Synced!", comment: "Device SyncedSheet - Title")
+
+    // Recover Synced Data Sheet
+    static let recoverSyncedDataTitle = NSLocalizedString("recover.synced.data.sheet.title", value: "Recover Synced Data", comment: "Recover Synced Data Sheet - Title")
+    static let recoverSyncedDataDescription = NSLocalizedString("recover.synced.data.sheet.description", value: "To restore your synced data, you'll need the Recovery Code you saved when you first set up Sync. This code may have been saved as a PDF on the device you originally used to set up Sync.", comment: "Recover Synced Data Sheet - Description")
+    static let recoverSyncedDataButton = NSLocalizedString("recover.synced.data.sheet.button", value: "Get Started", comment: "Recover Synced Data Sheet - Button")
+
+    // Scan Or Enter Code To Recover Synced Data View
+    static let scanCodeToRecoverSyncedDataTitle = NSLocalizedString("scan.code.to.recover.synced.data.title", value: "Recover Synced Data", comment: "Scan Or Enter Code To Recover Synced Data View - Title")
+    static let scanCodeToRecoverSyncedDataExplanation = NSLocalizedString("scan.code.to.recover.synced.data.explanation", value: "Scan the QR code on your Recovery PDF, or another synced device, to recover your data.", comment: "Scan Or Enter Code To Recover Synced Data View - Explanation")
+    static let scanCodeToRecoverSyncedDataFooter = NSLocalizedString("scan.code.to.recover.synced.data.footer", value: "Can’t Scan?", comment: "Scan Or Enter Code To Recover Synced Data View - Footer")
+    static let scanCodeToRecoverSyncedDataEnterCodeLink = NSLocalizedString("scan.code.to.recover.synced.data.enter.code.link", value: "Enter Text Code Manually", comment: "Scan Or Enter Code To Recover Synced Data View - Enter Code Link")
+
+    // Camera View
+    static let cameraPointCameraIndication = NSLocalizedString("camera.point.camera.indication", value: "Point camera at QR code to sync", comment: "Camera View - Point Camera Indication")
+    static let cameraPermissionRequired = NSLocalizedString("camera.permission.required", value: "Camera Permission is Required", comment: "Camera View - Permission Required")
+    static let cameraPermissionInstructions = NSLocalizedString("camera.permission.instructions", value: "Please go to your device's settings and grant permission for this app to access your camera.", comment: "Camera View - Permission Instructions")
+    static let cameraIsUnavailableTitle = NSLocalizedString("camera.is.unavailable.title", value: "Camera is Unavailable", comment: "Camera View - Unavailable Title")
+    static let cameraGoToSettingsButton = NSLocalizedString("camera.go.to.settings.button", value: "Go to Settings", comment: "Camera View - Go to Settings Button")
+
+    // Manually Enter Code View
+    static let manuallyEnterCodeTitle = NSLocalizedString("manually.enter.code.title", value: "Manually Enter Code", comment: "Manually Enter Code View - Title")
+    static let manuallyEnterCodeValidatingCodeAction = NSLocalizedString("manually.enter.code.validating.code.action", value: "Validating code", comment: "Manually Enter Code View - Validating Code Action")
+    static let manuallyEnterCodeValidatingCodeFailedAction = NSLocalizedString("manually.enter.code.validating.code.failed.action", value: "Invalid code.", comment: "Manually Enter Code View - Validating Code Failed Action")
+    static func manuallyEnterCodeInstructionAttributed(syncMenuPath: String, menuItem: String) -> String {
+        let localized = NSLocalizedString("manually.enter.code.instruction.attributed", value: "Go to %@ and select %@ in the DuckDuckGo App on another synced device and paste the code here to sync this device.", comment: "Manually Enter Code View - Instruction with sync menu path and view text code menu item inserted")
+        return String(format: localized, syncMenuPath, menuItem)
+    }
+    static let manuallyEnterCodeInstruction = NSLocalizedString("manually.enter.code.instruction", value: "Go to Settings > Sync & Backup > Sync With Another Device and select Sync Menu Path in the DuckDuckGo App on another synced device and paste the code here to sync this device.", comment: "Manually Enter Code View - Instruction with sync menu path and view text code menu item inserted")
+    static let syncMenuPath = NSLocalizedString("sync.menu.path", value: "Settings > Sync & Backup > Sync With Another Device", comment: "Sync Menu Path")
+    static let viewTextCodeMenuItem = NSLocalizedString("view.text.code.menu.item", value: "View Text Code", comment: "View Text Code menu item")
+
+    // Scan or See Code View
+    static let scanOrSeeCodeTitle = NSLocalizedString("scan.or.see.code.title", value: "Scan QR Code", comment: "Scan or See Code View - Title")
+    static let scanOrSeeCodeInstruction = NSLocalizedString("scan.or.see.code.instruction", value: "Go to Settings › Sync & Backup in the DuckDuckGo Browser on another device and select ”Sync with Another Device.”", comment: "Scan or See Code View - Instruction")
+    static func scanOrSeeCodeInstructionAttributed(syncMenuPath: String) -> String {
+        let localized = NSLocalizedString("scan.or.see.code.instruction.attributed", value: "Go to %@ in the DuckDuckGo Browser on another device and select ”Sync with Another Device.”.", comment: "Scan or See Code View - Instruction with syncMenuPath")
+        return String(format: localized, syncMenuPath)
+    }
 
-    static let editDeviceLabel = "Device Name"
-    static func editDevice(_ name: String) -> String {
-        return "Edit \(name)"
+    static let scanOrSeeCodeInstructionPart3 = NSLocalizedString("scan.or.see.code.instruction.part3", value: "in the DuckDuckGo Browser on another device and select ”Sync with Another Device.”", comment: "Scan or See Code View - Instruction Part 3")
+    static let scanOrSeeCodeManuallyEnterCodeLink = NSLocalizedString("scan.or.see.code.manually.enter.code.link", value: "Manually Enter Code", comment: "Scan or See Code View - Manually Enter Code Link")
+    static let scanOrSeeCodeScanCodeInstructionsTitle = NSLocalizedString("scan.or.see.code.scan.code.instructions.title", value: "Mobile-to-Mobile?", comment: "Scan or See Code View - Scan Code Instructions Title")
+    static let scanOrSeeCodeScanCodeInstructionsBody = NSLocalizedString("scan.or.see.code.scan.code.instructions.body", value: "Scan this code with another device to sync.", comment: "Scan or See Code View - Scan Code Instructions Body")
+    static let scanOrSeeCodeFooter = NSLocalizedString("scan.or.see.code.footer", value: "Can’t Scan?", comment: "Scan or See Code View - Footer")
+    static let scanOrSeeCodeShareCodeLink = NSLocalizedString("scan.or.see.code.share.code.link", value: "Share Text Code?", comment: "Scan or See Code View - Share Code Link")
+
+    // Edit Device View
+    static let editDeviceHeader = NSLocalizedString("edit.device.header", value: "Device Name", comment: "Edit Device View - Header")
+    static func editDeviceTitle(_ name: String) -> String {
+        return NSLocalizedString("edit.device.title", value: "Edit \(name)", comment: "Edit Device View - Title")
     }
 
-    static let removeDeviceTitle = "Remove Device?"
-    static let removeDeviceButton = "Remove Device"
+    // Remove Device View
+    static let removeDeviceTitle = NSLocalizedString("remove.device.title", value: "Remove Device?", comment: "Remove Device View - Title")
+    static let removeDeviceButton = NSLocalizedString("remove.device.button", value: "Remove Device", comment: "Remove Device View - Button")
     static func removeDeviceMessage(_ name: String) -> String {
-        return "\"\(name)\" will no longer be able to access your synced data."
+        return NSLocalizedString("remove.device.message", value: "\"\(name)\" will no longer be able to access your synced data.", comment: "Remove Device View - Message")
     }
 
-    static let syncLimitExceededTitle = "⚠️ Sync Paused"
-    static let bookmarksLimitExceededDescription = "Bookmark limit exceeded. Delete some to resume syncing."
-    static let credentialsLimitExceededDescription = "Logins limit exceeded. Delete some to resume syncing."
-    static let bookmarksLimitExceededAction = "Manage Bookmarks"
-    static let credentialsLimitExceededAction = "Manage Logins"
-    
-    static let fetchFaviconsOnboardingTitle = "Download Missing Icons?"
-    static let fetchFaviconsOnboardingMessage = "Do you want this device to automatically download icons for any new bookmarks synced from your other devices? This will expose the download to your network any time a bookmark is synced."
-    static let fetchFaviconsOnboardingButtonTitle = "Keep Bookmarks Icons Updated"
+    // Standard Buttons
+    static let cancelButton = NSLocalizedString("cancel.button", value: "Cancel", comment: "Standard Buttons - Cancel Button")
+    static let doneButton = NSLocalizedString("done.button", value: "Done", comment: "Standard Buttons - Done Button")
+    static let nextButton = NSLocalizedString("next.button", value: "Next", comment: "Standard Buttons - Next Button")
+    static let backButton = NSLocalizedString("back.button", value: "Back", comment: "Standard Buttons - Back Button")
+    static let pasteButton = NSLocalizedString("paste.button", value: "Paste", comment: "Standard Buttons - Paste Button")
+    static let notNowButton = NSLocalizedString("not.now.button", value: "Not Now", comment: "Standard Buttons - Not Now Button")
+
+    // Fetch favicons
+    static let fetchFaviconsOnboardingTitle = NSLocalizedString("fetch.favicons.onboarding.title", value: "Download Missing Icons?", comment: "Fetch Favicons Onboarding - Title")
+    static let fetchFaviconsOnboardingMessage = NSLocalizedString("fetch.favicons.onboarding.message", value: "Do you want this device to automatically download icons for any new bookmarks synced from your other devices? This will expose the download to your network any time a bookmark is synced.", comment: "Fetch Favicons Onboarding - Message")
+    static let fetchFaviconsOnboardingButtonTitle = NSLocalizedString("fetch.favicons.onboarding.button.title", value: "Keep Bookmarks Icons Updated", comment: "Fetch Favicons Onboarding - Button Title")
+
 
+    // swiftlint:enable line_length
 }
-// swiftlint:enable line_length
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/PasteCodeView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/PasteCodeView.swift
index 2eca97e13b..903c0046fb 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/PasteCodeView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/PasteCodeView.swift
@@ -30,17 +30,14 @@ public struct PasteCodeView: View {
 
     @State var isEditingCode = false
 
-    var isFirstScreen: Bool
-
-    public init(model: ScanOrPasteCodeViewModel, isfirstScreen: Bool = false) {
+    public init(model: ScanOrPasteCodeViewModel) {
         self.model = model
-        self.isFirstScreen = isfirstScreen
     }
 
     @ViewBuilder
     func pasteButton() -> some View {
         Button(action: model.pasteCode) {
-            Label(UserText.pasteLabel, image: "SyncPaste")
+            Label(UserText.pasteButton, image: "SyncPaste")
         }
     }
 
@@ -67,20 +64,32 @@ public struct PasteCodeView: View {
                 if model.isValidating {
                     HStack(spacing: 4) {
                         SwiftUI.ProgressView()
-                        Text(UserText.validatingCode)
+                        Text(UserText.manuallyEnterCodeValidatingCodeAction)
                             .foregroundColor(.white.opacity(0.36))
                     }
                     .padding(.horizontal)
                 } else if model.invalidCode {
                     HStack {
                         Image("SyncAlert")
-                        Text(UserText.validatingCodeFailed)
+                        Text(UserText.manuallyEnterCodeValidatingCodeFailedAction)
                             .foregroundColor(.white.opacity(0.36))
                     }
                     .padding(.horizontal)
                 } else {
 
-                    instructions()
+                    if #available(iOS 15.0, *) {
+                        Text(instructionsString)
+                            .lineLimit(nil)
+                            .multilineTextAlignment(.center)
+                            .foregroundColor(.white.opacity(0.6))
+                            .padding()
+                    } else {
+                        Text(UserText.manuallyEnterCodeInstruction)
+                            .lineLimit(nil)
+                            .multilineTextAlignment(.center)
+                            .foregroundColor(.white.opacity(0.6))
+                            .padding()
+                    }
 
                     Spacer()
                 }
@@ -95,13 +104,17 @@ public struct PasteCodeView: View {
         .padding()
     }
 
-    @ViewBuilder
-    func instructions() -> some View {
-        Text(UserText.pasteCodeInstructions)
-            .lineLimit(nil)
-            .multilineTextAlignment(.center)
-            .foregroundColor(.white.opacity(0.6))
-            .padding()
+    @available(iOS 15, *)
+    var instructionsString: AttributedString {
+        let baseString = UserText.manuallyEnterCodeInstructionAttributed(syncMenuPath: UserText.syncMenuPath, menuItem: UserText.viewTextCodeMenuItem)
+        var instructions = AttributedString(baseString)
+        if let range1 = instructions.range(of: UserText.syncMenuPath) {
+            instructions[range1].font = .boldSystemFont(ofSize: 16)
+        }
+        if let range2 = instructions.range(of: UserText.viewTextCodeMenuItem) {
+            instructions[range2].font = .boldSystemFont(ofSize: 16)
+        }
+        return instructions
     }
 
     @ViewBuilder
@@ -119,13 +132,9 @@ public struct PasteCodeView: View {
     }
 
     public var body: some View {
-        if isFirstScreen {
-            pastCodeWiewWithNoModifier()
-                .modifier(CancelButtonModifier(action: model.cancel))
-        } else {
-            pastCodeWiewWithNoModifier()
-                .modifier(BackButtonModifier())
-        }
+        pastCodeWiewWithNoModifier()
+            .modifier(BackButtonModifier())
+
     }
 
 }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/PreparingToSyncView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/PreparingToSyncView.swift
new file mode 100644
index 0000000000..ddbf2d173b
--- /dev/null
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/PreparingToSyncView.swift
@@ -0,0 +1,49 @@
+//
+//  PreparingToSyncView.swift
+//  DuckDuckGo
+//
+//  Copyright © 2023 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
+import DesignResourcesKit
+
+
+public struct PreparingToSyncView: View {
+
+    public init() {}
+
+    public var body: some View {
+        UnderflowContainer {
+            VStack(spacing: 0) {
+                Image("Sync-128")
+                    .padding(20)
+
+                Text(UserText.preparingToSyncSheetTitle)
+                    .daxTitle1()
+                    .multilineTextAlignment(.center)
+                    .padding(.bottom, 24)
+
+                Text(UserText.preparingToSyncSheetDescription)
+                    .multilineTextAlignment(.center)
+            }
+            .padding(.horizontal, 20)
+        } foregroundContent: {
+            Text(UserText.preparingToSyncSheetFooter)
+                .foregroundColor(Color(designSystemColor: .textSecondary))
+        }
+    }
+}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/RecoverSyncedDataView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/RecoverSyncedDataView.swift
new file mode 100644
index 0000000000..34bfc6c747
--- /dev/null
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/RecoverSyncedDataView.swift
@@ -0,0 +1,68 @@
+//
+//  RecoverSyncedDataView.swift
+//  DuckDuckGo
+//
+//  Copyright © 2023 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
+import DesignResourcesKit
+
+public struct RecoverSyncedDataView: View {
+
+    @ObservedObject public var model: SyncSettingsViewModel
+    var onCancel: () -> Void
+
+    public init(model: SyncSettingsViewModel, onCancel: @escaping () -> Void) {
+        self.model = model
+        self.onCancel = onCancel
+    }
+
+    public var body: some View {
+        UnderflowContainer {
+            VStack(spacing: 0) {
+                HStack {
+                    Button(action: onCancel, label: {
+                        Text(UserText.cancelButton)
+                            .foregroundColor(.primary)
+                    })
+                    Spacer()
+                }
+                .frame(height: 56)
+                Image("Sync-Recover-128")
+                    .padding(20)
+
+                Text(UserText.recoverSyncedDataTitle)
+                    .daxTitle1()
+                    .multilineTextAlignment(.center)
+                    .padding(.bottom, 24)
+
+                Text(UserText.recoverSyncedDataDescription)
+                        .multilineTextAlignment(.center)
+            }
+            .padding(.horizontal, 20)
+        } foregroundContent: {
+            Button {
+                model.recoverSyncDataPressed()
+            } label: {
+                Text(UserText.recoverSyncedDataButton)
+            }
+            .buttonStyle(PrimaryButtonStyle())
+            .frame(maxWidth: 360)
+            .padding(.horizontal, 30)
+        }
+    }
+}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/SaveRecoveryKeyView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/SaveRecoveryKeyView.swift
index b2206716a4..d4a5bc3a5e 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/SaveRecoveryKeyView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/SaveRecoveryKeyView.swift
@@ -25,6 +25,7 @@ public struct SaveRecoveryKeyView: View {
 
     @Environment(\.presentationMode) var presentation
     @Environment(\.verticalSizeClass) var verticalSizeClass
+    @State private var isCopied = false
 
     var isCompact: Bool {
         verticalSizeClass == .compact
@@ -38,39 +39,33 @@ public struct SaveRecoveryKeyView: View {
 
     @ViewBuilder
     func recoveryInfo() -> some View {
-        ZStack {
             VStack(spacing: 26) {
                 HStack(spacing: 16) {
-                    QRCodeView(string: model.key, size: 94, style: .dark)
+                    QRCodeView(string: model.key, size: 64, style: .dark)
 
                     Text(model.key)
                         .fontWeight(.light)
                         .lineSpacing(1.6)
-                        .lineLimit(5)
+                        .lineLimit(3)
                         .applyKerning(2)
                         .truncationMode(.tail)
                         .monospaceSystemFont(ofSize: 16)
                         .frame(maxWidth: .infinity)
                 }
+                codeButtons()
             }
             .padding(.top, 20)
             .padding(.horizontal, 20)
             .padding(.bottom, 12)
-        }
-        .background(RoundedRectangle(cornerRadius: 10).foregroundColor(.black.opacity(0.03)))
+            .background(RoundedRectangle(cornerRadius: 10).foregroundColor(.black.opacity(0.03)))
     }
 
     @ViewBuilder
-    func buttons() -> some View {
+    func codeButtons() -> some View {
         VStack(spacing: isCompact ? 4 : 8) {
-            Button("Save as PDF") {
+            Button(UserText.saveRecoveryCodeSaveAsPdfButton) {
                 model.showRecoveryPDFAction()
             }
-            .buttonStyle(PrimaryButtonStyle(compact: isCompact))
-
-            Button(UserText.copyCode) {
-                model.copyKey()
-            }
             .buttonStyle(SecondaryButtonStyle(compact: isCompact))
             .overlay(
                 RoundedRectangle(cornerRadius: 8)
@@ -78,15 +73,37 @@ public struct SaveRecoveryKeyView: View {
                 .stroke(.blue, lineWidth: 1)
                 )
 
-            Button {
-                presentation.wrappedValue.dismiss()
-            } label: {
-                Text(UserText.notNowButton)
+            Button(UserText.saveRecoveryCodeCopyCodeButton) {
+                model.copyKey()
+                isCopied = true
+                DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
+                    isCopied = false
+                }
             }
             .buttonStyle(SecondaryButtonStyle(compact: isCompact))
+            .overlay(
+                RoundedRectangle(cornerRadius: 8)
+                    .inset(by: 0.5)
+                    .stroke(.blue, lineWidth: 1)
+            )
         }
-        .frame(maxWidth: 360)
-        .padding(.horizontal, 30)
+    }
+
+    @ViewBuilder
+    func nextButton() -> some View {
+        Button {
+            presentation.wrappedValue.dismiss()
+            model.onDismiss()
+        } label: {
+            Text(UserText.nextButton)
+        }
+        .buttonStyle(PrimaryButtonStyle(compact: isCompact))
+        .overlay(
+            isCopied ?
+            codeCopiedToast()
+            : nil
+        )
+        .padding(.horizontal, 20)
     }
 
     @ViewBuilder
@@ -95,11 +112,11 @@ public struct SaveRecoveryKeyView: View {
             Image("SyncDownloadRecoveryCode")
                 .padding(.bottom, 24)
 
-            Text(UserText.saveRecoveryTitle)
+            Text(UserText.saveRecoveryCodeSheetTitle)
                 .daxTitle1()
                 .padding(.bottom, 28)
 
-            Text(UserText.recoveryMessage)
+            Text(UserText.saveRecoveryCodeSheetDescription)
                 .lineLimit(nil)
                 .daxBodyRegular()
                 .lineSpacing(1.32)
@@ -108,7 +125,7 @@ public struct SaveRecoveryKeyView: View {
 
             recoveryInfo()
                 .padding(.bottom, 20)
-            Text(UserText.recoveryWarning)
+            Text(UserText.saveRecoveryCodeSheetFooter)
                 .daxCaption()
                 .multilineTextAlignment(.center)
                 .foregroundColor(.primary.opacity(0.6))
@@ -117,11 +134,26 @@ public struct SaveRecoveryKeyView: View {
         .padding(.horizontal, 30)
     }
 
+    @ViewBuilder
+    func codeCopiedToast() -> some View {
+        ZStack(alignment: .leading) {
+            RoundedRectangle(cornerRadius: 8)
+                .fill(Color.black)
+                .frame(height: 45)
+            Text(UserText.saveRecoveryCodeSaveCodeCopiedToast)
+                .foregroundColor(.white)
+                .padding()
+
+        }
+        .padding(.bottom, 50)
+    }
+
+
     public var body: some View {
         UnderflowContainer {
             mainContent()
         } foregroundContent: {
-            buttons()
+            nextButton()
         }
     }
 
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrEnterCodeToRecoverSyncedDataView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrEnterCodeToRecoverSyncedDataView.swift
new file mode 100644
index 0000000000..dacecbe32a
--- /dev/null
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrEnterCodeToRecoverSyncedDataView.swift
@@ -0,0 +1,71 @@
+//
+//  ScanOrEnterCodeToRecoverSyncedDataView.swift
+//  DuckDuckGo
+//
+//  Copyright © 2023 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
+
+public struct ScanOrEnterCodeToRecoverSyncedDataView: View {
+
+    @ObservedObject var model: ScanOrPasteCodeViewModel
+
+    public init(model: ScanOrPasteCodeViewModel) {
+        self.model = model
+    }
+
+    public var body: some View {
+        VStack(spacing: 10) {
+            VStack(spacing: 10) {
+                Text(UserText.scanCodeToRecoverSyncedDataExplanation)
+                    .daxFootnoteRegular()
+                    .multilineTextAlignment(.center)
+                    .padding(.horizontal, 20)
+                    .padding(.top, 10)
+                    .padding(.bottom, 20)
+                CameraView(model: model)
+                    .aspectRatio(1.0, contentMode: .fill)
+            }
+            .navigationTitle(UserText.scanCodeToRecoverSyncedDataTitle)
+            .toolbar {
+                ToolbarItem(placement: .navigationBarLeading) {
+                    Button(UserText.cancelButton, action: model.cancel)
+                        .foregroundColor(Color.white)
+                }
+            }
+            ZStack {
+                Rectangle().fill(Color.black)
+                VStack(alignment: .center) {
+                    HStack(spacing: 4) {
+                        Text(UserText.scanCodeToRecoverSyncedDataFooter)
+                            .daxBodyRegular()
+                            .foregroundColor(Color(designSystemColor: .textSecondary))
+                        HStack(alignment: .center) {
+                            NavigationLink(UserText.scanCodeToRecoverSyncedDataEnterCodeLink, destination: {
+                                PasteCodeView(model: model)
+                            })
+                            .foregroundColor(Color(designSystemColor: .accent))
+                            Image("Arrow-Circle-Right-12")
+                        }
+                    }
+                    .padding(20)
+                    Spacer()
+                }
+            }
+        }
+    }
+}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrPasteCodeView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrPasteCodeView.swift
index 5c8a08af55..92532fc260 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrPasteCodeView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrPasteCodeView.swift
@@ -20,260 +20,119 @@
 import SwiftUI
 import DesignResourcesKit
 
-/// Handles scanning or pasting a code.
-public struct ScanOrPasteCodeView: View {
-
+public struct ScanOrSeeCode: View {
     @ObservedObject var model: ScanOrPasteCodeViewModel
+    @State var qrCodeModel = ShowQRCodeViewModel()
+
+    @State private var isShareSheetPresented: Bool = false
 
     public init(model: ScanOrPasteCodeViewModel) {
         self.model = model
     }
 
-    @State var isInvalidCode = false
-
-    @ViewBuilder
-    func fullscreenCameraBackground() -> some View {
-        Group {
-            if model.showCamera {
-                QRCodeScannerView {
-                    return await model.codeScanned($0)
-                } onCameraUnavailable: {
-                    model.cameraUnavailable()
-                } onInvalidCodeScanned: {
-                    withAnimation(.linear.delay(0.0)) {
-                        isInvalidCode = true
-                    }
-
-                    withAnimation(.linear.delay(0.2)) {
-                        isInvalidCode = false
-                    }
+    public var body: some View {
+        VStack(spacing: 10) {
+            VStack(spacing: 10) {
+                titleView()
+                CameraView(model: model)
+            }
+            .toolbar {
+                ToolbarItem(placement: .navigationBarLeading) {
+                    Button(UserText.cancelButton, action: model.cancel)
+                        .foregroundColor(Color.white)
+                }
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    NavigationLink(UserText.scanOrSeeCodeManuallyEnterCodeLink, destination: {
+                        PasteCodeView(model: model)
+                    })
+                    .foregroundColor(Color(designSystemColor: .accent))
                 }
-            } else {
-                Rectangle()
-                    .fill(.black)
             }
+            qrCodeView()
         }
-        .ignoresSafeArea()
     }
 
     @ViewBuilder
-    func waitingForCameraPermission() -> some View {
-        if model.videoPermission == .unknown {
-            SwiftUI.ProgressView()
+    func titleView() -> some View {
+        VStack(spacing: 10) {
+            Text(UserText.scanOrSeeCodeTitle)
+                .daxTitle2()
+            instructionsText()
+                .daxFootnoteRegular()
+                .multilineTextAlignment(.center)
+                .padding(.horizontal, 16)
         }
+        .padding(.top, 10)
     }
 
-    @ViewBuilder
-    func cameraPermissionDenied() -> some View {
-        if model.videoPermission == .denied {
-            VStack(spacing: 0) {
-
-                Image("SyncCameraPermission")
-                    .padding(.top, 40)
-                    .padding(.bottom, 20)
-
-                Text(UserText.cameraPermissionRequired)
-                    .daxTitle3()
-                    .lineSpacing(1.05)
-                    .padding(.bottom, 8)
-
-                Text(UserText.cameraPermissionInstructions)
-                    .lineLimit(nil)
-                    .multilineTextAlignment(.center)
-                    .daxBodyRegular()
-                    .lineSpacing(1.1)
-
-                Spacer()
-
-                Button {
-                    model.gotoSettings()
-                } label: {
-                    HStack {
-                        Image("SyncGotoButton")
-                        Text(UserText.goToSettingsButton)
-                    }
-                }
-                .buttonStyle(SyncLabelButtonStyle())
-                .padding(.bottom, 40)
-            }
-            .padding(.horizontal, 40)
+    func instructionsText() -> some View {
+        if #available(iOS 15.0, *) {
+            return Text(instructionsString)
+        } else {
+            return Text(UserText.scanOrSeeCodeInstruction)
         }
     }
 
-    @ViewBuilder
-    func cameraUnavailable() -> some View {
-        if model.videoPermission == .authorised && !model.showCamera {
-            VStack(spacing: 0) {
-
-                Image("SyncCameraUnavailable")
-                    .padding(.top, 40)
-                    .padding(.bottom, 20)
-
-                Text(UserText.cameraIsUnavailableTitle)
-                    .daxTitle3()
-                    .lineSpacing(1.05)
-
-            }
-            .padding(.horizontal, 40)
+    @available(iOS 15, *)
+    var instructionsString: AttributedString {
+        let baseString = UserText.scanOrSeeCodeInstructionAttributed(syncMenuPath: UserText.syncMenuPath)
+        var instructions = AttributedString(baseString)
+        if let range = instructions.range(of: UserText.syncMenuPath) {
+            instructions[range].font = .boldSystemFont(ofSize: 13)
         }
+        return instructions
     }
 
-    @ViewBuilder
-    func instructions() -> some View {
-
-        Text(model.showConnectMode ? UserText.connectDeviceInstructions : UserText.recoveryModeInstructions)
-            .lineLimit(nil)
-            .multilineTextAlignment(.center)
-            .daxCaption()
-            .foregroundColor(.white.opacity(0.6))
-            .padding(.top, 20)
-
-    }
 
     @ViewBuilder
-    func buttons() -> some View {
-
-        Group {
-            Section {
-                NavigationLink {
-                    PasteCodeView(model: model)
-                } label: {
-                    HStack(spacing: 16) {
-                        Image("SyncKeyboardIcon")
-                        Text(UserText.manuallyEnterCodeTitle)
-                            .daxButton()
-                            .foregroundColor(.white.opacity(0.84))
+    func qrCodeView() -> some View {
+        VStack(spacing: 8) {
+            HStack(alignment: .top, spacing: 20) {
+                QRCodeView(string: qrCodeModel.code ?? "", size: 120)
+                VStack(alignment: .leading, spacing: 10) {
+                    HStack {
+                        Text(UserText.scanOrSeeCodeScanCodeInstructionsTitle)
+                            .daxBodyBold()
+                            .fixedSize()
+                        Spacer()
+                        Image("SyncDeviceType_phone")
+                            .padding(2)
+                            .background(
+                                RoundedRectangle(cornerRadius: 2)
+                                    .fill(Color(designSystemColor: .lines))
+                            )
                     }
+                    Text(UserText.scanOrSeeCodeScanCodeInstructionsBody)
+                        .foregroundColor(.secondary)
+                        .fixedSize(horizontal: false, vertical: true)
+                        .multilineTextAlignment(.leading)
                 }
             }
-            Section {
-                if model.showConnectMode {
-                    NavigationLink {
-                        ConnectModeView(model: model)
-                    } label: {
-                        HStack(spacing: 16) {
-                            Image("SyncQRCodeIcon")
-
-                            VStack(alignment: .leading, spacing: 4) {
-                                Text(UserText.showQRCodeLabel)
-                                    .daxButton()
-                                    .foregroundColor(.white.opacity(0.84))
-                                Text(UserText.showQRCodeSubLabel)
-                                    .daxCaption()
-                                    .foregroundColor(.white.opacity(0.6))
-                            }
-                            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(20)
+            .background(
+                RoundedRectangle(cornerRadius: 8)
+                    .fill(Color(designSystemColor: .panel))
+            )
+            .padding(20)
+            HStack {
+                Text(UserText.scanOrSeeCodeFooter)
+                HStack(alignment: .center) {
+                    Text(UserText.scanOrSeeCodeShareCodeLink)
+                        .foregroundColor(Color(designSystemColor: .accent))
+                        .onTapGesture {
+                            model.showShareCodeSheet()
                         }
-                    }
+                    Image("Arrow-Circle-Right-12")
                 }
             }
         }
-        .frame(height: 40)
-        .foregroundColor(.primary)
+        .padding(.bottom, 40)
         .onAppear {
-            model.endConnectMode()
-        }
-    }
-
-    @ViewBuilder
-    func cameraViewPort() -> some View {
-        ZStack(alignment: .center) {
-            waitingForCameraPermission()
-            cameraTarget()
-        }
-    }
-
-    @ViewBuilder
-    func cameraTarget() -> some View {
-        if model.showCamera {
-            ZStack {
-                ForEach([0.0, 90.0, 180.0, 270.0], id: \.self) { degrees in
-                    RoundedCorner()
-                        .stroke(lineWidth: 8)
-                        .foregroundColor(isInvalidCode ? .red.opacity(0.6) : .white.opacity(0.8))
-                        .rotationEffect(.degrees(degrees), anchor: .center)
-                        .frame(width: 300, height: 300)
-                }
-            }
-        }
-    }
-
-    public var body: some View {
-        GeometryReader { g in
-            ZStack(alignment: .top) {
-                fullscreenCameraBackground()
-
-                VStack(spacing: 0) {
-                    Rectangle() // Also acts as the blur for the camera
-                        .fill(.black)
-                        .frame(height: g.safeAreaInsets.top)
-
-                    ZStack {
-                        // Background in case fullscreen camera view doesn't work
-                        if !model.showCamera {
-                            Rectangle().fill(Color.black)
-                        }
-                        
-                        cameraViewPort()
-                            .frame(width: g.size.width, height: g.size.width)
-                            .frame(maxHeight: g.size.height - 300)
-
-                        Group {
-                            cameraPermissionDenied()
-                            cameraUnavailable()
-                        }
-                        .padding(.horizontal, 0)
-                    }
-
-                    ZStack {
-                        Rectangle() // Also acts as the blur for the camera
-                            .fill(.black)
-                            .regularMaterialBackground()
-
-                        VStack(spacing: 0) {
-                            Section {
-                                instructions()
-                                    .padding(.horizontal, 20)
-                            }
-
-                            List {
-                                buttons()
-                            }
-                            .ignoresSafeArea()
-                            .disableScrolling()
-                        }
-                        .frame(maxWidth: Constants.maxFullScreenWidth)
-                    }
-                }
-                .ignoresSafeArea()
-            }
-            .navigationTitle("Scan QR Code")
-            .toolbar {
-                ToolbarItem(placement: .navigationBarLeading) {
-                    Button("Cancel", action: model.cancel)
-                    .foregroundColor(Color.white)
-                }
+            if let recoveryCode = model.recoveryCode {
+                self.qrCodeModel.code = recoveryCode
+            } else {
+                self.qrCodeModel = model.startConnectMode()
             }
         }
     }
 }
-
-private struct RoundedCorner: Shape {
-
-    func path(in rect: CGRect) -> Path {
-        var path = Path()
-        let c = 50.0
-        let r = 30.0
-        let e = c - r
-
-        path.move(to: CGPoint(x: 0, y: c))
-        path.addLine(to: CGPoint(x: 0, y: e))
-        path.addCurve(to: CGPoint(x: e, y: 0),
-                      control1: CGPoint(x: 0, y: 0),
-                      control2: CGPoint(x: e, y: 0))
-        path.addLine(to: CGPoint(x: c, y: 0))
-
-        return path
-    }
-
-}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift
index 5f8791bad5..835690841d 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift
@@ -25,6 +25,8 @@ public struct SyncSettingsView: View {
     @ObservedObject public var model: SyncSettingsViewModel
 
     let timer = Timer.publish(every: 3, on: .main, in: .common).autoconnect()
+    @State var isSyncWithSetUpSheetVisible = false
+    @State var isRecoverSyncedDataSheetVisible = false
 
     public init(model: SyncSettingsViewModel) {
         self.model = model
@@ -40,31 +42,22 @@ public struct SyncSettingsView: View {
                 }
         } else {
             List {
-                workInProgress()
 
                 if model.isSyncEnabled {
                     
                     turnOffSync()
                     
+                    // Sync Paused Errors
                     if $model.isSyncBookmarksPaused.wrappedValue {
                         syncPaused(for: .bookmarks)
                     }
-
                     if $model.isSyncCredentialsPaused.wrappedValue {
                         syncPaused(for: .credentials)
                     }
 
                     devices()
-                    
-                    syncNewDevice()
-                    
-                    OptionsView(
-                        isFaviconsFetchingEnabled: $model.isFaviconsFetchingEnabled,
-                        isUnifiedFavoritesEnabled: $model.isUnifiedFavoritesEnabled
-                    )
-                    .onAppear {
-                        model.delegate?.updateOptions()
-                    }
+
+                    options()
 
                     saveRecoveryPDF()
                     
@@ -73,12 +66,9 @@ public struct SyncSettingsView: View {
                 } else {
 
                     syncWithAnotherDeviceView()
-                    
-                    singleDeviceSetUpView()
-                    
-                    recoverYourDataView()
-                    
-                    footerView()
+
+                    otherOptions()
+
                 }
             }
             .navigationTitle(UserText.syncTitle)
@@ -96,106 +86,90 @@ public struct SyncSettingsView: View {
     }
 
     @State var selectedDevice: SyncSettingsViewModel.Device?
-
-    @ViewBuilder
-    func workInProgress() -> some View {
-        Section {
-            EmptyView()
-        } footer: {
-            VStack(alignment: .leading, spacing: 4) {
-                Text("Work in Progress")
-                    .font(.system(size: 12, weight: .semibold))
-                    .foregroundColor(.black)
-
-                // swiftlint:disable line_length
-                Text("This feature is viewable to internal users only and is still being developed and tested. Currently you can create accounts, connect and manage devices, and sync bookmarks, favorites, Autofill logins and Email Protection status. **[More Info](https://app.asana.com/0/1201493110486074/1203756800930481/f)**")
-                    .foregroundColor(.black)
-                    .font(.system(size: 11, weight: .regular))
-                // swiftlint:enable line_length
-            }
-            .padding()
-            .background(RoundedRectangle(cornerRadius: 8).foregroundColor(.yellow))
-            .padding(.bottom, 10)
-        }
-
-    }
-
 }
 
 // Sync Set up Views
 extension SyncSettingsView {
-    @ViewBuilder
-    func recoverYourDataView() -> some View {
-        Section {
-            Button(UserText.recoverYourData) {
-                model.showRecoverDataView()
-            }
-        }
-    }
 
     @ViewBuilder
-    func footerView() -> some View {
-        Section {} footer: {
-            Text(UserText.syncSettingsFooter)
-                .daxFootnoteRegular()
-                .foregroundColor(.secondary)
-        }
-    }
-
-    @ViewBuilder
-    func singleDeviceSetUpView() -> some View {
+    func syncWithAnotherDeviceView() -> some View {
         Section {
             HStack {
-                VStack(alignment: .leading, spacing: 4) {
-                    Text(UserText.singleDeviceSetUpTitle)
-                        .daxBodyBold()
-                    Text(UserText.singleDeviceSetUpInstruction)
+                Spacer()
+                VStack(alignment: .center, spacing: 8) {
+                    Image("Sync-Pair-96")
+                    Text(UserText.syncWithAnotherDeviceTitle)
+                        .daxTitle3()
+                    Text(UserText.syncWithAnotherDeviceMessage)
                         .daxBodyRegular()
+                        .multilineTextAlignment(.center)
+                        .foregroundColor(Color(designSystemColor: .textPrimary))
+                    Button(action: {
+                        model.scanQRCode()
+                    }, label: {
+                        Text(UserText.syncWithAnotherDeviceButton)
+                            .daxButton()
+                            .foregroundColor(.white)
+                            .frame(maxWidth: 310)
+                            .frame(height: 50)
+                            .background(
+                                RoundedRectangle(cornerRadius: 8)
+                                    .fill(Color(designSystemColor: .accent))
+                            )
+                    })
+                    .padding(.vertical, 16)
                 }
                 Spacer()
-                Image("Device-Mobile-Upload-96")
-
             }
-            if model.isBusy {
-                SwiftUI.ProgressView()
-            } else {
-                Button(UserText.turnSyncOn) {
-                    model.startSyncPressed()
-                }
+        } footer: {
+            HStack {
+                Spacer()
+                Text(UserText.syncWithAnotherDeviceFooter)
+                    .daxFootnoteRegular()
+                    .multilineTextAlignment(.center)
+                Spacer()
             }
         }
     }
 
     @ViewBuilder
-    func syncWithAnotherDeviceView() -> some View {
+    func otherOptions() -> some View {
         Section {
-            HStack {
-                VStack(alignment: .leading, spacing: 4) {
-                    Text(UserText.syncWithAnotherDeviceTitle)
-                        .daxBodyBold()
-                    Text(UserText.syncWithAnotherDeviceMessage)
-                        .daxBodyRegular()
+            Text(UserText.syncAndBackUpThisDeviceLink)
+                .daxBodyRegular()
+                .foregroundColor(Color(designSystemColor: .accent))
+                .onTapGesture {
+                    isSyncWithSetUpSheetVisible = true
                 }
-                Spacer()
-                Image("Sync-Pair-96")
-
-            }
-            Button(UserText.scanQRCode) {
-                model.scanQRCode()
-            }
-            Button(UserText.enterTextCode) {
-                model.showEnterTextView()
-            }
+                .sheet(isPresented: $isSyncWithSetUpSheetVisible, content: {
+                    SyncWithServerView(model: model, onCancel: {
+                        isSyncWithSetUpSheetVisible = false
+                    })
+                })
+            Text(UserText.recoverSyncedDataLink)
+                .daxBodyRegular()
+                .foregroundColor(Color(designSystemColor: .accent))
+                .onTapGesture {
+                    isRecoverSyncedDataSheetVisible = true
+                }
+                .sheet(isPresented: $isRecoverSyncedDataSheetVisible, content: {
+                    RecoverSyncedDataView(model: model, onCancel: {
+                        isRecoverSyncedDataSheetVisible = false
+                    })
+                })
+        } header: {
+            Text(UserText.otherOptionsSectionHeader)
         }
     }
 }
 
+
 // Sync Enabled Views
 extension SyncSettingsView {
     @ViewBuilder
     func deleteAllData() -> some View {
         Section {
-            Button(UserText.settingsDeleteAllButton) {
+            Button(UserText.deleteServerData) {
                 model.deleteAllData()
             }
         }
@@ -204,45 +178,32 @@ extension SyncSettingsView {
     @ViewBuilder
     func saveRecoveryPDF() -> some View {
         Section {
-            Button(UserText.settingsSaveRecoveryPDFButton) {
+            Button(UserText.saveRecoveryPDFButton) {
                 model.saveRecoveryPDF()
             }
         } footer: {
-            Text(UserText.settingsRecoveryPDFWarning)
+            Text(UserText.saveRecoveryPDFFooter)
         }
     }
 
-    @ViewBuilder
-    func syncNewDevice() -> some View {
-        Section {
-
-            // Appears off center because the list is padding the trailing to make space for the accessory
-            VStack(spacing: 0) {
-                QRCodeView(string: model.recoveryCode, size: 192, style: .dark)
-                    .padding(.bottom, 32)
-                    .padding(.top, 16)
-
-                let instrution1 = Text(UserText.settingsNewDeviceInstructions1)
-                let instrution2 = Text(UserText.settingsNewDeviceInstructions2).bold()
-                let instrution3 = Text(UserText.settingsNewDeviceInstructions3)
-
-                Text("\(instrution1)\n \(instrution2) \(instrution3)")
-                .daxSubheadRegular()
-                .lineLimit(nil)
-                .lineSpacing(1.2)
-                .multilineTextAlignment(.center)
-                .padding(.bottom, 16)
-            }
-
-            NavigationLink(UserText.settingsShowCodeButton) {
-                ShowCodeView(code: model.recoveryCode, copyCode: model.copyCode)
-            }
 
-            Button(UserText.settingsScanQRCodeButton) {
-                model.scanQRCode()
+    @ViewBuilder
+    func devicesList() -> some View {
+        ForEach(model.devices) { device in
+            Button {
+                selectedDevice = device
+            } label: {
+                HStack {
+                    deviceTypeImage(device)
+                    Text(device.name)
+                        .foregroundColor(.primary)
+                    Spacer()
+                    if device.isThisDevice {
+                        Text(UserText.syncedDevicesThisDeviceLabel)
+                            .foregroundColor(.secondary)
+                    }
+                }
             }
-        } header: {
-            Text("Sync New Device")
         }
     }
 
@@ -253,25 +214,15 @@ extension SyncSettingsView {
                 ProgressView()
                     .padding()
             }
-
-            ForEach(model.devices) { device in
-                Button {
-                    selectedDevice = device
-                } label: {
-                    HStack {
-                        deviceTypeImage(device)
-                        Text(device.name)
-                            .foregroundColor(.primary)
-                        Spacer()
-                        if device.isThisDevice {
-                            Text(UserText.thisDevice)
-                                .foregroundColor(.secondary)
-                        }
-                    }
-                }
-            }
+            devicesList()
+            Button(action: {
+                model.scanQRCode()
+            }, label: {
+                Text(UserText.syncedDevicesSyncWithAnotherDeviceLabel)
+                    .padding(.leading, 32)
+            })
         } header: {
-            Text(UserText.connectedDevicesTitle)
+            Text(UserText.syncedDevicesSectionHeader)
         }
         .sheet(item: $selectedDevice) { device in
             Group {
@@ -294,7 +245,6 @@ extension SyncSettingsView {
                 model.delegate?.refreshDevices(clearDevices: false)
             }
         }
-
     }
 
     @ViewBuilder
@@ -307,7 +257,49 @@ extension SyncSettingsView {
                     model.disableSync()
                 }
             }
+        } header: {
+            HStack(alignment: .center) {
+                Text(UserText.turnSyncOffSectionHeader)
+                Circle()
+                    .fill(.green)
+                    .frame(width: 8)
+                    .padding(.bottom, 1)
+            }
+        } footer: {
+            Text(UserText.turnSyncOffSectionFooter)
+                .multilineTextAlignment(.leading)
+        }
+    }
+
+    @ViewBuilder
+    func options() -> some View {
+        Section {
+            Toggle(isOn: $model.isFaviconsFetchingEnabled) {
+                VStack(alignment: .leading, spacing: 5) {
+                    Text(UserText.fetchFaviconsOptionTitle)
+                        .daxBodyRegular()
+                        .foregroundColor(.primary)
+                    Text(UserText.fetchFaviconsOptionCaption)
+                        .daxFootnoteRegular()
+                        .foregroundColor(.secondary)
+                }
+            }
+            Toggle(isOn: $model.isUnifiedFavoritesEnabled) {
+                VStack(alignment: .leading, spacing: 5) {
+                    Text(UserText.unifiedFavoritesTitle)
+                        .daxBodyRegular()
+                        .foregroundColor(.primary)
+                    Text(UserText.unifiedFavoritesInstruction)
+                        .daxFootnoteRegular()
+                        .foregroundColor(.secondary)
+                }
+            }
+        } header: {
+            Text(UserText.optionsSectionHeader)
         }
+        .onAppear(perform: {
+            model.delegate?.updateOptions()
+        })
     }
 
     @ViewBuilder
@@ -359,40 +351,3 @@ extension View {
         closure(self)
     }
 }
-
-
-public struct OptionsView: View {
-    @Binding var isFaviconsFetchingEnabled: Bool
-    @Binding var isUnifiedFavoritesEnabled: Bool
-
-    public var body: some View {
-        Section {
-            Toggle(isOn: $isFaviconsFetchingEnabled) {
-                HStack(spacing: 16) {
-                    Image("SyncFetchFavicons")
-                    VStack(alignment: .leading) {
-                        Text(UserText.fetchFaviconsOptionTitle)
-                            .foregroundColor(.primary)
-                        Text(UserText.fetchFaviconsOptionCaption)
-                            .daxBodyRegular()
-                            .foregroundColor(.secondary)
-                    }
-                }
-            }
-            Toggle(isOn: $isUnifiedFavoritesEnabled) {
-                HStack(spacing: 16) {
-                    Image("SyncAllDevices")
-                    VStack(alignment: .leading) {
-                        Text(UserText.unifiedFavoritesTitle)
-                            .foregroundColor(.primary)
-                        Text(UserText.unifiedFavoritesInstruction)
-                            .daxBodyRegular()
-                            .foregroundColor(.secondary)
-                    }
-                }
-            }
-        } header: {
-            Text(UserText.options)
-        }
-    }
-}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncWithServerView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncWithServerView.swift
new file mode 100644
index 0000000000..d95afd586b
--- /dev/null
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncWithServerView.swift
@@ -0,0 +1,78 @@
+//
+//  SyncWithServerView.swift
+//  DuckDuckGo
+//
+//  Copyright © 2023 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
+import DesignResourcesKit
+
+public struct SyncWithServerView: View {
+
+    @ObservedObject public var model: SyncSettingsViewModel
+    var onCancel: () -> Void
+
+    public init(model: SyncSettingsViewModel, onCancel: @escaping () -> Void) {
+        self.model = model
+        self.onCancel = onCancel
+    }
+
+    public var body: some View {
+        UnderflowContainer {
+            VStack(spacing: 0) {
+                HStack {
+                    Button(action: onCancel, label: {
+                        Text(UserText.cancelButton)
+                            .foregroundColor(.primary)
+                    })
+                    Spacer()
+                }
+                .frame(height: 56)
+                .padding(.bottom, 20)
+                Image("Sync-Server-128")
+                    .padding(.bottom, 20)
+
+                Text(UserText.connectWithServerSheetTitle)
+                    .daxTitle1()
+                    .multilineTextAlignment(.center)
+                    .padding(.bottom, 24)
+                VStack(spacing: 16) {
+                    Text(UserText.connectWithServerSheetDescriptionPart1)
+                        .multilineTextAlignment(.center)
+
+                    Text(UserText.connectWithServerSheetDescriptionPart2)
+                        .multilineTextAlignment(.center)
+                }
+            }
+            .padding(.horizontal, 20)
+        } foregroundContent: {
+            VStack(spacing: 8) {
+                Button {
+                    model.startSyncPressed()
+                } label: {
+                    Text(UserText.connectWithServerSheetButton)
+                }
+                .buttonStyle(PrimaryButtonStyle())
+                .frame(maxWidth: 360)
+                .padding(.horizontal, 30)
+                Text(UserText.connectWithServerSheetFooter)
+                    .daxFootnoteRegular()
+                    .foregroundColor(Color(designSystemColor: .textSecondary))
+            }
+        }
+    }
+}